From 965bbc371f498e69978b028e22b061f4c9bea370 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Fri, 18 Aug 2023 19:13:25 +0800 Subject: [PATCH] 2023-8-18 --- supervise-uniapp/App.vue | 6 +- supervise-uniapp/common/config.js | 4 +- supervise-uniapp/common/request.api.js | 22 +- supervise-uniapp/common/wxSilentLogin.js | 10 +- .../components/SendCodeItem/SendCodeItem.vue | 2 +- supervise-uniapp/pages.json | 74 +++- .../pages/home/MessageFragment.vue | 289 +++++++++++++- supervise-uniapp/pages/home/UserFragment.vue | 70 ++-- supervise-uniapp/pages/home/WorkFragment.vue | 61 +-- .../pages/index/ChangePassword.vue | 167 ++++++++ .../pages/index/NotPermission.vue | 35 ++ supervise-uniapp/pages/index/NotReadWork.vue | 353 +++++++++++++++++ supervise-uniapp/pages/index/ReadWork.vue | 356 ++++++++++++++++++ .../pages/index/RegulatoryReporting.vue | 63 +++- supervise-uniapp/pages/index/SetUp.vue | 56 +++ supervise-uniapp/pages/index/SetUp2.vue | 114 ++++++ .../pages/index/WarehouseDetaile.vue | 15 +- supervise-uniapp/pages/login/login.vue | 6 +- .../static/baseIcon/NotPermission.png | Bin 0 -> 10406 bytes supervise-uniapp/utils/requester.js | 13 +- 20 files changed, 1608 insertions(+), 108 deletions(-) create mode 100644 supervise-uniapp/pages/index/ChangePassword.vue create mode 100644 supervise-uniapp/pages/index/NotPermission.vue create mode 100644 supervise-uniapp/pages/index/NotReadWork.vue create mode 100644 supervise-uniapp/pages/index/ReadWork.vue create mode 100644 supervise-uniapp/pages/index/SetUp.vue create mode 100644 supervise-uniapp/pages/index/SetUp2.vue create mode 100644 supervise-uniapp/static/baseIcon/NotPermission.png diff --git a/supervise-uniapp/App.vue b/supervise-uniapp/App.vue index 143e52f6..dea58b33 100644 --- a/supervise-uniapp/App.vue +++ b/supervise-uniapp/App.vue @@ -3,12 +3,16 @@ export default { globalData: { // wxSilentLoginURL: "https://supervise.yxtsoft.com/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: "", isLogin: false, sid: "", + headImage: "", + username: "", + orgNamePath: "", + organizationSid: "", }, //全局变量， onLaunch: function() { diff --git a/supervise-uniapp/common/config.js b/supervise-uniapp/common/config.js index 21bf674c..6137029a 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.116: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 e12e91b9..5da68b84 100644 --- a/supervise-uniapp/common/request.api.js +++ b/supervise-uniapp/common/request.api.js @@ -59,9 +59,9 @@ export default { // "/report/reportstock/getDayProduct/" + params, params), // 监管数据总览 - getProjectDaily: (params = {}) => request.get( - "/reportwxmpapi/projectdaily/getProjectDaily/" + params.projectSid + "/" + params.orderDate, params), - // "/report/projectdaily/getProjectDaily/" + params.projectSid + "/" + params.orderDate, params), + getProjectDaily: (params = {}) => request.post( + "/reportwxmpapi/projectdaily/getProjectDaily", params), + // "/report/projectdaily/getProjectDaily", params), // 项目监管报表 getProjectDailyFiles: (params = {}) => request.get( @@ -72,7 +72,7 @@ export default { // 获取首页面数据 - getWorkData: (params = {}) => request.get("/api/portal/v1/flow/task/" + params, params), + getWorkData: (params = {}) => request.get("/report/messagepushlog/numberOfJobs/" + params, params), // 获取云仓列表 storeHouseListPage: (params = {}) => request.post("/api/portal/v1/flow/storeHouseListPage", params), @@ -96,4 +96,18 @@ export default { // 获取数据总览列表 projectListPage: (params = {}) => request.post("/reportwxmpapi/projectdaily/selectListPage", params), + + // 获取消息总览 + messageListPage: (params = {}) => request.post("/reportwxmpapi/messagepushlog/listPage", params), + + + + + + // 修改密码 + updatePassword: (params = {}) => request.post("/portal/v1/sysuser/updatePassword", params), + + // 修改头像 + uploadHandImage: (params = {}) => request.post("/portal/v1/sysuser/uploadImage", params), + } \ No newline at end of file diff --git a/supervise-uniapp/common/wxSilentLogin.js b/supervise-uniapp/common/wxSilentLogin.js index 21b4c22a..0c8d6139 100644 --- a/supervise-uniapp/common/wxSilentLogin.js +++ b/supervise-uniapp/common/wxSilentLogin.js @@ -75,12 +75,18 @@ const wxSilentLogin = () => { getApp().globalData.username = res.data.data - .userName + .name getApp().globalData.token = res.data.data.token getApp().globalData.sid = res.data.data.sid getApp().globalData.mobile = res.data.data .mobile - getApp().globalData.isLogin = true + + getApp().globalData.isAdmin = res.data.data.isAdmin + getApp().globalData.orgNamePath = res.data.data.orgNamePath + getApp().globalData.organizationSid = res.data.data.organizationSid + getApp().globalData.headImage = res.data.data.headImage + + getApp().globalData.isLogin = true uni.setStorageSync("Global-Auth-Token", res.data .data.token) diff --git a/supervise-uniapp/components/SendCodeItem/SendCodeItem.vue b/supervise-uniapp/components/SendCodeItem/SendCodeItem.vue index 0c19b82d..c9b521cd 100644 --- a/supervise-uniapp/components/SendCodeItem/SendCodeItem.vue +++ b/supervise-uniapp/components/SendCodeItem/SendCodeItem.vue @@ -129,7 +129,7 @@ } } }, - props: ['phoneNum', 'url', 'data', 'sendByCookie'], + props: ['phoneNum',"type", 'url', 'data', 'sendByCookie'], } diff --git a/supervise-uniapp/pages.json b/supervise-uniapp/pages.json index 6a6c5fc8..ae222a37 100644 --- a/supervise-uniapp/pages.json +++ b/supervise-uniapp/pages.json @@ -12,6 +12,7 @@ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages + // #ifdef APP-PLUS { @@ -32,7 +33,20 @@ } }, + { + "path": "pages/index/RegulatoryReporting", + "style": { + "navigationBarTitleText": "监管数据总览" + } + }, + { + "path": "pages/index/NotPermission", + "style": { + "navigationBarTitleText": "温馨提示", + "enablePullDownRefresh": false + } + }, { "path": "pages/index/BindPhone", "style": { @@ -44,7 +58,7 @@ } }, - + { "path": "pages/index/BindPhone2", "style": { @@ -97,13 +111,6 @@ - - { - "path": "pages/index/RegulatoryReporting", - "style": { - "navigationBarTitleText": "监管数据总览" - } - }, { "path": "pages/index/AlreadyProcessed", "style": { @@ -221,7 +228,8 @@ { "path": "pages/home/MessageFragment", "style": { - "navigationBarTitleText": "消息" + "navigationBarTitleText": "消息", + "enablePullDownRefresh": true } }, { "path": "pages/index/WarehouseList", @@ -247,7 +255,53 @@ } } - ], + + ,{ + "path" : "pages/index/NotReadWork", + "style" : + { + "navigationBarTitleText": "待阅工作", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/index/ReadWork", + "style" : + { + "navigationBarTitleText": "已阅工作", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/index/SetUp", + "style" : + { + "navigationBarTitleText": "设置", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/index/SetUp2", + "style" : + { + "navigationBarTitleText": "个人信息", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/index/ChangePassword", + "style" : + { + "navigationBarTitleText": "修改密码", + "enablePullDownRefresh": false + } + + } + ], "lazyCodeLoading": "requiredComponents", "globalStyle": { "pageOrientation": "portrait", diff --git a/supervise-uniapp/pages/home/MessageFragment.vue b/supervise-uniapp/pages/home/MessageFragment.vue index 355891de..435dbf31 100644 --- a/supervise-uniapp/pages/home/MessageFragment.vue +++ b/supervise-uniapp/pages/home/MessageFragment.vue @@ -1,6 +1,35 @@ @@ -9,17 +38,48 @@ export default { data() { return { + triggered: true, + status: 'loadmore', + iconType: 'flower', + loadText: { + loadmore: '轻轻上拉', + loading: '努力加载中', + nomore: '拉也没用，没有了' + }, + listQuery: { + current: 1, + size: 10, + params: { + userSid: "", + messageName: "", + state: "2", //0未读 1 已读 2全部 + } + }, + loadingType: 'more', //加载更多状态 + dataList: [ + ], }; }, - onShow() { - console.log('onShow', getApp().globalData.isLogin) - + onPullDownRefresh() { + this.listQuery.current = 1 + this.loadData('refresh'); + setTimeout(function() { + uni.stopPullDownRefresh(); + }, 2000); + }, + //加载更多 + onReachBottom() { + this.listQuery.current = this.listQuery.current + 1 + this.loadData(); + }, + onLoad() { + let token = uni.getStorageSync("Global-Auth-Token") if (token != null && token.length != 0) { getApp().globalData.token = token } - let isLogin =uni.getStorageSync("isLogin") + let isLogin = uni.getStorageSync("isLogin") if (isLogin != null && isLogin == 1) { getApp().globalData.isLogin = isLogin } @@ -27,26 +87,29 @@ if (sid != null && sid.length != 0) { getApp().globalData.sid = sid } - + console.log('用户Sid', getApp().globalData.sid) console.log('token', getApp().globalData.token) console.log('是否登陆', getApp().globalData.isLogin) - + // setTimeout(() => { if (getApp().globalData.isLogin) { var userSid = getApp().globalData.sid console.log(">>>>>", userSid) - // this.getData(userSid, true) + + this.listQuery.params.userSid = userSid + + this.loadData(); // uni.setTabBarBadge({ //显示数字 // index: 0, //tabbar下标 // text: '100' //数字 // }) } else { - + /* #ifdef MP-WEIXIN */ this.WxSilentLogin() /* #endif */ - + /* #ifdef APP-PLUS */ uni.redirectTo({ url: '../login/login' @@ -54,10 +117,214 @@ /* #endif */ } }, - methods: {} + onShow() { + console.log('onShow', getApp().globalData.isLogin) + + if (this.dataList.length > 0) { + var num = 0 + for (var i = 0; i < this.dataList.length; i++) { + var item = this.dataList[i] + if (item.ostate == '0') { + num++; + } + + } + + console.log('num', num) + if (num != 0) { + uni.setTabBarBadge({ //显示数字 + index: 1, //tabbar下标 + text: num > 100 ? "99+" : num + "" //数字 + }) + } + } + + }, + methods: { + itemClick(item) { + console.log('item', item.pagepath) + uni.navigateTo({ + url: "/" + item.pagepath + }) + + item.ostate = "2" + + + }, + //加载商品 ，带下拉刷新和上滑加载 + async loadData(type = 'add', loading) { + //没有更多直接返回 + if (type === 'add') { + if (this.loadingType === 'nomore') { + return; + } + this.loadingType = 'loading'; + } else { + this.loadingType = 'more'; + } + + var list = [] + + this.$api.messageListPage(this.listQuery).then((resp) => { + // if (resp.success) { + console.log('1111', resp) + + // list = resp.records + + for (var i = 0; i < resp.records.length; i++) { + var item = resp.records[i] + var title = item.map.thing2 + console.log("title", title) + + list.push({ + messageName: title, + name: item.map.thing3, + date: item.map.time1, + pagepath: item.pagepath, + ostate: item.ostate + }) + + } + + + + console.log("消息列表", list) + if (type === 'refresh') { + this.dataList = []; + } + + this.dataList = this.dataList.concat(list); + console.log("消息列表>>>>>", this.dataList.length) + + if (this.dataList.length > 0) { + var num = 0 + for (var i = 0; i < this.dataList.length; i++) { + var item = this.dataList[i] + if (item.ostate == '0') { + num++; + } + + } + if (num != 0) { + + uni.setTabBarBadge({ //显示数字 + index: 1, //tabbar下标 + text: num > 100 ? "99+" : num + "" //数字 + }) + } + } + + + //判断是否还有下一页，有是more 没有是nomore(测试数据判断大于20就没有了) + this.loadingType = this.dataList.length > list.total ? 'nomore' : 'more'; + if (type === 'refresh') { + if (loading == 1) { + uni.hideLoading(); + } else { + uni.stopPullDownRefresh(); + } + } + + }).catch(e => { + console.log('eeeee', e) + }) + + }, + + } } \ No newline at end of file diff --git a/supervise-uniapp/pages/home/UserFragment.vue b/supervise-uniapp/pages/home/UserFragment.vue index 1865a005..aea7e9f4 100644 --- a/supervise-uniapp/pages/home/UserFragment.vue +++ b/supervise-uniapp/pages/home/UserFragment.vue @@ -3,27 +3,29 @@ - + - {{info.name}} - 用户号：{{info.mobile}} + {{name}} + {{orgName}} - + + - - + + @@ -31,7 +33,8 @@ --> - + @@ -46,12 +49,9 @@ export default { data() { return { - baseUrl:"https://supervise.yxtsoft.com/img", - info: { - name: "石家庄市宇信通电子有限公司", - mobile: "651651351651", - - }, + baseUrl: "", + name: "", + orgName:"", version: "" }; }, @@ -67,14 +67,14 @@ /* #endif */ }, onShow() { - + console.log('onShow', getApp().globalData.isLogin) - + let token = uni.getStorageSync("Global-Auth-Token") if (token != null && token.length != 0) { getApp().globalData.token = token } - let isLogin =uni.getStorageSync("isLogin") + let isLogin = uni.getStorageSync("isLogin") if (isLogin != null && isLogin == 1) { getApp().globalData.isLogin = isLogin } @@ -82,36 +82,54 @@ if (sid != null && sid.length != 0) { getApp().globalData.sid = sid } - + console.log('用户Sid', getApp().globalData.sid) console.log('token', getApp().globalData.token) console.log('是否登陆', getApp().globalData.isLogin) - + // setTimeout(() => { if (getApp().globalData.isLogin) { var userSid = getApp().globalData.sid + var headImage = getApp().globalData.headImage + var username = getApp().globalData.username + var orgNamePath = getApp().globalData.orgNamePath console.log(">>>>>", userSid) + console.log(">>>>>", headImage) + console.log(">>>>>", username) + console.log(">>>>>", orgNamePath) + + this.name = username + this.orgName = orgNamePath==""?"暂无数据":orgNamePath + this.baseUrl = headImage==""?"https://supervise.yxtsoft.com/img/user/userImage.png":headImage + + // this.getData(userSid, true) // uni.setTabBarBadge({ //显示数字 // index: 0, //tabbar下标 // text: '100' //数字 // }) } else { - + /* #ifdef MP-WEIXIN */ this.WxSilentLogin() /* #endif */ - + /* #ifdef APP-PLUS */ uni.redirectTo({ url: '../login/login' }) /* #endif */ } - + }, methods: { + chooseImage(){ + uni.navigateTo({ + url: '../index/SetUp2' + }); + }, click(id) { + switch (id) { case "0": uni.navigateTo({ @@ -121,6 +139,9 @@ case "1": break; case "2": + uni.navigateTo({ + url: '../index/SetUp' + }); break; case "3": break; @@ -149,13 +170,14 @@ display: flex; flex-direction: row; align-items: center; - padding: 25px; + padding:15px 25px; .img { margin-top: 10px; margin-left: 10px; - width: 50px; - height: 50px; + width: 60px; + height: 60px; + border-radius: 5px; } .top_right { diff --git a/supervise-uniapp/pages/home/WorkFragment.vue b/supervise-uniapp/pages/home/WorkFragment.vue index cf8ee24c..f1dd2ed0 100644 --- a/supervise-uniapp/pages/home/WorkFragment.vue +++ b/supervise-uniapp/pages/home/WorkFragment.vue @@ -19,7 +19,7 @@ - + {{dyNum}} @@ -297,10 +297,19 @@ console.log('1111', resp) this.isShow = msg; this.dbNum = resp.todoNumber - this.dyNum = resp.pendingWork + this.dyNum = resp.pendingMessages this.textArr = resp.notice - this.swipers = resp.imageUrl - + this.swipers = resp.urls + + if(this.dyNum!=0){ + uni.setTabBarBadge({ //显示数字 + index: 1, //tabbar下标 + text: this.dyNum > 100 ? "99+" : this.dyNum + "" //数字 + }) + + } + + }).catch(e => { console.log('eeeee', e) }) @@ -310,40 +319,46 @@ switch (index) { case "1": // 待办 - uni.showToast({ - icon: "none", - title: '待办', - duration: 2000, - }); + // uni.showToast({ + // icon: "none", + // title: '待办', + // duration: 2000, + // }); uni.navigateTo({ url: '../index/WaitingProcessed' }); break; case "2": // 已办 - uni.showToast({ - icon: "none", - title: '已办', - duration: 2000, - }); + // uni.showToast({ + // icon: "none", + // title: '已办', + // duration: 2000, + // }); uni.navigateTo({ url: '../index/AlreadyProcessed' }); break; case "3": // 待阅 - uni.showToast({ - icon: "none", - title: '待阅', - duration: 2000, + // uni.showToast({ + // icon: "none", + // title: '待阅', + // duration: 2000, + // }); + uni.navigateTo({ + url: '../index/NotReadWork' }); break; case "4": // 已阅 - uni.showToast({ - icon: "none", - title: '已阅', - duration: 2000, + // uni.showToast({ + // icon: "none", + // title: '已阅', + // duration: 2000, + // }); + uni.navigateTo({ + url: '../index/ReadWork' }); break; default: diff --git a/supervise-uniapp/pages/index/ChangePassword.vue b/supervise-uniapp/pages/index/ChangePassword.vue new file mode 100644 index 00000000..2d893a65 --- /dev/null +++ b/supervise-uniapp/pages/index/ChangePassword.vue @@ -0,0 +1,167 @@ + + + + + \ No newline at end of file diff --git a/supervise-uniapp/pages/index/NotPermission.vue b/supervise-uniapp/pages/index/NotPermission.vue new file mode 100644 index 00000000..73706362 --- /dev/null +++ b/supervise-uniapp/pages/index/NotPermission.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/supervise-uniapp/pages/index/NotReadWork.vue b/supervise-uniapp/pages/index/NotReadWork.vue new file mode 100644 index 00000000..33508c6c --- /dev/null +++ b/supervise-uniapp/pages/index/NotReadWork.vue @@ -0,0 +1,353 @@ + + + + + \ No newline at end of file diff --git a/supervise-uniapp/pages/index/ReadWork.vue b/supervise-uniapp/pages/index/ReadWork.vue new file mode 100644 index 00000000..b539f5d0 --- /dev/null +++ b/supervise-uniapp/pages/index/ReadWork.vue @@ -0,0 +1,356 @@ + + + + + \ No newline at end of file diff --git a/supervise-uniapp/pages/index/RegulatoryReporting.vue b/supervise-uniapp/pages/index/RegulatoryReporting.vue index 8131f85b..f9256bcb 100644 --- a/supervise-uniapp/pages/index/RegulatoryReporting.vue +++ b/supervise-uniapp/pages/index/RegulatoryReporting.vue @@ -121,6 +121,8 @@ params: { projectSid: "", orderDate: "", + wxCode:"", + userSid:"" }, info: { projectName: "", @@ -186,38 +188,42 @@ this.params = { projectSid: option.projectSid, - orderDate: option.orderDate + orderDate: option.orderDate, } }, onShow() { wx.hideHomeButton() + this.init() // setTimeout(() => { // }, 1000) - this.getServerData(); + console.log('userSid>>>>>>', getApp().globalData.sid) + this.params.userSid = getApp().globalData.sid + }, methods: { init() { - // var chart = this.$echarts.init(this.$refs["myChart"]); - // this.$refs["myChart"].getZr().on('click', params => { - - // let pointInPixel = [params.offsetX, params.offsetY] - - // if (chart.containPixel('grid', pointInPixel)) { - - // let xIndex = chart.convertFromPixel({ - // seriesIndex: 0 - // }, [params.offsetX, params.offsetY])[0] - - // console.log(xIndex) - - // this.select_index = xIndex - - // } - - // }) + let that = this + wx.login({ + success: function(res) { + if (res.code) { + console.log('Http网络请求信息', { + "wxCode": res.code + }) + + that.params.wxCode = res.code + that.getServerData(); + } + }, + fail: function(res) { + uni.showToast({ + title: "网络错误，请退出后重新进入。", + icon: 'none' + }) + } + }); }, getServerData() { @@ -327,6 +333,23 @@ }).catch(e => { console.log('eeeee', e) + + // code 410无权限 420需要绑定 + + if(e.code==410){ + uni.redirectTo({ + url:"/pages/index/NotPermission" + }) + + } + + if(e.code==420){ + uni.redirectTo({ + url:"/pages/index/BindPhone" + }) + } + + }) diff --git a/supervise-uniapp/pages/index/SetUp.vue b/supervise-uniapp/pages/index/SetUp.vue new file mode 100644 index 00000000..853525a2 --- /dev/null +++ b/supervise-uniapp/pages/index/SetUp.vue @@ -0,0 +1,56 @@ + + + + + \ No newline at end of file diff --git a/supervise-uniapp/pages/index/SetUp2.vue b/supervise-uniapp/pages/index/SetUp2.vue new file mode 100644 index 00000000..2f3f9e00 --- /dev/null +++ b/supervise-uniapp/pages/index/SetUp2.vue @@ -0,0 +1,114 @@ + + + + + \ No newline at end of file diff --git a/supervise-uniapp/pages/index/WarehouseDetaile.vue b/supervise-uniapp/pages/index/WarehouseDetaile.vue index 2081583d..e1fbcd7e 100644 --- a/supervise-uniapp/pages/index/WarehouseDetaile.vue +++ b/supervise-uniapp/pages/index/WarehouseDetaile.vue @@ -140,8 +140,19 @@ console.log('1111', resp) this.info = resp this.info.swipers =[] - this.info.swipers.push( - resp.picUrl) + + if(resp.pics.length==0){ + + this.info.swipers.push( + resp.picUrl) + }else{ + + for (var i = 0; i { console.log('eeeee', e) diff --git a/supervise-uniapp/pages/login/login.vue b/supervise-uniapp/pages/login/login.vue index 7cedb8e8..bec0266c 100644 --- a/supervise-uniapp/pages/login/login.vue +++ b/supervise-uniapp/pages/login/login.vue @@ -215,10 +215,10 @@ getApp().globalData.token = uinfo.token getApp().globalData.sid = uinfo.sid getApp().globalData.mobile = uinfo.mobile - getApp().globalData.name = uinfo.name getApp().globalData.isAdmin = uinfo.isAdmin - getApp().globalData.roleName = uinfo.roleName - getApp().globalData.staffSid = uinfo.staffSid + getApp().globalData.orgNamePath = uinfo.orgNamePath + getApp().globalData.organizationSid = uinfo.organizationSid + getApp().globalData.headImage = uinfo.headImage getApp().globalData.isLogin= true uni.setStorageSync("Global-Auth-Token", uinfo.token) diff --git a/supervise-uniapp/static/baseIcon/NotPermission.png b/supervise-uniapp/static/baseIcon/NotPermission.png new file mode 100644 index 0000000000000000000000000000000000000000..1f0bbd1f3bbf0cea72607b957ec3cb796ec06d03 GIT binary patch literal 10406 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 MqN7};X#M7Y06Md}wg3PC literal 0 HcmV?d00001 diff --git a/supervise-uniapp/utils/requester.js b/supervise-uniapp/utils/requester.js index 86476061..4a3d1c46 100644 --- a/supervise-uniapp/utils/requester.js +++ b/supervise-uniapp/utils/requester.js @@ -93,11 +93,12 @@ const request = (options) => { }); } else { if (_opts.showFailMessage) { - uni.showToast({ - title: data.msg, - icon: 'none', - duration: 2000, - }) + console.log('1111') + // uni.showToast({ + // title: data.msg, + // icon: 'none', + // duration: 2000, + // }) } } reject(data) @@ -126,6 +127,7 @@ const request = (options) => { } } if (_opts.showFailMessage) { + console.log('22222') uni.showToast({ title: em.msg, icon: 'none', @@ -148,6 +150,7 @@ const request = (options) => { // em.msg = error.errMsg } if (_opts.showFailMessage) { + console.log('3333333') uni.showToast({ title: em.msg, icon: 'none',