激活页面

src/pages/activateCard/activateCardCallback.js

@@ -9,24 +9,15 @@ wxService.page({
   /**
    * 页面的初始数据
    */
-  data: {
-
-  },
-
+  data: {},
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
-
-  },
-
+  onLoad () {},
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function () {
-
-  },
-
+  onReady () {},
   /**
    * 生命周期函数--监听页面显示
    */
@@ -38,7 +29,10 @@ wxService.page({
    this.handleGoActivateCard(this.options)
   },
   handleGoActivateCard(options={}) {
-    if(!options) return false
+    if(!options) {
+      this.goUserCenter()
+      return false
+    }
     options.activate_ticket = decodeURIComponent(options.activate_ticket)
     // 解析 url 参数 {}
     const parmasSubmitUrl = utils.parseUrl(options.wx_activate_after_submit_url)
@@ -48,7 +42,6 @@ wxService.page({
     wxService.post(`/member/activateCard`, currentObj).then(res => {
       const {result,data} = res.data
       if(result == 0){
-        // debugger
         // 激活成功 变更 _激活状态
         const baseUserInfo = wx.getStorageSync('_baseUserInfo')
         baseUserInfo.memberActivateStatus = true
@@ -56,7 +49,6 @@ wxService.page({
         if (data.code){
           baseUserInfo.memberCardNo = data.code
         }
-        wx.setStorageSync('_cardMember',data)
         // 更新缓存信息手机号码 relogin 
        this.handelReLogin()
       } else {
@@ -65,11 +57,11 @@ wxService.page({
           title: `${res.desc}`,
           icon: 'none'
         })
-        wxService.router(`/pages/userCenter/userCenter`).replace()
+        this.goUserCenter()
       }
     }).finally(() => {
       wx.hideLoading()
-      wxService.router(`/pages/userCenter/userCenter`).replace()
+      this.goUserCenter()
     })
   },
   handelReLogin(){
@@ -87,17 +79,29 @@ wxService.page({
             wx.setStorageSync('_baseUserInfo', dataResp)
             return Promise.resolve({ response })
           }).catch(err=>{
+            this.goUserCenter()
             return Promise.reject(err)
           })
+        } else {
+          wx.hideLoading()
+          wx.showToast({
+            title: `激活失败`,
+            icon: 'none'
+          })
+          this.goUserCenter()
         }
       },
       fail: (res) => {
         reject(res)
       }
     },()=>{
-      wxService.router(`/pages/userCenter/userCenter`).replace()
+      wx.hideLoading()
+      this.goUserCenter()
     })
   },
+  goUserCenter() {
+    wxService.router(`/pages/userCenter/userCenter`).replace()
+  },
   /**
    * 生命周期函数--监听页面隐藏
    */