生产激活跳转

src/component/personCenter/personCenter.js

@@ -13,20 +13,21 @@ Component({
 			type: Number,
 			value: 0,
     },
-    cardMember: {
-      type: Object,
-      value: {},
-    },
+    // cardMember: {
+    //   type: Object,
+    //   value: {},
+    // },
     baseUserInfo: {
       type: Object,
       value: {},
-      observer(newVal){
-        this.setData({
-          memberActivateStatus: newVal && newVal.memberActivateStatus || false,
-          memberCardNo: newVal && newVal.memberCardNo || '',
-          currentMobile: newVal && newVal.member && newVal.member.mobile  || '',
-        })
-      }
+      observer: '_userInfoChange'
+      // observer(newVal){
+      //   this.setData({
+      //     memberActivateStatus: newVal && newVal.memberActivateStatus || false,
+      //     memberCardNo: newVal && newVal.memberCardNo || '',
+      //     currentMobile: newVal && newVal.member && newVal.member.mobile  || '',
+      //   })
+      // }
     },
     couponNum:  {
 			type: Number,
@@ -55,7 +56,13 @@ Component({
     isAuthorization: false,
     _token: '',
     currentMobile: '',
-    baseImgUrl: ''
+    baseImgUrl: '',
+    storgeUserInfo:  wx.getStorageSync('_baseUserInfo')
+  },
+  observers: {
+    '**': function(e) {
+      // 每次 setData 都触发
+    },
   },
   attached () {
     this.setData({
@@ -63,27 +70,21 @@ Component({
       baseImgUrl: app.globalData.imageUrl
     })
   
-    const { cardMember } = this.data
-    if(cardMember){
-      this.setData({
-        currentMobile: cardMember.mobile || ''
-      })
-    }
-
-    // const baseUserInfo = wx.getStorageSync('_baseUserInfo')
-    // if (baseUserInfo && baseUserInfo.member && baseUserInfo.member.mobile) {
-    //   console.log('cccc', baseUserInfo.member.mobile)
-    //   this.setData({
-    //     currentMobile: baseUserInfo.member.mobile
-    //   })
-    // }
-
     // let base64 = wx.getFileSystemManager().readFileSync(this.data.baseUrl, "base64");
     // this.setData({
     //   baseUrl: "data:image/png;base64," + base64
     // })
   },
   methods: {
+    _userInfoChange(newVal, oldVal) {
+      if (newVal !== oldVal) {
+        this.setData({
+          memberActivateStatus: newVal && newVal.memberActivateStatus || false,
+          memberCardNo: newVal && newVal.memberCardNo || '',
+          currentMobile: newVal && newVal.member && newVal.member.mobile || '',
+        })
+      }
+    },
     handleToMemberOfOwn() {
       wxService.router(`/pages/memberOfOwn/memberOfOwn`)
     },
@@ -105,5 +106,8 @@ Component({
     handleGoWxCard() {
       wxService.openCard()
     }
+  },
+  detached() {
+    this._userInfoChange = null
   }
 })
\ No newline at end of file

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)
@@ -55,7 +49,6 @@ wxService.page({
         if (data.code){
           baseUserInfo.memberCardNo = data.code
         }
-        wx.setStorageSync('_cardMember',data)
         // 更新缓存信息手机号码 relogin 
        this.handelReLogin()
       } else {
@@ -64,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(){
@@ -82,22 +75,36 @@ wxService.page({
             brandId: app.globalData.brandId,
           }).then(response=>{
             let dataResp = response.data.data
-            wx.setStorageSync('reLoginErr', false)
             wx.setStorageSync('token', dataResp.token)
             wx.setStorageSync('_baseUserInfo', dataResp)
+            this.goUserCenter()
             return Promise.resolve({ response })
           }).catch(err=>{
+            this.goUserCenter()
             return Promise.reject(err)
           })
+        } else {
+          wx.hideLoading()
+          wx.showToast({
+            title: `激活失败`,
+            icon: 'none'
+          })
+          this.goUserCenter()
         }
       },
       fail: (res) => {
+        wx.hideLoading()
+        this.goUserCenter()
         reject(res)
       }
     },()=>{
-      wxService.router(`/pages/userCenter/userCenter`).replace()
+      wx.hideLoading()
+      this.goUserCenter()
     })
   },
+  goUserCenter() {
+    wxService.router(`/pages/userCenter/userCenter`).replace()
+  },
   /**
    * 生命周期函数--监听页面隐藏
    */

src/pages/userCenter/userCenter.wxml

@@ -10,7 +10,7 @@
 
     <!-- 个人中心  {{pItem.customer}}-->
   <view class="pd1530" wx:if="{{pItem.type == 2}}">
-   <person-center base-user-info="{{baseUserInfo}}" card-member="{{cardMember}}"  person-data="{{pItem.customer}}" integral-num="{{integralNum}}" coupon-num="{{couponNum}}" token="{{token}}"/>
+   <person-center base-user-info="{{baseUserInfo}}" person-data="{{pItem.customer}}" integral-num="{{integralNum}}" coupon-num="{{couponNum}}" token="{{token}}"/>
   </view>
 
     <!-- 图片导航 {{pItem.navigation.images}} pd1530-->