Commit 644fcc89 by 赵雅纹

Merge branch 'feature-zyw' into 'dev'

Feature zyw

See merge request !22
parents 3f289527 f4c1cd24
...@@ -28,7 +28,8 @@ Component({ ...@@ -28,7 +28,8 @@ Component({
integralNum: 0, integralNum: 0,
couponNum: 0, couponNum: 0,
baseUrl: '/assets/imgs/0606.png', baseUrl: '/assets/imgs/0606.png',
isAuthorization: false isAuthorization: false,
token:''
}, },
attached () { attached () {
this.setData({ this.setData({
...@@ -37,6 +38,9 @@ Component({ ...@@ -37,6 +38,9 @@ Component({
// 取会员卡号 // 取会员卡号
const {memberCardNo,memberActivateStatus} = wx.getStorageSync('_baseUserInfo') const {memberCardNo,memberActivateStatus} = wx.getStorageSync('_baseUserInfo')
// const memberActivateStatus = wx.getStorageSync('memberActivateStatus') // const memberActivateStatus = wx.getStorageSync('memberActivateStatus')
this.setData({
token: wx.getStorageSync('token')
})
if(memberCardNo && memberActivateStatus){ if(memberCardNo && memberActivateStatus){
this.setData({ this.setData({
memberCardNo, memberCardNo,
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class='df tc'> <view class='df tc' wx:if='{{token}}'>
<view class='df-1 point person-right' bindtap="toBonusDetails" wx:if="{{personCenter.bonus == 0}}"> <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-number' style="color:{{personCenter.fontColor}};">{{integralNum}}</view>
<view class='point-desc' style="color:{{personCenter.fontColor}};">积分</view> <view class='point-desc' style="color:{{personCenter.fontColor}};">积分</view>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment