diff --git a/components/diy_seckill/diy_seckill.js b/components/diy_seckill/diy_seckill.js
index fdd208d..c1e2c09 100644
--- a/components/diy_seckill/diy_seckill.js
+++ b/components/diy_seckill/diy_seckill.js
@@ -153,16 +153,45 @@ 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) {
+					item.status = 0;
+				} else if(item.end_time > newTime) {
+					item.status = 1;
+				};
+				
+				if(item.buy_num >= item.goods_num) {
+					item.status = 2;
+				};
       }
+			
+			
+			var promisies = [];
+			for (const key in all_array) {
+			  if (Object.hasOwnProperty.call(all_array, key)) {
+			    const val = all_array[key];
+			    promisies[key] = getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
+			        os.stoid + "/1/" + val.id, 
+			        {}
+			      ).then(res => {
+			        if (res.data.code == 0) {
+			          if (res.data.data <= 0) all_array[key].status = 2;
+			        };
+			      });
+			  }
+			}
 
-      var arr = new Array();
-      //--三个三个一组---
-      for (var i = 0; i < all_array.length; i += 3) {
-        arr.push(all_array.slice(i, i + 3));
-      }
-      /*--熏染到前台--*/
 
-      th.setData({ goods_array: arr });
+			Promise.all(promisies).then(() => {
+				var arr = new Array();
+				//--三个三个一组---
+				for (var i = 0; i < all_array.length; i += 3) {
+				  arr.push(all_array.slice(i, i + 3));
+				}
+				/*--熏染到前台--*/
+				
+				th.setData({ goods_array: arr });
+			});
+      
 
       th.data.timer = setInterval(function () {
         th.countDown2(th);
diff --git a/components/diy_seckill/diy_seckill.wxml b/components/diy_seckill/diy_seckill.wxml
index 3b000d9..99de758 100644
--- a/components/diy_seckill/diy_seckill.wxml
+++ b/components/diy_seckill/diy_seckill.wxml
@@ -26,7 +26,7 @@
                   </view>
                 </block>
 				
-				<block wx:if="{{aitem.end_time<=newTime}}">
+				<!-- <block wx:if="{{aitem.end_time<=newTime}}">
 					<view class="rob" style="justify-content: flex-start">
 					  <span class='s_top_kill gray'>活动已结束</span>
 					</view>
@@ -42,7 +42,23 @@
 					     <span class='s_top_kill gray'>已抢光</span>
 					   </view>
 					 </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>
+				  </view>
 				</block>
+				<block wx:if="{{aitem.status == 2}}">
+				  <view class="rob" style="justify-content: flex-start">
+				    <span class='s_top_kill gray'>已抢光</span>
+				  </view>
+				</block>