Merge branch 'feature-zyw' into 'dev'

登录过期问题

See merge request !27

src/pages/activateCard/activateCardCallback.js

@@ -56,7 +56,6 @@ wxService.page({
         wx.setStorageSync('_baseUserInfo',baseUserInfo)
         // 更新缓存信息手机号码 relogin 
         wxService.relogin()
-
         wx.hideLoading()
         wxService.router(`/pages/userCenter/userCenter`)
       } else {

src/utils/wxService.js

@@ -47,31 +47,15 @@ class WXService extends Http {
       this.setPageLoadStatus()
       wx.hideLoading()
     }).catch(res => {
-      console.log('catch',res)
-      // this.reLogin()
-
-
       if (res.msg.indexOf('未登录') > -1) {
         // 重新登陆 更新缓存
         this.reLogin()
-        // wx.setStorageSync('token', '')
-        // const app = getApp()
-        // var _this = this
-        // let userInfo = wx.getStorageSync('_baseUserInfo')
-        // _this.login().then(result=>{
-        //   if(result.code){
-        //     _this.post(`/member/minaLogin`, {
-        //       code: result.code,
-        //       wechatInfo: userInfo,
-        //       brandId: app.globalData.brandId,
-        //     }).then(response=>{
-        //       let dataResp = response.data.data
-        //       wx.setStorageSync('token', dataResp.token)
-        //       wx.setStorageSync('_baseUserInfo', dataResp)
-        //     })
-        //   }
-        // })
-            
+        setTimeout(()=>{
+          const pages = getCurrentPages()
+          const perpage = pages[pages.length - 1]
+          perpage.onShow()
+        },2000)
+       
       } else if (res.state === 402) {
         return this.getUserInfo().then(() => {
           if (!this.getUserInfoLimitCount) {
@@ -155,6 +139,7 @@ class WXService extends Http {
             let dataResp = response.data.data
             wx.setStorageSync('token', dataResp.token)
             wx.setStorageSync('_baseUserInfo', dataResp)
+            console.log('555', wx.getStorageSync('token'))
             return Promise.resolve({ response })
           }).catch(err=>{
             return Promise.reject(err)