Commit 4569b342 by 高淑倩

modify: 跳转

parent 02df7674
...@@ -6,37 +6,41 @@ const envInfo = require('../../config/index').envInfo ...@@ -6,37 +6,41 @@ const envInfo = require('../../config/index').envInfo
Component({ Component({
properties: { properties: {
personData: { personData: {
type: Object,
value: {},
},
integralNum: {
type: Number,
value: 0,
},
cardMember: {
type: Object, type: Object,
value: {}, value: {},
}, },
integralNum: {
type: Number,
value: 0,
},
// cardMember: {
// type: Object,
// value: {},
// },
baseUserInfo: { baseUserInfo: {
type: Object, type: Object,
value: {}, value: {},
observer(newVal){ observer: '_userInfoChange'
this.setData({ // observer(newVal, oldVal){
memberActivateStatus: newVal && newVal.memberActivateStatus || false, // console.log('---newVal',newVal,oldVal)
memberCardNo: newVal && newVal.memberCardNo || '', // if (newVal !== oldVal) {
currentMobile: newVal && newVal.member && newVal.member.mobile || '', // this.setData({
}) // memberActivateStatus: newVal && newVal.memberActivateStatus || false,
} // memberCardNo: newVal && newVal.memberCardNo || '',
// currentMobile: newVal && newVal.member && newVal.member.mobile || '',
// })
// }
// }
}, },
couponNum: { couponNum: {
type: Number, type: Number,
value: 0, value: 0,
}, },
token:{ token: {
type: String, type: String,
observer(newVal){ observer(newVal) {
this.setData({ this.setData({
_token : newVal _token: newVal
}) })
} }
} }
...@@ -55,28 +59,19 @@ Component({ ...@@ -55,28 +59,19 @@ Component({
isAuthorization: false, isAuthorization: false,
_token: '', _token: '',
currentMobile: '', currentMobile: '',
baseImgUrl: '' baseImgUrl: '',
storgeUserInfo: wx.getStorageSync('_baseUserInfo')
},
observers: {
'**': function(e) {
// 每次 setData 都触发
},
}, },
attached () { attached() {
this.setData({ this.setData({
personCenter: this.data.personData, personCenter: this.data.personData,
baseImgUrl: app.globalData.imageUrl 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"); // let base64 = wx.getFileSystemManager().readFileSync(this.data.baseUrl, "base64");
// this.setData({ // this.setData({
...@@ -84,6 +79,15 @@ Component({ ...@@ -84,6 +79,15 @@ Component({
// }) // })
}, },
methods: { 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() { handleToMemberOfOwn() {
wxService.router(`/pages/memberOfOwn/memberOfOwn`) wxService.router(`/pages/memberOfOwn/memberOfOwn`)
}, },
...@@ -94,16 +98,19 @@ Component({ ...@@ -94,16 +98,19 @@ Component({
wxService.router(`/pages/coupons/coupons`) wxService.router(`/pages/coupons/coupons`)
}, },
handleTtoActiveMemebr() { handleTtoActiveMemebr() {
if (wx.getStorageSync('_baseUserInfo')){ if (wx.getStorageSync('_baseUserInfo')) {
wxService.openCard() wxService.openCard()
}else{ } else {
this.setData({ this.setData({
isAuthorization:true isAuthorization: true
}) })
} }
}, },
handleGoWxCard() { handleGoWxCard() {
wxService.openCard() wxService.openCard()
} }
},
detached() {
this._userInfoChange = null
} }
}) })
\ No newline at end of file
...@@ -79,8 +79,6 @@ Component({ ...@@ -79,8 +79,6 @@ Component({
} else if (link.type == 4) { } else if (link.type == 4) {
wxService.router(`${currentClickType}`) wxService.router(`${currentClickType}`)
} else if (link.type == 5) { } else if (link.type == 5) {
console.log('currentClickType', currentClickType)
if (currentClickType == 1) { if (currentClickType == 1) {
wxService.openCard() wxService.openCard()
} else if (currentClickType == 2) { } else if (currentClickType == 2) {
......
...@@ -25,7 +25,7 @@ wxService.page({ ...@@ -25,7 +25,7 @@ wxService.page({
isAuthorization: false, isAuthorization: false,
pageId: 3, pageId: 3,
baseUserInfo: null, baseUserInfo: null,
cardMember: null, // cardMember: null,
pageBackgroundColor: 0 pageBackgroundColor: 0
}, },
/** /**
...@@ -71,13 +71,11 @@ wxService.page({ ...@@ -71,13 +71,11 @@ wxService.page({
onShow () { onShow () {
// 取会员卡号 // 取会员卡号
const baseUserInfo = wx.getStorageSync('_baseUserInfo') const baseUserInfo = wx.getStorageSync('_baseUserInfo')
const cardMember = wx.getStorageSync('_cardMember')
// _cardMemebr
if (baseUserInfo){ if (baseUserInfo){
this.setData({ this.setData({
token: wx.getStorageSync('token'), token: wx.getStorageSync('token'),
baseUserInfo, baseUserInfo,
cardMember, // cardMember,
isAuthorization: false isAuthorization: false
}) })
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<!-- 个人中心 {{pItem.customer}}--> <!-- 个人中心 {{pItem.customer}}-->
<view class="pd1530" wx:if="{{pItem.type == 2}}"> <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> </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