From 7c4c5ed7cfb55a3ac0f6b61a87dbd76b83078a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Thu, 10 Oct 2024 11:01:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B010.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin/src/views/userGrade/index.vue          | 15 ++++++++++++++-
 .../service/impl/ActiveAppletServiceImpl.java     |  7 +++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

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<ActiveAppletMapper, Act
         return null;
     }
 
+    /**
+     * 判断当前时间是否在活动时间范围内
+     * @param activeStartTime
+     * @param activeEndTime
+     * @param now
+     * @return
+     */
     private boolean isTimeBetween(Date activeStartTime, Date activeEndTime, DateTime now) {
         if (now.isAfterOrEquals(activeStartTime) && now.isBeforeOrEquals(activeEndTime)) {
             return true;

From d85d7b327c1d188ea1046dc1e0d46bf03dd7f382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Thu, 10 Oct 2024 11:20:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B010.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin/src/views/member/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;