From 72610ab1948bf57e0073a0dd377ab84393459ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 18 Jun 2024 18:44:17 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E7=99=BB=E5=BD=95=E4=B8=8D=E5=90=8C=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0=E7=A7=9F=E6=88=B7id?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/SocialCallback/index.vue | 10 +++++++---
 src/views/login.vue                            | 10 +---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/layout/components/SocialCallback/index.vue b/src/layout/components/SocialCallback/index.vue
index eac66bc..dcc10a6 100644
--- a/src/layout/components/SocialCallback/index.vue
+++ b/src/layout/components/SocialCallback/index.vue
@@ -17,18 +17,22 @@ const loading = ref(true);
 const code = route.query.code as string;
 const state = route.query.state as string;
 const source = route.query.source as string;
-const tenantId = localStorage.getItem('tenantId') ? (localStorage.getItem('tenantId') as string) : '000000';
+const tenantId = route.query.tenantId as string ? route.query.tenantId as string : '000000';
 
 const processResponse = async (res: any) => {
   if (res.code !== 200) {
     throw new Error(res.msg);
   }
-  if (res.data !== null) {
+  if (res.data !== null && res.data.access_token !== null) {
     setToken(res.data.access_token);
   }
   ElMessage.success(res.msg);
   setTimeout(() => {
-    location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+    if (res.data !== null  && res.data.domain !== null) {
+      location.href = res.data.domain + import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+    } else {
+      location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+    }
   }, 2000);
 };
 
diff --git a/src/views/login.vue b/src/views/login.vue
index 7e1394e..0bb9a3f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -186,14 +186,6 @@ const initTenantList = async () => {
   }
 };
 
-//检测租户选择框的变化
-watch(
-  () => loginForm.value.tenantId,
-  () => {
-    localStorage.setItem('tenantId', String(loginForm.value.tenantId));
-  }
-);
-
 /**
  * 第三方登录
  * @param type
@@ -202,7 +194,7 @@ const doSocialLogin = (type: string) => {
   authBinding(type).then((res: any) => {
     if (res.code === HttpStatus.SUCCESS) {
       // 获取授权地址跳转
-      window.location.href = res.data;
+      window.location.href = res.data + '&tenantId=' + loginForm.value.tenantId;
     } else {
       ElMessage.error(res.msg);
     }