diff --git a/.gitignore b/.gitignore index 754227f..5e87962 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /unpackage - +/node_modules /.gitignore diff --git a/http/interface.js b/http/interface.js index 6fc39e3..2b241ba 100644 --- a/http/interface.js +++ b/http/interface.js @@ -4,7 +4,7 @@ */ export default { config: { - baseUrl: "https://warehouse.szjixun.cn", //"http://172.16.100.93:8017", //"http://192.168.88.175:9021",//测试 'https://warehouse.szjixun.cn' 正式 https://stock.szjixun.cn + baseUrl: "https://stock.szjixun.cn", //"http://172.16.100.93:8017", //"http://192.168.88.175:9021",//测试 'https://warehouse.szjixun.cn' 正式 https://stock.szjixun.cn header: { "Content-Type": "application/json;charset=UTF-8", // 'Content-Type':'application/x-www-form-urlencoded' @@ -61,13 +61,22 @@ export default { } } if (response.data?.status === 401) { - let curPage = getCurrentPages(); - let route = curPage[curPage.length - 1].route; //获取当前页面的路由 - if (route !== "pages/login/login") { - uni.navigateTo({ - url: "/pages/login/login", - }); - } + uni.showModal({ + title:'登录后使用完整功能', + success:(res)=>{ + if (res.confirm){ + let curPage = getCurrentPages(); + let route = curPage[curPage.length - 1].route; //获取当前页面的路由 + if (route !== "pages/login/login") { + uni.navigateTo({ + url: "/pages/login/login", + }); + } + } + + } + }) + } // 统一的响应日志记录 _reslog(response); diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue index e9711b8..4f55504 100644 --- a/pages/consignment-painting/index.vue +++ b/pages/consignment-painting/index.vue @@ -552,8 +552,15 @@ export default { uni.navigateTo({ url: `/pages/signwebview/index`, }); - this.loading=false + + }else { + uni.showToast({ + title: res.msg, + duration: 2000, + icon: "none", + }); } + this.loading=false }, async obtainAmount(index,list=false){ let data={ diff --git a/pages/login/login.vue b/pages/login/login.vue index e99a665..787f6ae 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,5 +1,6 @@