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 | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 475135b..85e3857 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -61,7 +61,6 @@
<script setup lang="ts">
import { getCodeImg, getTenantList } from '@/api/login';
import { authBinding } from '@/api/system/social/auth';
-import Cookies from 'js-cookie';
import { useUserStore } from '@/store/modules/user';
import { LoginData, TenantVO } from '@/api/types';
import { to } from 'await-to-js';
@@ -101,22 +100,26 @@
// 绉熸埛鍒楄〃
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) {
loading.value = true;
- // 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪 cookie 涓缃浣忕敤鎴峰悕鍜屽瘑鐮�
+ // 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪 localStorage 涓缃浣忕敤鎴峰悕鍜屽瘑鐮�
if (loginForm.value.rememberMe) {
- Cookies.set("tenantId", String(loginForm.value.tenantId), { expires: 30 });
- Cookies.set('username', String(loginForm.value.username), { expires: 30 });
- Cookies.set('password', String(loginForm.value.password), { expires: 30 });
- Cookies.set('rememberMe', String(loginForm.value.rememberMe), { expires: 30 });
+ localStorage.setItem("tenantId", String(loginForm.value.tenantId));
+ localStorage.setItem('username', String(loginForm.value.username));
+ localStorage.setItem('password', String(loginForm.value.password));
+ localStorage.setItem('rememberMe', String(loginForm.value.rememberMe));
} else {
// 鍚﹀垯绉婚櫎
- Cookies.remove("tenantId");
- Cookies.remove('username');
- Cookies.remove('password');
- Cookies.remove('rememberMe');
+ localStorage.removeItem("tenantId");
+ localStorage.removeItem('username');
+ localStorage.removeItem('password');
+ localStorage.removeItem('rememberMe');
}
// 璋冪敤action鐨勭櫥褰曟柟娉�
const [err] = await to(userStore.login(loginForm.value));
@@ -148,16 +151,16 @@
}
};
-const getCookie = () => {
- const tenantId = Cookies.get("tenantId");
- const username = Cookies.get('username');
- const password = Cookies.get('password');
- const rememberMe = Cookies.get('rememberMe');
+const getLoginData = () => {
+ const tenantId = localStorage.getItem("tenantId");
+ const username = localStorage.getItem('username');
+ 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;
}
@@ -178,7 +181,7 @@
//妫�娴嬬鎴烽�夋嫨妗嗙殑鍙樺寲
watch(() => loginForm.value.tenantId, () => {
- Cookies.set("tenantId", String(loginForm.value.tenantId), { expires: 30 })
+ localStorage.setItem("tenantId", String(loginForm.value.tenantId))
});
/**
@@ -201,7 +204,7 @@
onMounted(() => {
getCode();
initTenantList();
- getCookie();
+ getLoginData();
});
</script>
--
Gitblit v1.9.3