修改密码

userCenter/src/views/system/users/popups/AddOrEditUserInfo.vue

@@ -96,11 +96,6 @@
 import envConfig from '@/config';
 // import SelectTree from '@/components/common/SelectTree.vue';
 
-const length_null = () => {
-    let pattern = /^.{6,20}$/,
-        message = `请输入不少于六位数密码且不超过20`;
-    return { pattern, required: true, message: message, trigger: 'blur' };
-};
 export default {
     props: ['params'],
     components: {
@@ -109,7 +104,7 @@ export default {
 
     data() {
         var validatePassContrast = (rule, value, callback) => {
-            if (value === '') {
+            if (value == '' || value == null) {
                 callback(new Error('请输入密码'));
             } else {
                 if (this.formData.password !== value) {
@@ -119,7 +114,7 @@ export default {
             }
         };
         var validatePass = (rule, value, callback) => {
-            if (value === '') {
+            if (value == '' || value == null) {
                 callback(new Error('请输入密码'));
             } else {
                 if (value.length < 6) {

userCenter/src/views/system/users/popups/edituser.vue

@@ -103,7 +103,7 @@ export default {
 
     data() {
         var validatePassContrast = (rule, value, callback) => {
-            if (value === '') {
+            if (value == '' || value == null) {
                 callback(new Error('请输入密码'));
             } else {
                 if (this.formData.password !== value) {
@@ -113,7 +113,7 @@ export default {
             }
         };
         var validatePass = (rule, value, callback) => {
-            if (value === '') {
+            if (value == '' || value == null) {
                 callback(new Error('请输入密码'));
             } else {
                 if (value.length < 6) {