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 | 68 +++++++++++++++++----------------
1 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 365af12..85e3857 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -28,17 +28,17 @@
</el-form-item>
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">璁颁綇瀵嗙爜</el-checkbox>
<el-form-item style="float: right;">
- <el-button circle title="寰俊鐧诲綍">
- <svg-icon icon-class="wechat" @click="doSocialLogin('wechat')" />
+ <el-button circle title="寰俊鐧诲綍" @click="doSocialLogin('wechat')">
+ <svg-icon icon-class="wechat" />
</el-button>
- <el-button circle title="MaxKey鐧诲綍">
- <svg-icon icon-class="maxkey" @click="doSocialLogin('maxkey')" />
+ <el-button circle title="MaxKey鐧诲綍" @click="doSocialLogin('maxkey')">
+ <svg-icon icon-class="maxkey" />
</el-button>
- <el-button circle title="Gitee鐧诲綍">
- <svg-icon icon-class="gitee" @click="doSocialLogin('gitee')" />
+ <el-button circle title="Gitee鐧诲綍" @click="doSocialLogin('gitee')">
+ <svg-icon icon-class="gitee" />
</el-button>
- <el-button circle title="Github鐧诲綍">
- <svg-icon icon-class="github" @click="doSocialLogin('github')" />
+ <el-button circle title="Github鐧诲綍" @click="doSocialLogin('github')">
+ <svg-icon icon-class="github" />
</el-button>
</el-form-item>
<el-form-item style="width:100%;">
@@ -61,8 +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 { encrypt, decrypt } from '@/utils/jsencrypt';
import { useUserStore } from '@/store/modules/user';
import { LoginData, TenantVO } from '@/api/types';
import { to } from 'await-to-js';
@@ -78,7 +76,7 @@
rememberMe: false,
code: '',
uuid: ''
-});
+} as LoginData);
const loginRules: ElFormRules = {
tenantId: [{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勭鎴风紪鍙�" }],
@@ -102,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", loginForm.value.tenantId, { expires: 30 });
- Cookies.set('username', loginForm.value.username, { expires: 30 });
- Cookies.set('password', String(encrypt(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));
@@ -149,17 +151,17 @@
}
};
-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 ? loginForm.value.tenantId : tenantId,
- username: username === undefined ? loginForm.value.username : username,
- password: password === undefined ? loginForm.value.password : (decrypt(password) as string),
- 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,8 +180,8 @@
}
//妫�娴嬬鎴烽�夋嫨妗嗙殑鍙樺寲
-watch(() => loginForm.value.tenantId, (val: string) => {
- Cookies.set("tenantId", loginForm.value.tenantId, { expires: 30 })
+watch(() => loginForm.value.tenantId, () => {
+ localStorage.setItem("tenantId", String(loginForm.value.tenantId))
});
/**
@@ -202,7 +204,7 @@
onMounted(() => {
getCode();
initTenantList();
- getCookie();
+ getLoginData();
});
</script>
--
Gitblit v1.9.3