Merge remote-tracking branch 'origin/dev'

src/utils/request.js

@@ -82,8 +82,7 @@ service.interceptors.response.use(res => {
                     confirmButtonText: '重新登录',
                     cancelButtonText: '取消',
                     type: 'warning'
-        }
-      ).then(() => {
+                }).then(() => {
                     isRelogin.show = false;
                     store.dispatch('LogOut').then(() => {
                         location.href = '/index';
@@ -99,6 +98,8 @@ service.interceptors.response.use(res => {
                 type: 'error'
             })
             return Promise.reject(new Error(msg))
+        } else if (code === 600) {
+            return Promise.reject(new Error(msg))
         } else if (code !== 200) {
             Notification.error({
                 title: msg
@@ -113,11 +114,9 @@ service.interceptors.response.use(res => {
         let { message } = error;
         if (message == "Network Error") {
             message = "后端接口连接异常";
-    }
-    else if (message.includes("timeout")) {
+        } else if (message.includes("timeout")) {
             message = "系统接口请求超时";
-    }
-    else if (message.includes("Request failed with status code")) {
+        } else if (message.includes("Request failed with status code")) {
             message = "系统接口" + message.substr(message.length - 3) + "异常";
         }
         Message({

src/views/login.vue

@@ -13,7 +13,7 @@
           type="text"
           auto-complete="off"
           placeholder="账号"
-          style="width: 310px;"
+          style="width: 310px"
         >
           <svg-icon
             slot="prefix"
@@ -68,7 +68,7 @@
           style="
             width: 300px;
             height: 50px;
-            background-image: linear-gradient(to right, #01A4FF, #1259EE );
+            background-image: linear-gradient(to right, #01a4ff, #1259ee);
             border-radius: -33px;
             border: none;
             color: #ffffff;
@@ -90,7 +90,7 @@
       <img
         src="../assets/images/bg3.png"
         alt=""
-        style="width: 1400px; height: 700px; border-radius: 0 6px 6px 0;"
+        style="width: 1400px; height: 700px; border-radius: 0 6px 6px 0"
       />
     </div>
     <!--  底部  -->
@@ -103,7 +103,7 @@
 <script>
 import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
-import { encrypt, decrypt } from '@/utils/jsencrypt'
+import { encrypt, decrypt } from "@/utils/jsencrypt";
 
 export default {
   name: "Login",
@@ -115,23 +115,23 @@ export default {
         password: "admin123",
         rememberMe: false,
         code: "",
-        uuid: ""
+        uuid: "",
       },
       loginRules: {
         username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
+          { required: true, trigger: "blur", message: "请输入您的账号" },
         ],
         password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
+          { required: true, trigger: "blur", message: "请输入您的密码" },
         ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+        code: [{ required: true, trigger: "change", message: "请输入验证码" }],
       },
       loading: false,
       // 验证码开关
       captchaOnOff: true,
       // 注册开关
       register: false,
-      redirect: undefined
+      redirect: undefined,
     };
   },
   watch: {
@@ -139,8 +139,8 @@ export default {
       handler: function (route) {
         this.redirect = route.query && route.query.redirect;
       },
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
     this.getCode();
@@ -148,8 +148,9 @@ export default {
   },
   methods: {
     getCode() {
-      getCodeImg().then(res => {
-        this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
+      getCodeImg().then((res) => {
+        this.captchaOnOff =
+          res.captchaOnOff === undefined ? true : res.captchaOnOff;
         if (this.captchaOnOff) {
           this.codeUrl = "data:image/gif;base64," + res.img;
           this.loginForm.uuid = res.uuid;
@@ -159,29 +160,40 @@ export default {
     getCookie() {
       const username = Cookies.get("username");
       const password = Cookies.get("password");
-      const rememberMe = Cookies.get('rememberMe')
+      const rememberMe = Cookies.get("rememberMe");
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
-        password: password === undefined ? this.loginForm.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+        password:
+          password === undefined ? this.loginForm.password : decrypt(password),
+        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
       };
     },
     handleLogin() {
-      this.$refs.loginForm.validate(valid => {
+      this.$refs.loginForm.validate((valid) => {
         if (valid) {
           this.loading = true;
           if (this.loginForm.rememberMe) {
             Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
+            Cookies.set("password", encrypt(this.loginForm.password), {
+              expires: 30,
+            });
+            Cookies.set("rememberMe", this.loginForm.rememberMe, {
+              expires: 30,
+            });
           } else {
             Cookies.remove("username");
             Cookies.remove("password");
-            Cookies.remove('rememberMe');
+            Cookies.remove("rememberMe");
           }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
+          this.$store
+            .dispatch("Login", this.loginForm)
+            .then(() => {
               this.$router.push({ path: this.redirect || "/" }).catch(() => {});
-          }).catch(() => {
+              setTimeout(() => {
+                this.loading = false;
+              }, 1500);
+            })
+            .catch(() => {
               this.loading = false;
               if (this.captchaOnOff) {
                 this.getCode();
@@ -189,8 +201,8 @@ export default {
             });
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -210,7 +222,7 @@ export default {
   line-height: 36px;
   // background-color: red;
   border: none;
-    border: 1px solid #E5E5E5;
+  border: 1px solid #e5e5e5;
   border-radius: 36px;
 }
 .login {