From 8251815210fbcbd95033b095d7018b181ee1de8e Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 09 六月 2023 09:11:36 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.2版本迭代' into develop
---
uniapp/pages/login/bindingPhone.vue | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/uniapp/pages/login/bindingPhone.vue b/uniapp/pages/login/bindingPhone.vue
index 2e4cf65..606ec64 100644
--- a/uniapp/pages/login/bindingPhone.vue
+++ b/uniapp/pages/login/bindingPhone.vue
@@ -103,6 +103,33 @@
})
}
},
+ targetToIndex(e)
+ {
+ var that = this;
+
+ that.login(e.data.userinfo);
+ utils.setCache('userInfo', e.data.userinfo)
+ getApp().globalData.userInfo = e.data.userinfo
+ that.$alert('鐧诲綍鎴愬姛')
+ setTimeout(function(){
+ console.log(e.data.userinfo)
+ if(!e.data.userinfo.invitation_code)
+ {
+ uni.redirectTo({
+ url: './setInviteCode'
+ })
+ }
+ else if (e.data.userinfo.isPwd == 'N') {
+ uni.redirectTo({
+ url: './setPass'
+ })
+ } else {
+ uni.switchTab({
+ url: '../index/index'
+ })
+ }
+ },1000)
+ },
bindMobile(){
var that = this;
if(!this.hasLogin && this.wxUser != ""){
@@ -113,7 +140,8 @@
}).then(e => {
console.log(e)
if (e.code != 0) return that.$alert(e.msg)
- that.login(e.data.userinfo);
+ this.targetToIndex(e);
+ /* that.login(e.data.userinfo);
that.$alert('鐧诲綍鎴愬姛')
setTimeout(function() {
if (e.data.userinfo.isPwd ==
@@ -126,7 +154,7 @@
url: '../index/index'
})
}
- }, 1000)
+ }, 1000) */
}).catch(function (err) {
console.log(err)
})
--
Gitblit v1.9.3