Commit 34ce2e8b by 高淑倩

modify: 路由replace && 开卡条件判断

parent 1c2bc07f
...@@ -91,10 +91,10 @@ Component({ ...@@ -91,10 +91,10 @@ Component({
const options = JSON.parse(item.options) const options = JSON.parse(item.options)
wxService.router(`/${item.route}`).search(options).replace() wxService.router(`/${item.route}`).search(options).replace()
} catch (e) { } catch (e) {
wxService.router('/pages/userCenter/userCenter') wxService.router('/pages/userCenter/userCenter').replace()
} }
} else { } else {
wxService.router('/pages/userCenter/userCenter') wxService.router('/pages/userCenter/userCenter').replace()
} }
}, 200) }, 200)
......
...@@ -471,11 +471,18 @@ class WXService extends Http { ...@@ -471,11 +471,18 @@ class WXService extends Http {
const baseUserInfo = wx.getStorageSync('_baseUserInfo') const baseUserInfo = wx.getStorageSync('_baseUserInfo')
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// const app = this.getApp() // const app = this.getApp()
return this.navigateToMiniProgram({
biz: baseUserInfo.biz, const {memberActivateStatus} = wx.getStorageSync('_baseUserInfo')
encrypt_card_id: baseUserInfo.encryptCardId, if(memberActivateStatus) {
outer_str: baseUserInfo.outerStr resolve(baseUserInfo)
}) } else {
return this.navigateToMiniProgram({
biz: baseUserInfo.biz,
encrypt_card_id: baseUserInfo.encryptCardId,
outer_str: baseUserInfo.outerStr
})
}
// if (baseUserInfo && baseUserInfo.isMember === '1') { // if (baseUserInfo && baseUserInfo.isMember === '1') {
// resolve(baseUserInfo) // resolve(baseUserInfo)
......
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