From 18484f7ee88d195e58d30627859e3749acc1412e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Fri, 27 Sep 2024 16:46:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E7=A7=92=E6=9D=80=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E6=B4=BB=E5=8A=A8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/seckill.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index 34708d62..7f00b0a9 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -7,7 +7,9 @@
     <detailSkeleton v-if="state.skeletonLoading" />
     <!-- 下架/售罄提醒 -->
     <s-empty
-      v-else-if="state.goodsInfo === null || state.goodsInfo.activity_type !== 'seckill'"
+      v-else-if="
+        state.goodsInfo === null || state.goodsInfo.activity_type !== 'seckill' || endTime.ms <= 0
+      "
       text="活动不存在或已结束"
       icon="/static/soldout-empty.png"
       showAction

From cb392468504345e236babc2ec40ef1280d1109b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Fri, 27 Sep 2024 19:58:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=8B=BC=E5=9B=A2=E3=80=81=E7=A7=92=E6=9D=80?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84SPU=E5=90=8D=E7=A7=B0=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=B4=BB=E5=8A=A8=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-groupon-block/s-groupon-block.vue | 2 ++
 sheep/components/s-seckill-block/s-seckill-block.vue | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
index 1a5a5918..cf924969 100644
--- a/sheep/components/s-groupon-block/s-groupon-block.vue
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -261,6 +261,8 @@
       // 查找对应的 spu 并更新价格
       const spu = state.spuList.find((spu) => activity.spuId === spu.id);
       if (spu) {
+        // 赋值活动名称
+        spu.name = activity.name;
         // 赋值最低价格
         spu.price = Math.min(combinationPrice, spu.price);
         // 赋值活动ID，为了点击跳转详情页
diff --git a/sheep/components/s-seckill-block/s-seckill-block.vue b/sheep/components/s-seckill-block/s-seckill-block.vue
index 4eced427..d7e80136 100644
--- a/sheep/components/s-seckill-block/s-seckill-block.vue
+++ b/sheep/components/s-seckill-block/s-seckill-block.vue
@@ -261,6 +261,8 @@
       // 查找对应的 spu 并更新价格
       const spu = state.spuList.find((spu) => activity.spuId === spu.id);
       if (spu) {
+        // 赋值活动名称
+        spu.name = activity.name;
         // 赋值最低价格
         spu.price = Math.min(seckillPrice, spu.price);
         // 赋值活动ID，为了点击跳转详情页