From e7529fbb8ff56bddef9cbf9b2b712d2c185cacf2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 25 八月 2023 12:58:52 +0800
Subject: [PATCH] update 优化 登录页面redirect重定向功能
---
src/views/login.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 2ec77e7..85e3857 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -100,6 +100,10 @@
// 绉熸埛鍒楄〃
const tenantList = ref<TenantVO[]>([]);
+watch(() => router.currentRoute.value, (newRoute: any) => {
+ redirect.value = newRoute.query && newRoute.query.redirect;
+}, { immediate: true });
+
const handleLogin = () => {
loginRef.value?.validate(async (valid: boolean, fields: any) => {
if (valid) {
@@ -153,10 +157,10 @@
const password = localStorage.getItem('password');
const rememberMe = localStorage.getItem('rememberMe');
loginForm.value = {
- tenantId: tenantId === undefined ? String(loginForm.value.tenantId) : tenantId,
- username: username === undefined ? String(loginForm.value.username) : username,
- password: password === undefined ? String(loginForm.value.password) : String(password),
- rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+ tenantId: tenantId === null ? String(loginForm.value.tenantId) : tenantId,
+ username: username === null ? String(loginForm.value.username) : username,
+ password: password === null ? String(loginForm.value.password) : String(password),
+ rememberMe: rememberMe === null ? false : Boolean(rememberMe)
} as LoginData;
}
--
Gitblit v1.9.3