diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue index f809c729..ea352ae2 100644 --- a/src/views/modules/heart/actinfo-add-or-update.vue +++ b/src/views/modules/heart/actinfo-add-or-update.vue @@ -55,6 +55,7 @@ type="datetime" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" + :picker-options="isSignupEndTime" placeholder="选择日期时间"> @@ -240,9 +241,9 @@ prop="isBanner"> @@ -320,6 +321,12 @@ export default { actUserDefaultState: '1', bannerUrl:"" }, + isSignupEndTime: { + disabledDate(time) { + return time < Date.now() - 8.64e7;//8.64e7=1000*60*60*24一天 + } + }, + isImgRequired: true, mapSelectVisible:false, signInIsAble: true, isAble: false, @@ -499,6 +506,9 @@ export default { ], updatedTime: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } + ], + isBanner: [ + { required: this.isImgRequired, message: this.$t('validate.required'), trigger: 'blur' } ] } } @@ -507,6 +517,13 @@ export default { dateChangeTime(){ this.dataForm.signinStartTime = this.dataForm.actStartTime }, + changeHandler(value) { + if(value == 1){ + this.isImgRequired = true + } else{ + this.isImgRequired = false + } + }, backToActList () { this.$emit('refreshDataList') this.$parent.selectComponent = 'ActInfoList' @@ -609,9 +626,9 @@ export default { return this.$message.error('活动结束时间必须大于活动开始时间。'); } - if (signinEndTime < actStarTime) { + if (signinEndTime < actEndTime) { - return this.$message.error('签到结束时间必须大于签到开始时间。'); + return this.$message.error('签到结束时间必须大于活动结束时间。'); } this.isAble = true diff --git a/src/views/modules/heart/actinfo-cancel.vue b/src/views/modules/heart/actinfo-cancel.vue index d4f945c0..98f22154 100644 --- a/src/views/modules/heart/actinfo-cancel.vue +++ b/src/views/modules/heart/actinfo-cancel.vue @@ -1,12 +1,6 @@