From 9dd7bf89909a0473ed02a7f1df7442973dd96c1e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 20 十一月 2024 11:25:51 +0800
Subject: [PATCH] fix 修复 手动登出与token过期登出跳转行为不一致问题
---
src/views/login.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 02c7d77..71d5dcd 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -97,7 +97,7 @@
// 娉ㄥ唽寮�鍏�
const register = ref(false);
-const redirect = ref(undefined);
+const redirect = ref('/');
const loginRef = ref<ElFormInstance>();
// 绉熸埛鍒楄〃
const tenantList = ref<TenantVO[]>([]);
@@ -105,7 +105,7 @@
watch(
() => router.currentRoute.value,
(newRoute: any) => {
- redirect.value = newRoute.query && newRoute.query.redirect;
+ redirect.value = newRoute.query && decodeURIComponent(newRoute.query.redirect);
},
{ immediate: true }
);
@@ -176,7 +176,7 @@
* 鑾峰彇绉熸埛鍒楄〃
*/
const initTenantList = async () => {
- const { data } = await getTenantList();
+ const { data } = await getTenantList(false);
tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
if (tenantEnabled.value) {
tenantList.value = data.voList;
@@ -191,10 +191,10 @@
* @param type
*/
const doSocialLogin = (type: string) => {
- authBinding(type).then((res: any) => {
+ authBinding(type, loginForm.value.tenantId).then((res: any) => {
if (res.code === HttpStatus.SUCCESS) {
// 鑾峰彇鎺堟潈鍦板潃璺宠浆
- window.location.href = res.data + '&tenantId=' + loginForm.value.tenantId + '&domain=' + window.location.host;
+ window.location.href = res.data;
} else {
ElMessage.error(res.msg);
}
--
Gitblit v1.9.3