1.用户协议谢谢洗诶诶黑货币的宁波
' } }, - onLoad() { + onLoad(options) { + if(uni.getStorageSync('phone_active')){ + uni.removeStorageSync('transientUrl'); + } else { + uni.setStorageSync('transientUrl',`/pages/login/agreement?invite_code=${options.invite_code}}`); + uni.navigateTo({ + url:'/pages/login/login' + }) + } this.$toolAll.tools.escape2Html(this.content) } } diff --git a/pages/login/login.vue b/pages/login/login.vue index 508dee7..9064647 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -67,17 +67,25 @@ refuse(){//暂不绑定事件 this.isShowP=false; this.$toolAll.tools.showToast('登录成功','success') - uni.reLaunch({url:'/pages/tabbar/pagehome/pagehome'}) + uni.reLaunch({url:'/pages/tabbar/pagehome/pagehome'}) }, getphonenumber(e){//授权绑定手机号 let ya = this; if(e.detail.errMsg=="getPhoneNumber:ok"){ - this.$requst.post('user/bind-phone',{iv:e.detail.iv,encryptedData:e.detail.encryptedData}).then(res=>{ - console.log('手机号信息:',res); + this.$requst.post('/api/user/bind-phone',{iv:e.detail.iv,encryptedData:e.detail.encryptedData}).then(res=>{ if(res.code==0){ this.$toolAll.tools.showToast('手机号绑定成功','success'); - uni.setStorageSync('bindPhone',false) - uni.reLaunch({url:'/pages/tabbar/pagehome/pagehome'}) + uni.setStorageSync('phone_active',1)//是否第一次授权 + let newUrl = uni.getStorageSync('transientUrl'); + // 如果是其他地方过来的有路径,授权成功后返回到过来的页面 + if(newUrl){ + uni.reLaunch({ + url:newUrl + }) + } else { + // 返回首页 + uni.reLaunch({url:'/pages/tabbar/pagehome/pagehome'}) + } } else this.$toolAll.tools.showToast(res.msg); },error=>{}) } else { @@ -135,9 +143,9 @@ city: this.userInfo.city,//用户所在城市 gender: this.userInfo.gender,//用户性别 language:this.userInfo.language,//语言 - is_active:1 + is_active:1, + invite_code: uni.getStorageSync('existCode'), } - this.log(params,138) this.$requst.post('/api/user/login',params).then(res => { if(res.data.token!=''){ uni.setStorageSync('params',params) @@ -147,11 +155,21 @@ uni.setStorageSync('is_active',res.data.is_active)//是否第一次授权 uni.setStorageSync('phone_active',res.data.phone_active)//是否第一次授权 uni.setStorageSync('invite_code',res.data.invite_code) - uni.navigateTo({ - url:'/pages/tabbar/pagehome/pagehome' - }) - // uni.hideToast(); - // this.isShowP = true; + if(res.data.phone_active){ + let newUrl = uni.getStorageSync('transientUrl'); + // 如果是其他地方过来的有路径,授权成功后返回到过来的页面 + if(newUrl){ + uni.reLaunch({ + url:newUrl + }) + } else { + uni.navigateTo({ + url:'/pages/tabbar/pagehome/pagehome' + }) + } + } else { + this.isShowP = true; + } } },error => {}) } @@ -168,4 +186,8 @@ .login-btn {width: 80%;margin-top: 50%;} .xie-box{display: flex;justify-content: center;align-items: center;color: @tcolor;margin-top: 30rpx;} .xieCon{color: @tcolorp;} + + .tank-box{margin: 0 60rpx;} + .tank-box-itemone{margin: 30rpx 0;} + .tank-btn{padding: 10rpx 30rpx;} diff --git a/pages/tabbar/cart/cart.vue b/pages/tabbar/cart/cart.vue index a2b67ab..0d5f2e3 100644 --- a/pages/tabbar/cart/cart.vue +++ b/pages/tabbar/cart/cart.vue @@ -27,6 +27,18 @@ } }, + onLoad(options) { + if(uni.getStorageSync('phone_active')){ + this.$toolAll.tools.clearShare(); + } else { + uni.setStorageSync('outside',2); + uni.setStorageSync('existCode',options.invite_code) + uni.setStorageSync('transientUrl',`/pages/tabbar/cate/cate`); + uni.navigateTo({ + url:'/pages/login/login' + }) + } + }, methods: { } diff --git a/pages/tabbar/cate/cate.vue b/pages/tabbar/cate/cate.vue index e8c7ab3..a252664 100644 --- a/pages/tabbar/cate/cate.vue +++ b/pages/tabbar/cate/cate.vue @@ -10,7 +10,7 @@