Commit e58ed150 by 高淑倩

modify: 首页展示问题

parent 6774bdd6
...@@ -13,6 +13,16 @@ Component({ ...@@ -13,6 +13,16 @@ Component({
type: Number, type: Number,
value: 0, value: 0,
}, },
baseUserInfo: {
type: Object,
value: {},
observer(newVal){
this.setData({
memberActivateStatus: newVal && newVal.memberActivateStatus || false,
memberCardNo: newVal && newVal.memberCardNo || ''
})
}
},
couponNum: { couponNum: {
type: Number, type: Number,
value: 0, value: 0,
...@@ -43,15 +53,7 @@ Component({ ...@@ -43,15 +53,7 @@ Component({
this.setData({ this.setData({
personCenter: this.data.personData personCenter: this.data.personData
}) })
// 取会员卡号
const {memberCardNo,memberActivateStatus} = wx.getStorageSync('_baseUserInfo')
// const memberActivateStatus = wx.getStorageSync('memberActivateStatus')
if(memberCardNo && memberActivateStatus){
this.setData({
memberCardNo,
memberActivateStatus
})
}
let base64 = wx.getFileSystemManager().readFileSync(this.data.baseUrl, "base64"); let base64 = wx.getFileSystemManager().readFileSync(this.data.baseUrl, "base64");
this.setData({ this.setData({
baseUrl: "data:image/png;base64," + base64 baseUrl: "data:image/png;base64," + base64
...@@ -77,8 +79,6 @@ Component({ ...@@ -77,8 +79,6 @@ Component({
isAuthorization:true isAuthorization:true
}) })
} }
}, },
handleGoWxCard() { handleGoWxCard() {
wxService.openCardList() wxService.openCardList()
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<!--<view wx:if='{{!memberActivateStatus}}' class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{'background-image: url(../../assets/imgs/user-bg.png)'}}"> <!--<view wx:if='{{!memberActivateStatus}}' class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{'background-image: url(../../assets/imgs/user-bg.png)'}}">
<button type="primary" plain='false' bindtap="handleTtoActiveMemebr">激活立享会员特权</button> <button type="primary" plain='false' bindtap="handleTtoActiveMemebr">激活立享会员特权</button>
</view>--> </view>-->
<view wx:if='{{!memberActivateStatus}}' class="member-unActive" bindtap="handleTtoActiveMemebr"> <view wx:if='{{!memberActivateStatus}}' class="member-unActive" bindtap="handleTtoActiveMemebr">
<text class="un-active-btn" >激活立享会员特权</text> <text class="un-active-btn" >激活立享会员特权</text>
</view> </view>
......
...@@ -23,7 +23,8 @@ wxService.page({ ...@@ -23,7 +23,8 @@ wxService.page({
isAllScreen: config.isAllScreen, isAllScreen: config.isAllScreen,
token:'', token:'',
isAuthorization: false, isAuthorization: false,
pageId: 3 pageId: 3,
baseUserInfo: null
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
...@@ -66,10 +67,13 @@ wxService.page({ ...@@ -66,10 +67,13 @@ wxService.page({
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow () { onShow () {
// 取会员卡号
const baseUserInfo = wx.getStorageSync('_baseUserInfo')
this.setData({ this.setData({
token: wx.getStorageSync('token') token: wx.getStorageSync('token'),
baseUserInfo,
}) })
if (wx.getStorageSync('_baseUserInfo')){ if (baseUserInfo){
// 积分数量 // 积分数量
this.getMemberPointInfo() this.getMemberPointInfo()
// 优惠券数量 // 优惠券数量
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<!-- 个人中心 {{pItem.customer}}--> <!-- 个人中心 {{pItem.customer}}-->
<view class="pd1530" wx:if="{{pItem.type == 2}}"> <view class="pd1530" wx:if="{{pItem.type == 2}}">
<person-center 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> </view>
<!-- 图片导航 {{pItem.navigation.images}} pd1530--> <!-- 图片导航 {{pItem.navigation.images}} pd1530-->
......
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