From 6ae8c93a6136380d1bebdf22d69c2a9adc45d435 Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Wed, 2 Apr 2025 11:20:40 +0800
Subject: [PATCH] =?UTF-8?q?refactor(auth):=20=E4=BF=9D=E7=95=99=20codeLogi?=
 =?UTF-8?q?n=20=E5=92=8C=20passwordLogin=20=E9=A1=B5=E8=B7=B3=E8=BD=ACURL?=
 =?UTF-8?q?=E7=9A=84=20tenantId=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/auth/codeLogin.vue     | 12 +++++++++---
 pages/auth/passwordLogin.vue | 12 +++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/pages/auth/codeLogin.vue b/pages/auth/codeLogin.vue
index b77afb5..110d339 100644
--- a/pages/auth/codeLogin.vue
+++ b/pages/auth/codeLogin.vue
@@ -316,9 +316,15 @@
 			},
 			// 跳转密码登录页
 			goPasswordLogin(){
-				uni.reLaunch({
-					url: './passwordLogin'
-				});
+				if(this.query.tenantId){
+					uni.reLaunch({
+						url: './passwordLogin?tenantId='+this.query.tenantId
+					});
+				}else{
+					uni.reLaunch({
+						url: './passwordLogin'
+					});
+				}
 			},
 			goPolicy() {
 				uni.navigateTo({
diff --git a/pages/auth/passwordLogin.vue b/pages/auth/passwordLogin.vue
index fe6fa88..6e3ee95 100644
--- a/pages/auth/passwordLogin.vue
+++ b/pages/auth/passwordLogin.vue
@@ -331,9 +331,15 @@
 			},
 			// 跳转密码登录页
 			goPhoneLogin(){
-				uni.reLaunch({
-					url: './codeLogin'
-				});
+				if(this.query.tenantId){
+					uni.reLaunch({
+						url: './codeLogin?tenantId='+this.query.tenantId
+					});
+				}else{
+					uni.reLaunch({
+						url: './codeLogin'
+					});
+				}
 			},
 			goPolicy() {
 				uni.navigateTo({