From ba3d748f9eb65a66fca9bd74fc7796b90a0a70ae Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 30 六月 2023 09:06:15 +0800
Subject: [PATCH] Merge branch 'release/v1.1.3发布'

---
 uniapp/pages/login/bindingPhone.vue |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/uniapp/pages/login/bindingPhone.vue b/uniapp/pages/login/bindingPhone.vue
index 3ee3881..481813d 100644
--- a/uniapp/pages/login/bindingPhone.vue
+++ b/uniapp/pages/login/bindingPhone.vue
@@ -125,6 +125,7 @@
 					setTimeout(function(){
 						univerifyManager.close();
 					},2000);
+					that.isyj=false;
 				})
 			},
 			mobShow()
@@ -200,11 +201,11 @@
 							url: './setInviteCode'
 						})
 					}
-					else if (e.data.userinfo.isPwd == 'N') {
+					/* else if (e.data.userinfo.isPwd == 'N') {
 						uni.redirectTo({
 							url: './setPass'
 						})
-					} else {
+					} */else {
 						uni.switchTab({
 							url: '../index/index'
 						})
@@ -213,7 +214,9 @@
 			},
 			bindMobile(){
 				var that = this;
-				if(!this.hasLogin && this.wxUser != ""){
+				console.log(this.hasLogin)
+				console.log(this.wxUser)
+				if(this.wxUser != ""){
 					this.$u.api.bindMobileLogin({
 						wxUser : encodeURIComponent(JSON.stringify(that.wxUser)),
 						mobile:this.phone,
@@ -243,7 +246,8 @@
 				}else{
 					this.$u.api.changeMobile({
 						mobile:this.phone,
-						captcha:this.code
+						captcha:this.code,
+						isyj:this.isyj
 					}).then(e => {
 						if(e.code != 0) return that.$alert(e.msg)
 						that.$alert('缁戝畾鎴愬姛');

--
Gitblit v1.9.3