modify: 激活逻辑

src/pages/activateCard/activateCardCallback.js

@@ -48,17 +48,12 @@ wxService.page({
     wxService.post(`/member/activateCard`, currentObj).then(res => {
       const {result,data} = res.data
       if(result == 0){
-        // 变更 激活状态
-        //wx.setStorageSync('memberActivateStatus',true)
         // 激活成功 变更 _激活状态
         const baseUserInfo = wx.getStorageSync('_baseUserInfo')
         baseUserInfo.memberActivateStatus = true
         wx.setStorageSync('_baseUserInfo',baseUserInfo)
         // 更新缓存信息手机号码 relogin 
-        wxService.relogin()
-
-        wx.hideLoading()
-        wxService.router(`/pages/userCenter/userCenter`)
+        this.handelReLogin()
       } else {
         wx.hideLoading()
         wx.showToast({
@@ -67,11 +62,35 @@ wxService.page({
         })
         wxService.router(`/pages/userCenter/userCenter`)
       }
-    }).catch(err=>{
-      console.log('err', err)
+    }).finally(() => {
+      wx.hideLoading()
       wxService.router(`/pages/userCenter/userCenter`)
     })
   },
+  handelReLogin(){
+    wx.login({
+      success: (res) => {
+        wx.setStorageSync('_loginCode', res.code)
+        if(res.code){
+          wxService.post(`/member/minaLogin`, {
+            code: res.code,
+            wechatInfo: null,
+            brandId: app.globalData.brandId,
+          }).then(response=>{
+            let dataResp = response.data.data
+            wx.setStorageSync('token', dataResp.token)
+            wx.setStorageSync('_baseUserInfo', dataResp)
+            return Promise.resolve({ response })
+          }).catch(err=>{
+            return Promise.reject(err)
+          })
+        }
+      },
+      fail: (res) => {
+        reject(res)
+      }
+    })
+  },
   /**
    * 生命周期函数--监听页面隐藏
    */

src/pages/userCenter/userCenter.js

@@ -25,7 +25,6 @@ wxService.page({
     isAuthorization: false,
     pageId: 3
   },
-
   /**
    * 生命周期函数--监听页面加载
    */

src/utils/wxService.js

@@ -140,27 +140,29 @@ class WXService extends Http {
    * 
   */
   reLogin() {
-      wx.setStorageSync('token', '')
-      const app = getApp()
-      var _this = this
-      let accreditUserInfo = wx.getStorageSync('_accreditUserInfo')
-      return _this.login().then(result=>{
-        if(result.code){
-          _this.post(`/member/minaLogin`, {
-            code: result.code,
-            // wechatInfo: accreditUserInfo,
-            wechatInfo: null,
-            brandId: app.globalData.brandId,
-          }).then(response=>{
-            let dataResp = response.data.data
-            wx.setStorageSync('token', dataResp.token)
-            wx.setStorageSync('_baseUserInfo', dataResp)
-            return Promise.resolve({ response })
-          }).catch(err=>{
-            return Promise.reject(err)
-          })
-        }
-      })
+    wx.setStorageSync('token', '')
+    const app = getApp()
+    var _this = this
+    return _this.login().then(result=>{
+      if(result.code){
+        _this.post(`/member/minaLogin`, {
+          code: result.code,
+          wechatInfo: null,
+          brandId: app.globalData.brandId,
+        }).then(response=>{
+          let dataResp = response.data.data
+          wx.setStorageSync('token', dataResp.token)
+          wx.setStorageSync('_baseUserInfo', dataResp)
+          return Promise.resolve({ response })
+        }).catch(err=>{
+          return Promise.reject(err)
+        })
+      } else {
+        return Promise.reject({ state: 2, info: res.data.data })
+      }
+    }).catch(err=>{
+      console.log(err)
+    })
   } 
 
   login () {