校验

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

src/dashoo.cn/frontend_web/src/pages/system/userchangepwd.vue

@@ -52,17 +52,19 @@
         if (value === '') {
           callback(new Error('请输入新密码'))
         } else {
-          if (this.pwdform.checknewPass !== '') {
-            this.$refs.pwdform.validateField('checknewPass')
+          let re2 = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,20}$/
+          if (!re2.test(this.pwdform.newpass)) {
+            callback(new Error('请输入正确格式的密码(8—20位，至少包含1个大写字母、1个小写字母和1个数字)'));
+          } else {
+            callback();
           }
-          callback()
         }
       }
       var validatePass2 = (rule, value, callback) => {
         if (value === '') {
           callback(new Error('请再次输入新密码'))
         } else if (value !== this.pwdform.newpass) {
-          callback(new Error('两次输入密码不一致!'))
+          callback(new Error('两次输入密码不一致'))
         } else {
           callback()
         }