diff --git a/pages/member/activatedmemberone.vue b/pages/member/activatedmemberone.vue index a9d57df..54a0787 100644 --- a/pages/member/activatedmemberone.vue +++ b/pages/member/activatedmemberone.vue @@ -18,9 +18,7 @@ }, onUnload() { if (this.switchdata) { - uni.switchTab({ - url: '/pages/index/index' - }); + uni.navigateBack() } }, methods: { @@ -36,8 +34,18 @@ shopId: this.shopId }) if (res.code == 0) { - this.switchdata = false - uni.navigateBack() + let resdata = await this.api.loginwxuserInfo({ + userId: uni.cache.get('userInfo').id + }) + if (resdata.code == 0) { + this.switchdata = false + uni.cache.set('userInfo', resdata.data); + uni.pro.redirectTo('/pages/member/index', { + shopId: uni.cache.get('shopUser') + }) + } + + } } }) diff --git a/pages/member/index.vue b/pages/member/index.vue index c61ee20..c05f7d1 100644 --- a/pages/member/index.vue +++ b/pages/member/index.vue @@ -42,14 +42,7 @@ this.paygetShopByMember(e.shopId) } this.paygetActive(e.shopId) //列表 - // 判断是否绑定手机,只有下单时候有,会员列表肯定有 - console.log(uni.cache.get('userInfo').telephone, '调试1') - if (uni.cache.get('userInfo').telephone=='') { - // 跳转到开通页面 - uni.navigateTo({ - url: '/pages/member/activatedmemberone?shopId=' + e.shopId - }) - } + }, methods: { async paygetShopByMember(w) { diff --git a/pages/order_detail/indexs.vue b/pages/order_detail/indexs.vue index 4d8fc4d..d1d73d2 100644 --- a/pages/order_detail/indexs.vue +++ b/pages/order_detail/indexs.vue @@ -379,9 +379,18 @@ }) }, goRecharge() { // 去充值 - uni.pro.navigateTo('/pages/member/index', { - shopId: uni.cache.get('shopUser') - }) + // 判断是否绑定手机,只有下单时候有,会员列表肯定有 + console.log(uni.cache.get('userInfo').telephone, '调试1') + if (uni.cache.get('userInfo').telephone == '') { + // 跳转到开通页面 + uni.navigateTo({ + url: '/pages/member/activatedmemberone?shopId=' + uni.cache.get('shopUser') + }) + } else { + uni.pro.navigateTo('/pages/member/index', { + shopId: uni.cache.get('shopUser') + }) + } }, orderdetail() { // 直接生成订单 let data = {