1. 如果读秒发现时间已经结束，要提示活动已经结束

2. 组件选择了手动选择时，前端控制只显示手动选择的商品 3. 霸屏功能的优化

1. 如果读秒发现时间已经结束，要提示活动已经结束
2. 组件选择了手动选择时，前端控制只显示手动选择的商品 3. 霸屏功能的优化
yvan.ni
1 parent 039e8111
Showing 7 changed files with 88 additions and 77 deletions
components/diy_pingd_buy/diy_pingd_buy.js
components/diy_pingd_buy/diy_pingd_buy.wxml
components/diy_pingd_buy/diy_pingd_buy.wxss
components/diy_seckill/diy_seckill.js
components/diy_seckill/diy_seckill.wxml
components/full_screen/full_screen.js
pages/index/index/index.js
@@ -84,12 +84,9 @@ Component({
 			  //--调用接口,读取拼单--
 			  app.request.promiseGet("/api/weshop/teamlist/getGoodsList?store_id="
 				  +os.stoid+"&goodsidlist="+goodsidlist, {}).then(res => {
-
 				  //如果拼单的数组为空的时候
 				  var goodslist=res.data.data;
-				  if(!goodslist || goodslist.length==0){
-					  th.no_gid_set();
-				  }else{
+				  if(goodslist && goodslist.length>0){
 					  th.set_goods_list(g_id,goodslist);  
 				  }
@@ -98,14 +95,15 @@ Component({
     },
 	no_gid_set(){
+		var th=this;
 		var url= "/api/weshop/teamlist/pageteam/2?page=1&pageSize=9";
 		getApp().request.promiseGet(url, {
 		  data: {
 		    store_id: os.stoid,is_end: 0,is_show: 1,	   
 		  }
 		}).then(res => {
-		   if(res.data.code==0 && res.data.data.pageData && e.data.data.pageData.length>0){
-				goodsidlist=res.data.data.pageData;
+		   if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
+				var goodslist=res.data.data.pageData;
 				th.set_goods_list(null,goodslist);
 		   } 
 		})
@@ -157,6 +155,8 @@ Component({
       var ee = ob;
       // 获取当前时间，同时得到活动结束时间数组
       var newTime = ut.gettimestamp();
+	  this.setData({newTime:newTime});
+	  
       var List = ee.data.goods_array;
       if (List.length == 0) return false;
       for (var j = 0; j < List.length; j++) {
@@ -21,11 +21,10 @@
                 <block wx:if="{{aitem.start_time>newTime}}">
                   <span class='s_top_p' style="background-color: #ffe718;color: #3c3b31;font-weight: bold">即将开始</span>
-                </block>
-                <block wx:if="{{aitem.start_time<newTime}}">
+                </block>				
+                <block wx:if="{{aitem.start_time<newTime && aitem.end_time>newTime}}">
                   <span class='s_top_p'>火热进行</span>
                 </block>
-
                 <!-- <span class='s_top_p'>火热进行</span> -->
                 <view class='s_img_p'>
@@ -50,12 +49,17 @@
                 <!--<view class='sp_jgx_p'>￥{{aitem.market_price}}</view>-->
                 <view class="tuan_set_num">
-                  <view class="co-red2">{{aitem.ct_num}}人团</view>
-
-                  <view wx:if="{{aitem.kttype==1 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去参团</view>
-                  <view wx:if="{{aitem.kttype==2 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去开团</view>
-                  <view wx:if="{{aitem.kttype==3 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去开团</view>
-                  <view wx:if="{{aitem.goods_num<=aitem.buy_num }}" class="cantuan huise">已抢光</view>
+                  <view class="co-red2">{{aitem.ct_num}}人团</view>			
+			      <!-- 判断有没有过期 -->  	  
+				  <block wx:if="{{aitem.end_time<=newTime}}">
+					  <view class="cantuan huise">已结束</view>
+				  </block>				  
+				  <block wx:else>
+					  <view wx:if="{{aitem.kttype==1 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去参团</view>
+					  <view wx:if="{{aitem.kttype==2 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去开团</view>
+					  <view wx:if="{{aitem.kttype==3 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去开团</view>
+					  <view wx:if="{{aitem.goods_num<=aitem.buy_num }}" class="cantuan huise">已抢光</view>
+				  </block>
                 </view>
               </view>
             </view>
@@ -89,16 +93,21 @@
                 <view class='sp_jg_p'>￥{{aitem.price}}</view>
                 <view class='sp_jgx_p'>￥{{aitem.market_price}}</view>
               </view>
-              <view class="o1_sj_p">
+              <view class="o1_sj_p" wx:if="{{aitem.end_time>newTime}}">
                 <image class="time_img" src="/public/static/images/model/time.png"></image>
-                <block wx:if="aitem.djs.day>0">{{aitem.djs.day}}天</block>{{aitem.djs.hou}}时{{aitem.djs.min}}分{{aitem.djs.sec}}秒
+                <block wx:if="{{aitem.djs.day>0 }}">{{aitem.djs.day}}天</block>{{aitem.djs.hou}}时{{aitem.djs.min}}分{{aitem.djs.sec}}秒
               </view>
-
-              <view wx:if="{{aitem.kttype==1 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去参团</view>
-              <view wx:if="{{aitem.kttype==2 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去开团</view>
-              <view wx:if="{{aitem.kttype==3 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去参团</view>
-              <view wx:if="{{aitem.goods_num<=aitem.buy_num }}" class="wo_p huise">已抢光</view>
-
+			  
+			  <!-- 判断有没有过期 -->
+			  <block wx:if="{{aitem.end_time<=newTime}}">
+			  	<view class="wo_p huise">已结束</view>
+			  </block>		
+			  <block wx:else>
+				  <view wx:if="{{aitem.kttype==1 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去参团</view>
+				  <view wx:if="{{aitem.kttype==2 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去开团</view>
+				  <view wx:if="{{aitem.kttype==3 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去参团</view>
+				  <view wx:if="{{aitem.goods_num<=aitem.buy_num }}" class="wo_p huise">已抢光</view>
+              </block>  
             </view>
           </view>
         </navigator>
@@ -362,4 +362,5 @@ swiper {
    display: flex;
    align-items: center;
    margin:5rpx 0rpx;
-}
 \ No newline at end of file
+}
+.o1_right_p .wo_p.huise{ background-color: #eee;}
 \ No newline at end of file
@@ -78,9 +78,7 @@ Component({
 			//如果秒杀的数组为空的时候    
 			var goodslist=res.data.data;
 			//就算是添加的活动已经过期，就要用最新的进行中活动
-			if(!goodslist || goodslist.length==0) {
-				th.no_gid_set();	
-			}else{
+			if(goodslist && goodslist.length>0) {
 				th.set_goods_list(g_id,goodslist);
 			}    
 		  });
@@ -151,6 +149,8 @@ Component({
       var ee = ob;
       // 获取当前时间，同时得到活动结束时间数组
       var newTime = ut.gettimestamp();
+	  this.setData({newTime:newTime});
+	    
       var List = ee.data.goods_array;
       if (List.length == 0) return false;
       for (var j = 0; j < List.length; j++) {
@@ -24,16 +24,26 @@
                     <span class='s_top_kill' style="background-color: #ffe718;color: #3c3b31;font-weight: bold">即将开始</span>
                   </view>
                 </block>
-                <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
-                  <view class="rob">
-                    <span class='s_top_kill'>火热进行</span>
-                  </view>
-                </block>
-                <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
-                  <view class="rob">
-                    <span class='s_top_kill gray'>已抢光</span>
-                  </view>
-                </block>
+				
+				<block wx:if="{{aitem.end_time<=newTime}}">
+					<view class="rob">
+					  <span class='s_top_kill gray'>活动已结束</span>
+					</view>
+				</block>				
+				<block wx:else>
+					 <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
+					   <view class="rob">
+					     <span class='s_top_kill'>火热进行</span>
+					   </view>
+					 </block>
+					 <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
+					   <view class="rob">
+					     <span class='s_top_kill gray'>已抢光</span>
+					   </view>
+					 </block>
+				</block>
+				
+               
                 <view class='clear'></view>
@@ -92,17 +102,25 @@
                   <view class="wo" style="background-color: #adadad">正在预热</view>
                 </view>
               </block>
-              <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
-                <view class="rob">
-                  <view class="wo">我要抢</view>
-                </view>
-              </block>
-
-              <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
-                <view class="rob">
-                  <view class="wo" style="background-color: #adadad">已抢光</view>
-                </view>
-              </block>
+			  
+			  <block wx:if="{{aitem.end_time<newTime}}">
+				  <view class="rob">
+				    <view class="wo" style="background-color: #adadad">已结束</view>
+				  </view>
+			  </block>			  
+			  <block wx:else>		  
+				  <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
+					<view class="rob">
+					  <view class="wo">我要抢</view>
+					</view>
+				  </block>
+
+				  <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
+					<view class="rob">
+					  <view class="wo" style="background-color: #adadad">已抢光</view>
+					</view>
+				  </block>
+			  </block>
             </view>
@@ -15,36 +15,13 @@ Component({
   },
   pageLifetimes:{
-    //要处理一下，游客登录后的界面的变化,主要还该是改变会员
-    show: function () {
-		var th=this;
-		th.setData({sec_show:3});	
-		//--如果有全屏广告的时候--
-		if(this.data.is_full_screen_show){
-			 //--定时关闭--
-			 th.data.full_screen=setInterval(function(){
-			 	 if(!th.data.sec_show) {
-			 		  clearInterval(th.data.full_screen);
-			 		  th.close_full_screen();
-			 		  return false;
-			 	 }
-			 	 th.data.sec_show--;
-			 	 th.setData({sec_show:th.data.sec_show});		 
-			 },1000)
-		}						
-    },
 	hide: function() {
         // 页面被隐藏
 		clearInterval(this.data.full_screen);
 	},
   },
-  properties: {
-  
-  },
-  ready: function () {
-    this.get_the_full_screen();
-  },
+  properties: {},
   methods: {
     close_full_screen(){
     	this.setData({is_full_screen_show:0,sec_show:0,is_full_screen_men:0});
@@ -57,6 +34,7 @@ Component({
 		this.setData({is_full_screen_show:0,is_full_screen_men:0});
     },   
     get_the_full_screen(){		
+		if(this.data.full_ad) return false;		
     	var th=this;
     	//获取全屏的广告
     	getApp().request.promiseGet("/api/weshop/ad/page?pid=1001&store_id=" + o.stoid,{
@@ -206,10 +206,7 @@ Page({
       }
     })
-    
-		
-		
-			
+  			
   },
   //关闭新用户领取广告
   close_disgraceful: function() {
@@ -229,7 +226,15 @@ Page({
 		 getApp().requestCardNum(this);
 	}  
-    var th = this
+    var th = this	
+	var show=getApp().globalData.isLoad_ad;
+	if(show){
+	   var full_screen = this.selectComponent("#full_screen"); //组件的id
+	   full_screen.get_the_full_screen();	
+	}else{
+	   getApp().globalData.isLoad_ad=1;	
+	}
+	
   },
   //当隐藏的时候就关闭计时器
   onHide: function() {