From 798ffd9065d72d76bb48a69ae91e81a19be8f22e Mon Sep 17 00:00:00 2001
From: 朱杰 <693337446@qq.com>
Date: 星期六, 22 五月 2021 23:29:15 +0800
Subject: [PATCH] fix 修复代码生成器中表字段取消必填无法更新问题

---
 ruoyi-ui/src/views/login.vue |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 19e45c7..d68f614 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">鑻ヤ緷鍚庡彴绠$悊绯荤粺</h3>
+      <h3 class="title">RuoYi-Vue-Plus鍚庡彴绠$悊绯荤粺</h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="璐﹀彿">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -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>
@@ -99,8 +99,8 @@
   methods: {
     getCode() {
       getCodeImg().then(res => {
-        this.codeUrl = "data:image/gif;base64," + res.img;
-        this.loginForm.uuid = res.uuid;
+        this.codeUrl = "data:image/gif;base64," + res.data.img;
+        this.loginForm.uuid = res.data.uuid;
       });
     },
     getCookie() {
@@ -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