From d020062eee3c64d3c897d218f008ea27b3b50f2c Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Wed, 16 Mar 2022 13:41:31 +0800
Subject: [PATCH] 自定义秒杀 服务卡修改

---
 components/diy_seckill/diy_seckill.js   |  8 ++++++--
 components/diy_seckill/diy_seckill.wxml | 15 ++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/components/diy_seckill/diy_seckill.js b/components/diy_seckill/diy_seckill.js
index c1e2c09..a04374a 100644
--- a/components/diy_seckill/diy_seckill.js
+++ b/components/diy_seckill/diy_seckill.js
@@ -153,9 +153,13 @@ Component({
       for(let i in all_array){
       	let item=all_array[i];
       	if(item.user_price) item.price=item.user_price;
-				if(item.start_time > newTime) {
+				if(item.start_time > newTime) { //活动即将开始
 					item.status = 0;
-				} else if(item.end_time > newTime) {
+				} else if(item.end_time >= newTime) {
+					item.status = 3;
+				};
+				
+				if(item.start_time < newTime && item.goods_num > item.buy_num) {
 					item.status = 1;
 				};
 				
diff --git a/components/diy_seckill/diy_seckill.wxml b/components/diy_seckill/diy_seckill.wxml
index 99de758..6900b76 100644
--- a/components/diy_seckill/diy_seckill.wxml
+++ b/components/diy_seckill/diy_seckill.wxml
@@ -20,7 +20,7 @@
             <view class='one'>
               <view class='sp_top'>
                 <view class='po'></view>
-                <block wx:if="{{aitem.start_time>newTime}}">
+                <block wx:if="{{aitem.status == 0}}">
                   <view class="rob" style="justify-content: flex-start">
                     <span class='s_top_kill' style="background-color: #ffe718;color: #3c3b31;font-weight: bold">即将开始</span>
                   </view>
@@ -44,11 +44,7 @@
 					 </block>
 				</block> -->
 				
-				<block wx:if="{{aitem.status == 0}}">
-					<view class="rob" style="justify-content: flex-start">
-					  <span class='s_top_kill gray'>活动已结束</span>
-					</view>
-				</block>	
+				
 				<block wx:if="{{aitem.status == 1}}">
 				  <view class="rob" style="justify-content: flex-start">
 				    <span class='s_top_kill'>火热进行</span>
@@ -58,7 +54,12 @@
 				  <view class="rob" style="justify-content: flex-start">
 				    <span class='s_top_kill gray'>已抢光</span>
 				  </view>
-				</block>		
+				</block>
+				<block wx:if="{{aitem.status == 3}}">
+					<view class="rob" style="justify-content: flex-start">
+					  <span class='s_top_kill gray'>活动已结束</span>
+					</view>
+				</block>	
 				
                
 
--
libgit2 0.21.4