huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-26 17:21:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: rememberMe bug

Browse Source
This commit is contained in:
xingyu 2023-01-05 15:02:32 +08:00
parent efcbd1ab68
commit 15ef2dbf78
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-ui-admin-vue3/src/utils/auth.ts
View File

@ -47,7 +47,9 @@ export type LoginFormType = {
export const getLoginForm = () => { export const getLoginForm = () => {
const loginForm: LoginFormType = wsCache.get(LoginFormKey) const loginForm: LoginFormType = wsCache.get(LoginFormKey)
loginForm.password = decrypt(loginForm.password) as string if (loginForm) {
loginForm.password = decrypt(loginForm.password) as string
}
return loginForm return loginForm
} }

16
yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
View File

@ -215,13 +215,15 @@ const getTenantId = async () => {
} }
// 记住我 // 记住我
const getCookie = () => { const getCookie = () => {
const { username, password, rememberMe, tenantName } = authUtil.getLoginForm() const loginForm = authUtil.getLoginForm()
loginData.loginForm = { if (loginForm) {
...loginData.loginForm, loginData.loginForm = {
username: username ? username : loginData.loginForm.username, ...loginData.loginForm,
password: password ? password : loginData.loginForm.password, username: loginForm.username ? loginForm.username : loginData.loginForm.username,
rememberMe: rememberMe ? true : false, password: loginForm.password ? loginForm.password : loginData.loginForm.password,
tenantName: tenantName ? tenantName : loginData.loginForm.tenantName rememberMe: loginForm.rememberMe ? true : false,
tenantName: loginForm.tenantName ? loginForm.tenantName : loginData.loginForm.tenantName
}
} }
} }
// 登录 // 登录