Commit 63439086 by chenyu

update: 活动有效期提示方式更改

parent de1fbc00
......@@ -160,12 +160,8 @@ export default {
callback(new Error('请选择开始日期'));
} else if(!value[1]) {
callback(new Error('请选择结束日期'));
} else if(value[0]&&value[1]&&new Date(this.activeInfoData.endDate).getTime()> this.endDate){
this.$message({
message: `您的分享有礼功能${moment(this.endDate).format('YYYY年MM月DD日')}到期,活动结束时间无法超过该日期。`,
type: 'warning'
});
callback(new Error(' '));
} else if(value[1]&&new Date(this.activeInfoData.endDate).getTime()> this.endDate){
callback(new Error(`您的分享有礼功能${moment(this.endDate).format('YYYY年MM月DD日')}到期,活动结束时间无法超过该日期。`));
} else {
callback();
}
......@@ -195,7 +191,7 @@ export default {
},
rules: {
activityName: [{ required: true, message: '请输入活动名称', trigger: 'blur' }],
dateRange: [{ validator: checkDate, trigger: 'blur' }]
dateRange: [{ validator: checkDate, trigger: 'change' }]
},
choiceDateCopy: [],
pickerOptions: {
......@@ -228,10 +224,10 @@ export default {
disabledDate: time => {
let disabled = time.getTime() < Date.now() - 8.64e7;
if(this.activeInfoData.startDate) {
disabled = disabled || time.getTime() > this.endDate||(time.getTime() < new Date(this.activeInfoData.startDate).getTime());
disabled = disabled || (time.getTime() < new Date(this.activeInfoData.startDate).getTime());
}
if(!this.activeInfoData.startDate || (new Date(this.activeInfoData.startDate).toDateString() === new Date().toDateString())) {
disabled = disabled || time.getTime() > this.endDate||(time.getTime() <= new Date().setHours(0,0,0));
disabled = disabled || (time.getTime() <= new Date().setHours(0,0,0));
}
return disabled;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment