From f8c36dca0c08c8ac4fd29d0a156159d3b8f71301 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Sun, 3 Sep 2023 10:06:37 +0800 Subject: [PATCH] 2023-9-3 --- supervise-uniapp/App.vue | 3 +- supervise-uniapp/common/config.js | 4 +- supervise-uniapp/common/request.api.js | 10 +- supervise-uniapp/manifest.json | 20 ++-- supervise-uniapp/pages.json | 2 +- supervise-uniapp/pages/home/UserFragment.vue | 14 +-- supervise-uniapp/pages/home/WorkFragment.vue | 6 +- .../pages/index/DataAssembleList.vue | 2 +- supervise-uniapp/pages/index/MyProject.vue | 3 +- .../pages/index/ProjectDetail.vue | 67 ++++++++----- supervise-uniapp/pages/index/SetUp.vue | 41 +++++++- supervise-uniapp/pages/index/SetUp2.vue | 4 +- .../pages/index/WarehouseDetaile.vue | 94 ++++++++++++------ supervise-uniapp/plugins/APPUpdate/index.js | 2 +- supervise-uniapp/static/baseIcon/loading.gif | Bin 57378 -> 0 bytes supervise-uniapp/static/ic_ar.png | Bin 32403 -> 0 bytes 16 files changed, 182 insertions(+), 90 deletions(-) delete mode 100644 supervise-uniapp/static/baseIcon/loading.gif delete mode 100644 supervise-uniapp/static/ic_ar.png diff --git a/supervise-uniapp/App.vue b/supervise-uniapp/App.vue index dea58b33..cd0d74e5 100644 --- a/supervise-uniapp/App.vue +++ b/supervise-uniapp/App.vue @@ -3,7 +3,8 @@ export default { globalData: { // wxSilentLoginURL: "https://supervise.yxtsoft.com/portal/v1/wxuser/wxSilentLogin", - wxSilentLoginURL: "http://192.168.1.110:8112/portal/v1/wxuser/wxSilentLogin", + wxSilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/wxSilentLogin", + // wxSilentLoginURL: "http://192.168.1.110:8112/portal/v1/wxuser/wxSilentLogin", wxAuthLoginURL: "https://supervise.yxtsoft.com/api/portal//v1/wxuser/wxAuthLogin", SilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/SilentLogin",// 注册 token: "", diff --git a/supervise-uniapp/common/config.js b/supervise-uniapp/common/config.js index 6137029a..bb2594a4 100644 --- a/supervise-uniapp/common/config.js +++ b/supervise-uniapp/common/config.js @@ -7,9 +7,9 @@ */ module.exports = { // baseUrl: 'https://jianguan.yyundong.com/api', - // baseUrl: 'https://supervise.yxtsoft.com', + baseUrl: 'https://supervise.yxtsoft.com', // baseUrl: 'http://192.168.1.193:8112', - baseUrl: 'http://192.168.1.110:8112', + // baseUrl: 'http://192.168.1.110:8112', tokenName: "Authorization", // 请求头中token的名字，与服务器端对应 loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码 loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面 diff --git a/supervise-uniapp/common/request.api.js b/supervise-uniapp/common/request.api.js index 5da68b84..9cfe7ac1 100644 --- a/supervise-uniapp/common/request.api.js +++ b/supervise-uniapp/common/request.api.js @@ -72,7 +72,7 @@ export default { // 获取首页面数据 - getWorkData: (params = {}) => request.get("/report/messagepushlog/numberOfJobs/" + params, params), + getWorkData: (params = {}) => request.get("/reportwxmpapi/messagepushlog/numberOfJobs/" + params, params), // 获取云仓列表 storeHouseListPage: (params = {}) => request.post("/api/portal/v1/flow/storeHouseListPage", params), @@ -87,8 +87,8 @@ export default { getProjectBySid: (params = {}) => request.get("/api/crm/v1/projectinformation/getProjectBySid/" + params, params), - // 获取我的项目-仓库详情 - getStorehouseBySid: (params = {}) => request.get("/api/crm/v1/projectinformation/getStorehouseBySid/" + params, + // 获取我的项目-仓库详情 + getStorehouseBySid: (params = {}) => request.post("/api/crm/v1/storehouseproject/selectStoreBySid/" + params, params), // 获取库存信息列表 @@ -105,9 +105,9 @@ export default { // 修改密码 - updatePassword: (params = {}) => request.post("/portal/v1/sysuser/updatePassword", params), + updatePassword: (params = {}) => request.post("/api/portal/v1/sysuser/updatePassword", params), // 修改头像 - uploadHandImage: (params = {}) => request.post("/portal/v1/sysuser/uploadImage", params), + uploadHandImage: (params = {}) => request.post("/api/portal/v1/sysuser/uploadImage", params), } \ No newline at end of file diff --git a/supervise-uniapp/manifest.json b/supervise-uniapp/manifest.json index 35b8263b..d0fcbf9d 100644 --- a/supervise-uniapp/manifest.json +++ b/supervise-uniapp/manifest.json @@ -29,7 +29,8 @@ "Barcode" : {}, "Contacts" : {}, "Push" : {}, - "OAuth" : {} + "OAuth" : {}, + "Geolocation" : {} }, "distribute" : { "android" : { @@ -38,15 +39,20 @@ "", "", "", + "", + "", "", "", "", "", "", "", + "", "", "", + "", "", + "", "", "", "", @@ -68,10 +74,8 @@ "sdkConfigs" : { "ad" : {}, "geolocation" : { - "amap" : { - "__platform__" : [ "android" ], - "appkey_ios" : "", - "appkey_android" : "" + "system" : { + "__platform__" : [ "ios", "android" ] } }, "push" : {}, @@ -123,10 +127,10 @@ "mp-weixin" : { "appid" : "wx05604ce2a8bede05", "setting" : { - "urlCheck" : false, + "urlCheck" : true, "es6" : false, - "minified" : false, - "postcss" : false + "minified" : true, + "postcss" : true }, "optimization" : { "subPackages" : true diff --git a/supervise-uniapp/pages.json b/supervise-uniapp/pages.json index ae222a37..7ed45804 100644 --- a/supervise-uniapp/pages.json +++ b/supervise-uniapp/pages.json @@ -326,7 +326,7 @@ "selectedColor": "#41adf8", "backgroundColor": "#FFFFFF", "borderStyle": "black", - "iconWidth": "25px", // 字体大小 + "iconWidth": "13px", // 字体大小 "list": [{ "pagePath": "pages/home/WorkFragment", "iconPath": "static/bottom-icon/gongzuotai1.png", diff --git a/supervise-uniapp/pages/home/UserFragment.vue b/supervise-uniapp/pages/home/UserFragment.vue index aea7e9f4..31aa85a8 100644 --- a/supervise-uniapp/pages/home/UserFragment.vue +++ b/supervise-uniapp/pages/home/UserFragment.vue @@ -3,7 +3,7 @@ - + @@ -28,15 +28,15 @@ - + - - - + --> + @@ -98,8 +98,8 @@ console.log(">>>>>", username) console.log(">>>>>", orgNamePath) - this.name = username - this.orgName = orgNamePath==""?"暂无数据":orgNamePath + this.name = username==""?"用户名称":username + this.orgName = orgNamePath==""?"暂无部门信息":orgNamePath this.baseUrl = headImage==""?"https://supervise.yxtsoft.com/img/user/userImage.png":headImage diff --git a/supervise-uniapp/pages/home/WorkFragment.vue b/supervise-uniapp/pages/home/WorkFragment.vue index f1dd2ed0..acb57571 100644 --- a/supervise-uniapp/pages/home/WorkFragment.vue +++ b/supervise-uniapp/pages/home/WorkFragment.vue @@ -1,7 +1,7 @@