Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

src/pages/user/user_info.vue

@@ -135,12 +135,12 @@
         :modal-append-to-body="false"
       >
         <div class="change_psw">
-          <el-form ref="form" :model="form">
+          <el-form ref="form" :model="form" :rules="passRules">
             <el-form-item class="dia_item">
               <p>旧密码：</p>
               <el-input v-model="form.passwordOld"></el-input>
             </el-form-item>
-            <el-form-item class="dia_item">
+            <el-form-item prop="passwordNew" class="dia_item">
               <p>新密码：</p>
               <el-input v-model="form.passwordNew" :type="visible1 ? 'password':'text'">
                 <span
@@ -152,7 +152,7 @@
                 ></span>
               </el-input>
             </el-form-item>
-            <el-form-item class="dia_item">
+            <el-form-item prop="nextname" class="dia_item">
               <p>请再次输入密码：</p>
               <el-input v-model="form.nextname" :type="visible2 ? 'password':'text'">
                 <span
@@ -183,44 +183,77 @@ export default {
     BlockRadius,
     UploadFile
   },
-  data: () => ({
-    activeName: "0",
-    userId: "",
-    is_admin: 0,
-    user_data: {
-      accountNo: "",
-      password: "12345678",
-      nickname: "",
-      contactPerson: "",
-      phone: "",
-      email: "",
-      organization: "",
-      userType: "",
-      userTypeName: ""
-    },
-    visible1: true,
-    visible2: true,
-    form: {
-      passwordOld: "",
-      passwordNew: "",
-      nextname: ""
-    },
-    imgList: [],
-    formBusiness: {
-      businessSystemName: "",
-      domainName: "",
-      ip_white: [],
-      ip_black: [],
-      private_token: "",
-      description: ""
-    },
-    whiteAddShow: false,
-    blackAddShow: false,
-    newIpWhite: "",
-    newIpBlack: "",
-    diaPassWord: false,
-    couldUp: true
-  }),
+  data() {
+    var checkNewPass = (rule, value, callback) => {
+      let reg = new RegExp(
+        /^.*(?=.{6,50})(?=.*\d)(?=.*[A-Z]{1,})(?=.*[a-z]{1,}).*$/
+      );
+      if (value == "") {
+        callback(new Error("请输入新密码"));
+      } else if (value == this.form.passwordOld) {
+        callback(new Error("新密码不应与旧密码一致"));
+      } else if (!reg.test(value)) {
+        callback(new Error("密码包含大小写字母、数字，长度不小于6位"));
+      } else {
+        callback();
+      }
+    };
+    var checkNextPass = (rule, value, callback) => {
+      if (value !== this.form.passwordNew) {
+        callback(new Error("密码和确认密码不一致"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      activeName: "0",
+      userId: "",
+      is_admin: 0,
+      user_data: {
+        accountNo: "",
+        password: "12345678",
+        nickname: "",
+        contactPerson: "",
+        phone: "",
+        email: "",
+        organization: "",
+        userType: "",
+        userTypeName: ""
+      },
+      visible1: true,
+      visible2: true,
+      form: {
+        passwordOld: "",
+        passwordNew: "",
+        nextname: ""
+      },
+      passRules: {
+        passwordNew: [
+          { required: true, message: "请输入新密码", trigger: "blur" },
+          { validator: checkNewPass, trigger: "blur" }
+        ],
+        nextname: [
+          { required: true, message: "请再次输入新密码", trigger: "blur" },
+          { validator: checkNextPass, trigger: "blur" }
+        ]
+      },
+      imgList: [],
+      formBusiness: {
+        businessSystemName: "",
+        domainName: "",
+        ip_white: [],
+        ip_black: [],
+        private_token: "",
+        description: ""
+      },
+      whiteAddShow: false,
+      blackAddShow: false,
+      newIpWhite: "",
+      newIpBlack: "",
+      diaPassWord: false,
+      couldUp: true
+    };
+  },
   mounted() {
     this.getCurrentUser();
   },