From 89e1f2a53fbf99d8a48b7d12a41a862700a30015 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 13 Dec 2020 15:01:03 +0800
Subject: [PATCH] 修改Set可能导致嵌套的问题
---
ruoyi-ui/src/views/login.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 880af8d..574ca0b 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -29,7 +29,7 @@
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
</el-input>
<div class="login-code">
- <img :src="codeUrl" @click="getCode" />
+ <img :src="codeUrl" @click="getCode" class="login-code-img"/>
</div>
</el-form-item>
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
@@ -48,7 +48,7 @@
</el-form>
<!-- 底部 -->
<div class="el-login-footer">
- <span>Copyright © 2018-2019 ruoyi.vip All Rights Reserved.</span>
+ <span>Copyright © 2018-2020 ruoyi.vip All Rights Reserved.</span>
</div>
</div>
</template>
@@ -56,6 +56,7 @@
<script>
import { getCodeImg } from "@/api/login";
import Cookies from "js-cookie";
+import { encrypt, decrypt } from '@/utils/jsencrypt'
export default {
name: "Login",
@@ -108,7 +109,7 @@
const rememberMe = Cookies.get('rememberMe')
this.loginForm = {
username: username === undefined ? this.loginForm.username : username,
- password: password === undefined ? this.loginForm.password : password,
+ password: password === undefined ? this.loginForm.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
};
},
@@ -118,7 +119,7 @@
this.loading = true;
if (this.loginForm.rememberMe) {
Cookies.set("username", this.loginForm.username, { expires: 30 });
- Cookies.set("password", this.loginForm.password, { expires: 30 });
+ Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
} else {
Cookies.remove("username");
@@ -128,7 +129,6 @@
this.$store
.dispatch("Login", this.loginForm)
.then(() => {
- this.loading = false;
this.$router.push({ path: this.redirect || "/" });
})
.catch(() => {
@@ -148,7 +148,7 @@
justify-content: center;
align-items: center;
height: 100%;
- background-image: url("../assets/image/login-background.jpg");
+ background-image: url("../assets/images/login-background.jpg");
background-size: cover;
}
.title {
@@ -200,4 +200,7 @@
font-size: 12px;
letter-spacing: 1px;
}
+.login-code-img {
+ height: 38px;
+}
</style>
--
Gitblit v1.9.2