diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue index 568f16429..382d556d7 100644 --- a/fuintAdmin/src/views/member/index.vue +++ b/fuintAdmin/src/views/member/index.vue @@ -1222,7 +1222,7 @@ export default { .app-container { width: 100%; - height: 100vh; + //height: 100vh; background: #f6f8f9; margin: 0; padding: 0; diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue index 62dab7352..2ee08bdac 100644 --- a/fuintAdmin/src/views/userGrade/index.vue +++ b/fuintAdmin/src/views/userGrade/index.vue @@ -1251,8 +1251,21 @@ export default { noUseTimeType: [ {required: true, message: "请选择不适用时间段", trigger: "blur"}, ], + // suitTimeSlotFront: [ + // {required: true, message: "请选择适用时间段", trigger: "blur"}, + // ], + // 验证适用时间段的开始和结束时间 suitTimeSlotFront: [ - {required: true, message: "请选择适用时间段", trigger: "blur"}, + { + validator: (rule, value, callback) => { + if (!this.form2.suitTimeSlotFront || !this.form2.suitTimeSlotAfter) { + callback(new Error("请选择完整的适用时间段")); + } else { + callback(); + } + }, + trigger: "blur" + } ], noUseDate: [ {required: true, message: "请选择不适用时间段", trigger: "blur"}, diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/service/impl/ActiveAppletServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/service/impl/ActiveAppletServiceImpl.java index 9efd255d4..26c611b84 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/service/impl/ActiveAppletServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/service/impl/ActiveAppletServiceImpl.java @@ -233,6 +233,13 @@ public class ActiveAppletServiceImpl extends ServiceImpl