From 2dacbe6c083b7e6f29f7018672744ac34954e23d Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Fri, 10 Oct 2025 10:01:51 +0800 Subject: [PATCH] 2.3.1 --- env/.env.production | 4 ++-- manifest.config.ts | 4 ++-- src/manifest.json | 4 ++-- src/pages-operate/caiwu/index.vue | 4 +--- src/pages-operate/jingying/index.vue | 6 ++---- src/pages-operate/wbsc/index.vue | 20 ++++++++++++++++++++ src/pages-production/anquanguanli/index.vue | 20 ++++++++++++++++++++ src/pages.json | 20 +++++++++++++++++++- src/pages/login/login.vue | 10 +++++----- src/pages/operation/index.vue | 6 ++++++ src/pages/production/index.vue | 18 ++++++++++++++++-- src/types/uni-pages.d.ts | 2 ++ src/utils/http.ts | 2 +- src/utils/request.ts | 2 +- 14 files changed, 99 insertions(+), 23 deletions(-) create mode 100644 src/pages-operate/wbsc/index.vue create mode 100644 src/pages-production/anquanguanli/index.vue diff --git a/env/.env.production b/env/.env.production index d961230..c036e16 100644 --- a/env/.env.production +++ b/env/.env.production @@ -8,7 +8,7 @@ VITE_SHOW_SOURCEMAP = false #VITE_WEBAPP = 'D://opt//AppUpdateTest' VITE_WEBAPP = '' -VITE_SERVER_BASEURL = 'https://10.75.166.6/test' -#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' +#VITE_SERVER_BASEURL = 'https://10.75.166.6/test' +VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/wwapi' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/yjapi' diff --git a/manifest.config.ts b/manifest.config.ts index 17aa39a..847b509 100644 --- a/manifest.config.ts +++ b/manifest.config.ts @@ -17,8 +17,8 @@ export default defineManifestConfig({ name: VITE_APP_TITLE, appid: VITE_UNI_APPID, description: '', - versionName: '2.3.0', - versionCode: '202509011', + versionName: '2.3.1', + versionCode: '20251010', transformPx: false, locale: VITE_FALLBACK_LOCALE, // 'zh-Hans' /* 5+App特有相关 */ diff --git a/src/manifest.json b/src/manifest.json index b9286e3..31a1fb4 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,8 +2,8 @@ "name": "数智产销", "appid": "__UNI__9F097F0", "description": "", - "versionName": "2.3.0", - "versionCode": "202509011", + "versionName": "2.3.1", + "versionCode": "20251010", "transformPx": false, "app-plus": { "usingComponents": true, diff --git a/src/pages-operate/caiwu/index.vue b/src/pages-operate/caiwu/index.vue index f6cb4df..5ea25ef 100644 --- a/src/pages-operate/caiwu/index.vue +++ b/src/pages-operate/caiwu/index.vue @@ -9,9 +9,7 @@ diff --git a/src/pages-operate/jingying/index.vue b/src/pages-operate/jingying/index.vue index 4c886a1..51e290e 100644 --- a/src/pages-operate/jingying/index.vue +++ b/src/pages-operate/jingying/index.vue @@ -3,15 +3,13 @@ layout: 'default', style: { navigationStyle: 'custom', - navigationBarTitleText: '经营考核 ', + navigationBarTitleText: '外部市场', }, } diff --git a/src/pages-operate/wbsc/index.vue b/src/pages-operate/wbsc/index.vue new file mode 100644 index 0000000..2456da7 --- /dev/null +++ b/src/pages-operate/wbsc/index.vue @@ -0,0 +1,20 @@ + + { + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '外部市场 ', + }, + } + + + + + + \ No newline at end of file diff --git a/src/pages-production/anquanguanli/index.vue b/src/pages-production/anquanguanli/index.vue new file mode 100644 index 0000000..c667fa7 --- /dev/null +++ b/src/pages-production/anquanguanli/index.vue @@ -0,0 +1,20 @@ + + { + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '安全管理', + }, + } + + + + + + \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index 18cb4a2..ee60288 100644 --- a/src/pages.json +++ b/src/pages.json @@ -376,7 +376,7 @@ "layout": "default", "style": { "navigationStyle": "custom", - "navigationBarTitleText": "经营考核 " + "navigationBarTitleText": "外部市场" } }, { @@ -387,6 +387,15 @@ "navigationStyle": "custom", "navigationBarTitleText": "三册" } + }, + { + "path": "wbsc/index", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "外部市场 " + } } ] }, @@ -611,6 +620,15 @@ { "root": "pages-production", "pages": [ + { + "path": "anquanguanli/index", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "安全管理" + } + }, { "path": "ribaoshuju/index", "type": "page", diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 272449f..192171f 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -137,12 +137,12 @@ }) } else { /*开发环境 */ - params.captcha = 'app'; + // params.captcha = 'app'; /*生产环境 */ - // params = { - // username: Base64.encode(encodeURIComponent(userName.value)), - // password: Base64.encode(encodeURIComponent(password.value)), - // }; + params = { + username: Base64.encode(encodeURIComponent(userName.value)), + password: Base64.encode(encodeURIComponent(password.value)), + }; } login(params) } diff --git a/src/pages/operation/index.vue b/src/pages/operation/index.vue index 1b956fb..f9d35c3 100644 --- a/src/pages/operation/index.vue +++ b/src/pages/operation/index.vue @@ -29,6 +29,11 @@ + + + + + @@ -44,6 +49,7 @@ } from 'vue'; import caiwuGuanli from '@/pages-operate/caiwu/index' import jingyingGuanli from '@/pages-operate/jingying/index' + import waibuGuanli from '@/pages-operate/wbsc/index' const items = ref(['计划财务', '经营考核', '外部市场']) const current = ref(0) const res = wx.getSystemInfoSync(); diff --git a/src/pages/production/index.vue b/src/pages/production/index.vue index 0fbad40..6dfc8c6 100644 --- a/src/pages/production/index.vue +++ b/src/pages/production/index.vue @@ -29,10 +29,23 @@ + + + + + + + + + + + + + + + - - @@ -49,6 +62,7 @@ import rbData from '@/pages-production/ribaoshuju/index'; import sssjData from '@/pages-production/shishishuju/index'; + import anquanData from '@/pages-production/anquanguanli/index'; const items = ref(['实时数据', '日报数据', '安全管理', '工程技术', '仪控设备']) const current = ref(0) const res = wx.getSystemInfoSync(); diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index 52ca5fa..27cec26 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -40,6 +40,7 @@ interface NavigateToOptions { "/pages-operate/file/index" | "/pages-operate/jingying/index" | "/pages-operate/sc/index" | + "/pages-operate/wbsc/index" | "/pages-humanResource/absence/add" | "/pages-humanResource/absence/detail" | "/pages-humanResource/absence/index" | @@ -72,6 +73,7 @@ interface NavigateToOptions { "/pages-bpm/unconventional/index" | "/pages-bpm/unconventional/stamp" | "/pages-bpm/zbkh/index" | + "/pages-production/anquanguanli/index" | "/pages-production/ribaoshuju/index" | "/pages-production/ribaoshuju/rbsjLsxq" | "/pages-production/ribaoshuju/trqRbsj" | diff --git a/src/utils/http.ts b/src/utils/http.ts index 888df04..1c0e315 100644 --- a/src/utils/http.ts +++ b/src/utils/http.ts @@ -51,7 +51,7 @@ export const http = (options: CustomRequestOptions) => { !options.hideErrorToast && uni.showToast({ icon: 'none', - title: (res.data as IResData).msg || '请求错误', + title: (res.data as IResData).msg, }) } // 使用z-paging，在底层的网络请求抛出异常时uni.$emit('z-paging-error-emit')，业务中可不写 diff --git a/src/utils/request.ts b/src/utils/request.ts index 79f05ab..1310aa2 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -30,7 +30,7 @@ const http = (options: CustomRequestOptions) => { !options.hideErrorToast && uni.showToast({ icon: 'none', - title: (res.data as T & { msg?: string })?.msg || '请求错误', + title: (res.data as T & { msg?: string })?.msg, }) reject(res) }