Merge branch 'xy-ly' into fly

src/utils/request.js

@@ -44,6 +44,10 @@ service.interceptors.response.use(
         router.push("/login");
       }
 
+      if (res.code === 400) {
+        Message({ message: '参数错误', type: "error", duration: 1500 });
+      }
+
       if (res.code === 500) {
         Message({
           showClose: true,

src/views/Login.vue

@@ -80,7 +80,7 @@ export default {
         ],
         password: [
           { required: true, message: "请输入密码", trigger: "blur" },
-          { min: 6, max: 8, message: "请输入6-8位字符", trigger: "blur" },
+          // { min: 6, max: 8, message: "请输入6-8位字符", trigger: "blur" },
         ],
         // verificationCode: [
         //   { required: true, message: "验证码不能为空", trigger: "blur" },

src/views/components/passwordDialog.vue

@@ -44,7 +44,7 @@ export default {
         ],
         password: [
           { required: true, message: "请输入密码", trigger: "blur" },
-          { min: 6, max: 8, message: '请输入6-8位字符', trigger: 'blur' }
+          // { min: 6, max: 8, message: '请输入6-8位字符', trigger: 'blur' }
         ],
       },
     };

src/views/system/components/addUser.vue

@@ -75,7 +75,7 @@ export default {
         role: [{ required: true, message: "请选择角色", trigger: "blur" }],
         password: [
           { required: true, message: "请输入密码", trigger: "blur" },
-          { min: 6, max: 8, message: "请输入6-8位字符", trigger: "blur" },
+          // { min: 6, max: 8, message: "请输入6-8位字符", trigger: "blur" },
         ],
       },
       xgrules: {