From 91c6ae307de58c5fcbf815f92a90295b4246cd51 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 25 四月 2021 10:40:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/login.vue | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 19e45c7..0c381ac 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -48,7 +48,7 @@
</el-form>
<!-- 搴曢儴 -->
<div class="el-login-footer">
- <span>Copyright 漏 2018-2020 ruoyi.vip All Rights Reserved.</span>
+ <span>Copyright 漏 2018-2021 ruoyi.vip All Rights Reserved.</span>
</div>
</div>
</template>
@@ -126,15 +126,12 @@
Cookies.remove("password");
Cookies.remove('rememberMe');
}
- this.$store
- .dispatch("Login", this.loginForm)
- .then(() => {
- this.$router.push({ path: this.redirect || "/" });
- })
- .catch(() => {
- this.loading = false;
- this.getCode();
- });
+ this.$store.dispatch("Login", this.loginForm).then(() => {
+ this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+ }).catch(() => {
+ this.loading = false;
+ this.getCode();
+ });
}
});
}
@@ -148,7 +145,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 {
--
Gitblit v1.9.3