diff --git a/README.md b/README.md index eedc800..daea8c1 100644 --- a/README.md +++ b/README.md @@ -89,5 +89,5 @@ - 发正式 pnpm build:h5执行后,打包 AIchat\dist\build\h5,压缩文件名 obAiChat-xiaomo.zip,注意 env/.env.production下请求地址 - 上传至 , 然后构建 【线上】前端 front-obaichat-xiaomo - 查看 是否更新 -- 请求地址为 +- 请求地址为 - 此项目提交commit有规则,通用为 fix: xxx diff --git a/env/.env.development b/env/.env.development index c004352..0019b96 100644 --- a/env/.env.development +++ b/env/.env.development @@ -12,10 +12,10 @@ VITE_SHOW_SOURCEMAP = true # VITE_SERVER_BASEURL = 'https://warehouse.szjixun.cn/oa_backend' #体制外 -# VITE_SERVER_BASEURL = 'https://oa-a.szjixun.cn/api' +VITE_SERVER_BASEURL = 'https://oa-a.szjixun.cn/api' # 体制内 -VITE_SERVER_BASEURL = 'https://oa-b.szjixun.cn/api' +# VITE_SERVER_BASEURL = 'https://oa-b.szjixun.cn/api' # VITE_SERVER_BASEURL = 'https://oa-b.szjixun.cn/api' # VITE_SERVER_BASEURL = 'https://erpapi.fontree.cn' diff --git a/env/.env.production b/env/.env.production index d7b0f56..a828a7a 100644 --- a/env/.env.production +++ b/env/.env.production @@ -10,10 +10,10 @@ VITE_SHOW_SOURCEMAP = false # VITE_SERVER_BASEURL = 'https://warehouse.szjixun.cn/oa_backend' # VITE_SERVER_BASEURL = 'https://oa-a.szjixun.cn/api' #体制外 -# VITE_SERVER_BASEURL = 'https://oa-a.szjixun.cn/api' +VITE_SERVER_BASEURL = 'https://oa-a.szjixun.cn/api' # 体制内 -VITE_SERVER_BASEURL = 'https://oa-b.szjixun.cn/api' +# VITE_SERVER_BASEURL = 'https://oa-b.szjixun.cn/api' diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 58b947a..0094d8c 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1101,9 +1101,10 @@ const shouldShowTimestamp = (i: number) => { const formatDayGroup = (d: Date) => dayjs(d).format('YYYY/MM/DD HH:mm') const formatTimeShort = (d: Date) => dayjs(d).format('MM/DD HH:mm') -function goBack() { - const wv = plus.webview.currentWebview() - wv.close('slide-out-right', 300) // 或者直接 wv.close() +async function goBack() { + await window.NativeBridge.router.back() + // const wv = plus.webview.currentWebview() + // wv.close('slide-out-right', 300) // 或者直接 wv.close() } function viewHistory() { uni.navigateTo({ url: '/pages/history/history' })