Merge branch 'feature-zyw' into 'dev'

Feature zyw

See merge request !24

src/component/personCenter/personCenter.js

@@ -17,6 +17,15 @@ Component({
 			type: Number,
 			value: 0,
     },
+    token:{
+      type: String,
+      observer(newVal){
+        console.log('888', newVal)
+        this.setData({
+          _token : newVal
+        })
+      }
+    }
   },
   /**
    * 页面的初始数据
@@ -29,7 +38,7 @@ Component({
     couponNum: 0,
     baseUrl: '/assets/imgs/0606.png',
     isAuthorization: false,
-    token:''
+    _token: ''
   },
   attached () {
     this.setData({
@@ -38,16 +47,12 @@ Component({
     // 取会员卡号
     const {memberCardNo,memberActivateStatus} = wx.getStorageSync('_baseUserInfo')
     // const memberActivateStatus = wx.getStorageSync('memberActivateStatus')
-    this.setData({
-      token: wx.getStorageSync('token')
-    })
     if(memberCardNo && memberActivateStatus){
       this.setData({
         memberCardNo,
         memberActivateStatus
       })
     }
-
     let base64 = wx.getFileSystemManager().readFileSync(this.data.baseUrl, "base64");
     this.setData({
       baseUrl: "data:image/png;base64," + base64

src/component/personCenter/personCenter.wxml

@@ -27,7 +27,7 @@
       </view>
     </view>
   </view>
-  <view class='df tc' wx:if='{{token}}'>
+  <view class='df tc' wx:if='{{_token}}'>
     <view class='df-1 point person-right' bindtap="toBonusDetails" wx:if="{{personCenter.bonus == 0}}">
       <view class='point-number' style="color:{{personCenter.fontColor}};">{{integralNum}}</view>
       <view class='point-desc' style="color:{{personCenter.fontColor}};">积分</view>

src/pages/userCenter/userCenter.js

@@ -22,7 +22,8 @@ wxService.page({
     integralNum: 0,
     couponNum: 0,
     // isAllScreen: fullSucreen.isAllScreen
-    isAllScreen: config.isAllScreen
+    isAllScreen: config.isAllScreen,
+    token:''
   },
 
   /**
@@ -46,7 +47,6 @@ wxService.page({
     handlerDataOnPage = new utils.HandlerDataOnPage()
     renderPage = require('../../utils/renderPage').getRenderPage()
     handlerDataOnPage.init(this, 'pages')
-    
     this.initPage()
   },
 
@@ -54,6 +54,10 @@ wxService.page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    console.log('5555',wx.getStorageSync('_baseUserInfo'))
+    this.setData({
+      token: wx.getStorageSync('token')
+    })
     if (wx.getStorageSync('_baseUserInfo')){
       // 积分数量
       this.getMemberPointInfo()

src/pages/userCenter/userCenter.wxml

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