update

src/app.wpy

@@ -18,19 +18,19 @@
             auth: {},
             auth: {},
             shop: {},
             shop: {},
             appCode: 'XXX',
             appCode: 'XXX',
-            // baseUrl: 'https://api.store.ledianyun.com',
-            // loginUrl: 'https://api.ledianyun.com',
-            // gtBaseUrl: "https://beego.ledianyun.com/api",
-            // baseUrlCater: 'https://api.ledianyun.com',
-            // baseUrlCater1: 'https://api.cy.ledianyun.com',
+            baseUrl: 'https://api.store.ledianyun.com',
+            loginUrl: 'https://api.ledianyun.com',
+            gtBaseUrl: "https://beego.ledianyun.com/api",
+            baseUrlCater: 'https://api.ledianyun.com',
+            baseUrlCater1: 'https://api.cy.ledianyun.com',
 
 
             gtBaseUrlOld: "https://gt.ledianyun.com/api",//兼容小管家旧版本的接口
             gtBaseUrlOld: "https://gt.ledianyun.com/api",//兼容小管家旧版本的接口
 
 
-            baseUrl: 'http://api.store.test.ledianyun.com',
-            loginUrl: 'http://api.test.ledianyun.com',
-            gtBaseUrl: "http://gt.test.ledianyun.com/api",
-            baseUrlCater: 'http://api.test.ledianyun.com',
-            baseUrlCater1: 'http://api.cy.test.ledianyun.com',
+            // baseUrl: 'http://api.store.test.ledianyun.com',
+            // loginUrl: 'http://api.test.ledianyun.com',
+            // gtBaseUrl: "http://gt.test.ledianyun.com/api",
+            // baseUrlCater: 'http://api.test.ledianyun.com',
+            // baseUrlCater1: 'http://api.cy.test.ledianyun.com',
 
 
             siteMtoken:'',//爆品所属站点的mToken
             siteMtoken:'',//爆品所属站点的mToken
             siteToken:'',//爆品所属站点的Token
             siteToken:'',//爆品所属站点的Token

src/utils/Http.js

@@ -16,14 +16,16 @@ export default class http {
 
 
           if(res.data.error == -1) {
           if(res.data.error == -1) {
             //  Tips.modal(res.data.error_reason,'温馨提示');
             //  Tips.modal(res.data.error_reason,'温馨提示');
-            wx.showModal({
+             wx.showModal({
               title: '温馨提示',
               title: '温馨提示',
               content: res.data.error_reason,
               content: res.data.error_reason,
-              showCancel: false,
+              confirmText:'重新登录',
               success: res => {
               success: res => {
-                wepy.reLaunch({
-                  url: '/pages/home/index'
-                })
+                if (res.confirm) {
+                  wepy.reLaunch({
+                    url: '/pages/home/index'
+                  })
+                } 
               },
               },
               fail: res => {
               fail: res => {
                 wepy.reLaunch({
                 wepy.reLaunch({