From 25848ea99e788b568be5f115a8abf27149d5a6e1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 06 九月 2024 17:58:28 +0800
Subject: [PATCH] fix 修复 重新登录无法跳转到过期前页面问题
---
src/views/login.vue | 4 ++--
src/utils/request.ts | 10 ++++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/utils/request.ts b/src/utils/request.ts
index f2a69f0..f8f1f53 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -10,6 +10,7 @@
import { getLanguage } from '@/lang';
import { encryptBase64, encryptWithAes, generateAesKey, decryptWithAes, decryptBase64 } from '@/utils/crypto';
import { encrypt, decrypt } from '@/utils/jsencrypt';
+import router from "@/router";
const encryptHeader = 'encrypt-key';
let downloadLoadingInstance: LoadingInstance;
@@ -134,8 +135,13 @@
}).then(() => {
isRelogin.show = false;
useUserStore().logout().then(() => {
- location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
- });
+ router.replace({
+ path: '/login',
+ query: {
+ redirect: encodeURIComponent(router.currentRoute.value.fullPath || '/')
+ }
+ })
+ });
}).catch(() => {
isRelogin.show = false;
});
diff --git a/src/views/login.vue b/src/views/login.vue
index ca2903f..36e3dec 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 }
);
--
Gitblit v1.9.3