From 3342aed9f5877fe9966876965df1e522f285cfc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= <jianweie@163.com>
Date: Fri, 23 Dec 2022 02:16:06 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=A7=92=E6=9D=80=E3=80=90=E5=8D=B3=E5=B0=86=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E3=80=91=E7=B1=BB=E5=9E=8B=E4=B8=8B=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Promotion/CoreCmsPromotionServices.cs        | 16 ++++++++++++++--
 .../coreshop-page/coreshop-seckill.vue           |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CoreCms.Net.Services/Promotion/CoreCmsPromotionServices.cs b/CoreCms.Net.Services/Promotion/CoreCmsPromotionServices.cs
index 5dc904b3..46f1232f 100644
--- a/CoreCms.Net.Services/Promotion/CoreCmsPromotionServices.cs
+++ b/CoreCms.Net.Services/Promotion/CoreCmsPromotionServices.cs
@@ -257,8 +257,20 @@ namespace CoreCms.Net.Services
                             dto.mktPrice = good.mktprice;
                             dto.price = good.price;
 
-                            var ts = item.endTime.Subtract(dtNow);
-                            dto.timestamp = (int)ts.TotalSeconds;
+                            if (dto.startStatus == (int)GlobalEnumVars.GroupSeckillStatus.Upcoming)
+                            {
+                                var ts = item.startTime.Subtract(dtNow);
+                                dto.timestamp = (int)ts.TotalSeconds;
+                            }
+                            else if (dto.startStatus == (int)GlobalEnumVars.GroupSeckillStatus.InProgress)
+                            {
+                                var ts = item.endTime.Subtract(dtNow);
+                                dto.timestamp = (int)ts.TotalSeconds;
+                            }
+                            else if (dto.startStatus == (int)GlobalEnumVars.GroupSeckillStatus.Finished)
+                            {
+                                dto.timestamp = 0;
+                            }
                         }
                     }
                     var result = results.Find(p => p.promotionId == item.id);
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue
index 6005a103..3521c5cd 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue
@@ -30,7 +30,7 @@
                             <view class="coreshop-font-xs coreshop-text-through coreshop-margin-left-5">{{item.mktPrice}}元</view>
                         </view>
                         <view class="coreshop-seckill-btn" v-if="item.startStatus == 1" @click="goSeckillDetail(item.id)">马上秒</view>
-                        <view class="coreshop-seckill-btn" v-if="item.startStatus == 0">即将开始</view>
+                        <view class="coreshop-solitaire-btn" v-if="item.startStatus == 0">即将开始</view>
                         <view class="coreshop-buy-btn-disabled" v-if="item.startStatus == 2">已结束</view>
                     </view>
                 </view>