modify: 手机判断开卡

src/component/personCenter/personCenter.js

@@ -13,6 +13,10 @@ Component({
 			type: Number,
 			value: 0,
     },
+    cardMember: {
+      type: Object,
+      value: {},
+    },
     baseUserInfo: {
       type: Object,
       value: {},
@@ -55,7 +59,22 @@ Component({
     this.setData({
       personCenter: this.data.personData
     })
-  
+   
+    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

src/pages/activateCard/activateCardCallback.js

@@ -51,9 +51,10 @@ wxService.page({
         // 激活成功 变更 _激活状态
         const baseUserInfo = wx.getStorageSync('_baseUserInfo')
         baseUserInfo.memberActivateStatus = true
-        wx.setStorageSync('_baseUserInfo',baseUserInfo)
+        wx.setStorageSync('_cardMember',data)
+
         // 更新缓存信息手机号码 relogin 
-        this.handelReLogin()
+       this.handelReLogin()
       } else {
         wx.hideLoading()
         wx.showToast({

src/pages/userCenter/userCenter.js

@@ -24,7 +24,8 @@ wxService.page({
     token:'',
     isAuthorization: false,
     pageId: 3,
-    baseUserInfo: null
+    baseUserInfo: null,
+    cardMember: null,
   },
   /**
    * 生命周期函数--监听页面加载
@@ -69,11 +70,16 @@ wxService.page({
   onShow () {
     // 取会员卡号
     const baseUserInfo = wx.getStorageSync('_baseUserInfo')
-    this.setData({
-      token: wx.getStorageSync('token'),
-      baseUserInfo,
-    })
+    const cardMember = wx.getStorageSync('_cardMember')
+    // _cardMemebr
+    console.log('user-----cardMember',cardMember)
     if (baseUserInfo){
+      this.setData({
+        token: wx.getStorageSync('token'),
+        baseUserInfo,
+        cardMember
+      })
+
       // 积分数量
       this.getMemberPointInfo()
       // 优惠券数量

src/pages/userCenter/userCenter.wxml

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

src/utils/wxService.js

@@ -510,11 +510,11 @@ class WXService extends Http {
   openCard() {
     const baseUserInfo = wx.getStorageSync('_baseUserInfo')
     return new Promise((resolve, reject) => {
-      if (baseUserInfo && baseUserInfo.member && baseUserInfo.member.mobile) {
+      if (baseUserInfo && baseUserInfo.memberActivateStatus) {
         console.log('已开卡')
         wxService.openCardList()
         resolve(baseUserInfo)
-      } else if (!baseUserInfo || !baseUserInfo.member || !baseUserInfo.member.mobile) {
+      } else if (!baseUserInfo || !baseUserInfo.memberActivateStatus) {
         console.log('去开卡')
         return this.navigateToMiniProgram({
           biz: baseUserInfo.biz,
@@ -525,6 +525,23 @@ class WXService extends Http {
         reject({ state: 0 })
       }
     })
+
+    // return new Promise((resolve, reject) => {
+    //   if (baseUserInfo && baseUserInfo.member && baseUserInfo.member.mobile) {
+    //     console.log('已开卡')
+    //     wxService.openCardList()
+    //     resolve(baseUserInfo)
+    //   } else if (!baseUserInfo || !baseUserInfo.member || !baseUserInfo.member.mobile) {
+    //     console.log('去开卡')
+    //     return this.navigateToMiniProgram({
+    //       biz: baseUserInfo.biz,
+    //       encrypt_card_id: baseUserInfo.encryptCardId,
+    //       outer_str: baseUserInfo.outerStr
+    //     })
+    //   } else {
+    //     reject({ state: 0 })
+    //   }
+    // })
   }
   /**
    * 查看微信卡包中的卡券