From 177f61d8041a7c48fbafedab84c5f7b80d309a38 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 3 Feb 2026 19:07:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=8F=90=E7=A4=BA=E8=AF=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/merchant/components/coupon-card.vue | 2 +-
 src/pages/merchant/merchant-activity.vue      | 6 +++++-
 src/pages/merchant/my-act-list.vue            | 8 ++++++++
 src/sheep/constant/service-enum.ts            | 1 +
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/pages/merchant/components/coupon-card.vue b/src/pages/merchant/components/coupon-card.vue
index e0b606c..63d76fc 100644
--- a/src/pages/merchant/components/coupon-card.vue
+++ b/src/pages/merchant/components/coupon-card.vue
@@ -36,7 +36,7 @@ const doVisibleQrcode = () => {
                 </view>
                 <view class="scope-text flex-col">
                     <text>{{ actCouponTypeEnum[detail.couponType] }}</text>
-                    <text>有限期至 {{ detail.endTime }}</text>
+                    <text>在{{ detail.startTime }}至{{ detail.endTime }}时间段使用</text>
                 </view>
             </view>
         </view>
diff --git a/src/pages/merchant/merchant-activity.vue b/src/pages/merchant/merchant-activity.vue
index 826afa8..fcbd719 100644
--- a/src/pages/merchant/merchant-activity.vue
+++ b/src/pages/merchant/merchant-activity.vue
@@ -78,7 +78,7 @@
 			</view>
 		</template>
 	</crud-layout>
-	<modify-user ref="modifyUserRef" warnText="填写出生日期即可领取生日兑换券" />
+	<modify-user ref="modifyUserRef" warnText="填写出生日期即可领取生日兑换券" @close="modifyUserClose" />
 </template>
 
 <script setup lang="ts">
@@ -235,6 +235,10 @@ const getUserInfo = async () => {
 const doQrcode = () => {
 	router.jump("/pages/merchant/my-act-list")
 }
+
+const modifyUserClose = () => {
+	getIsEligibleForAct()
+}
 </script>
 
 <style scoped>
diff --git a/src/pages/merchant/my-act-list.vue b/src/pages/merchant/my-act-list.vue
index c96fffb..060d009 100644
--- a/src/pages/merchant/my-act-list.vue
+++ b/src/pages/merchant/my-act-list.vue
@@ -75,6 +75,14 @@ const doVisibleQrcode = async (detail: any) => {
     console.log("生成二维码:", type, actDetail);
     // 查询优惠券对应的短码
     if (type == "ACT_COUPON") {
+        // 判断核销时间 必须在`actDetail.startTime`和`actDetail.endTime`之间
+        const now = new Date().getTime()
+        const startTime = new Date(actDetail.startTime).getTime()
+        const endTime = new Date(actDetail.endTime).getTime()
+        if (now < startTime || now > endTime) {
+            uni.showToast({ title: "核销时间不在活动时间范围内", icon: "none" })
+            return
+        }
         // 特殊情况
         // 1. 生日
         if (actDetail.actUniquecode == "1qRgFo") {
diff --git a/src/sheep/constant/service-enum.ts b/src/sheep/constant/service-enum.ts
index 988f0d9..ebbde9f 100644
--- a/src/sheep/constant/service-enum.ts
+++ b/src/sheep/constant/service-enum.ts
@@ -82,6 +82,7 @@ const actUserReceiveEnum = {
 	// 特殊
 	"-100": "仅限生日当月使用",
 	"-101": "请填写出生日期",
+	"-102": "生日已结束",
 }
 
 export default {