From 483af137419fdbccc7a74a74c082e7972886a8b1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 06 九月 2024 18:06:16 +0800
Subject: [PATCH] fix 修复 重新登录无法跳转到过期前页面问题
---
src/views/login.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 02c7d77..db1fca6 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 }
);
@@ -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