diff --git a/src/pages/shop/IncreaseDataCompany.vue b/src/pages/shop/IncreaseDataCompany.vue
index 2ad6b6f..f0e96e9 100644
--- a/src/pages/shop/IncreaseDataCompany.vue
+++ b/src/pages/shop/IncreaseDataCompany.vue
@@ -92,7 +92,7 @@
}
},
mounted: function () {
- let startDate = this.$moment(new Date()).add(-30,"day").format("YYYY-MM-DD");
+ let startDate = this.$moment(new Date()).add(-29,"day").format("YYYY-MM-DD");
let endDate = this.$moment(new Date()).format("YYYY-MM-DD");
this.selectDate.push(startDate);
this.selectDate.push(endDate);
diff --git a/src/pages/shop/IncreaseDataStaff.vue b/src/pages/shop/IncreaseDataStaff.vue
index 174096f..6ba0747 100644
--- a/src/pages/shop/IncreaseDataStaff.vue
+++ b/src/pages/shop/IncreaseDataStaff.vue
@@ -120,7 +120,7 @@
}
},
mounted: function () {
- let startDate = this.$moment(new Date()).add(-30,"day").format("YYYY-MM-DD");
+ let startDate = this.$moment(new Date()).add(-29,"day").format("YYYY-MM-DD");
let endDate = this.$moment(new Date()).format("YYYY-MM-DD");
this.selectDate.push(startDate);
this.selectDate.push(endDate);
diff --git a/src/pages/shop/IncreaseDataStore.vue b/src/pages/shop/IncreaseDataStore.vue
index 3c07d4c..4a67630 100644
--- a/src/pages/shop/IncreaseDataStore.vue
+++ b/src/pages/shop/IncreaseDataStore.vue
@@ -108,7 +108,7 @@
}
},
mounted: function () {
- let startDate = this.$moment(new Date()).add(-30,"day").format("YYYY-MM-DD");
+ let startDate = this.$moment(new Date()).add(-29,"day").format("YYYY-MM-DD");
let endDate = this.$moment(new Date()).format("YYYY-MM-DD");
this.selectDate.push(startDate);
this.selectDate.push(endDate);
diff --git a/src/pages/user/AccountManagementModify.vue b/src/pages/user/AccountManagementModify.vue
index 7725600..f79672a 100644
--- a/src/pages/user/AccountManagementModify.vue
+++ b/src/pages/user/AccountManagementModify.vue
@@ -27,8 +27,8 @@
- 密码
-
+ 密码
+
确认密码
@@ -82,6 +82,16 @@
shopId: this.$route.query.shopId,
type:this.$route.query.type
},
+ passwordCheck:[
+ {required:true,message:'密码不能为空',trigger:'blur'},
+ { min: 1, max: 11, message: '长度在 1 到 11 个字符', trigger: 'blur' },
+ { pattern: /^[0-9a-zA-Z]*$/g, message: '只可以输入数字和字母',trigger: 'blur'},
+ ],
+ confirmPasswordCheck:[
+ {required:true,message:'确认密码不能为空',trigger:'blur'},
+ { min: 1, max: 11, message: '长度在 1 到 11 个字符', trigger: 'blur' },
+ { pattern: /^[0-9a-zA-Z]*$/g, message: '只可以输入数字和字母',trigger: 'blur'},
+ ],
modifyValidate: {
userName:[
{required:true,message:'用户名不能为空',trigger:'blur'},
@@ -90,19 +100,11 @@
],
account:[
{required:true,message:'账号不能为空',trigger:'blur'},
- { min: 1, max: 12, message: '长度在 1 到 12 个字符', trigger: 'blur' },
- { pattern: /^[0-9a-zA-Z]*$/g, message: '只可以输入数字和字母',trigger: 'blur'},
- ],
- password:[
- {required:true,message:'密码不能为空',trigger:'blur'},
- { min: 1, max: 11, message: '长度在 1 到 11 个字符', trigger: 'blur' },
- { pattern: /^[0-9a-zA-Z]*$/g, message: '只可以输入数字和字母',trigger: 'blur'},
- ],
- confirmPassword:[
- {required:true,message:'确认密码不能为空',trigger:'blur'},
- { min: 1, max: 11, message: '长度在 1 到 11 个字符', trigger: 'blur' },
+ { min: 2, max: 8, message: '长度在 2 到 8 个字符', trigger: 'blur' },
{ pattern: /^[0-9a-zA-Z]*$/g, message: '只可以输入数字和字母',trigger: 'blur'},
],
+ password:null,
+ confirmPassword:null,
},
selectRole: this.$route.query.roleId,
roleList: [],
@@ -236,6 +238,11 @@
}
});
},
+ check(){
+ debugger
+ this.modifyValidate.password = this.passwordCheck;
+ this.modifyValidate.confirmPassword = this.confirmPasswordCheck;
+ }
}
}