diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 42a60cc..8270dde 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -22,7 +22,8 @@ Page({
 		is_hot:0,
         prom_goods_list:null,
         rq_data:null,
-				isToggle: false, //切换商品视图控制符
+		isToggle: false, //切换商品视图控制符
+        show_all:1,      //判断显示
     },
 
     onLoad: function(t) {
@@ -115,6 +116,25 @@ Page({
           }).then(res=>{
               if(res.data.code==0 && res.data.data){
                   var arr= res.data.data;
+
+                  if(arr.is_end==1){
+                      th.setData({show_all:0});
+                      th.setData({err_txt:'活动已结束'});
+                      return false;
+                  }
+                  if(arr.start_time>ut.gettimestamp()){
+                      th.setData({show_all:0});
+                      th.setData({err_txt:'活动还未开始'});
+                      return false;
+                  }
+                  if(arr.end_time<ut.gettimestamp()){
+                      th.setData({show_all:0});
+                      th.setData({err_txt:'活动还未开始'});
+                      return false;
+                  }
+
+
+
                   var url1="/api/weshop/prom/ladderList/list?store_id="+oo.stoid+"&form_id="+arr.id;
                   getApp().request.promiseGet(url1, {}).then(rs=>{
                       if(rs.data.code==0 && rs.data.data && rs.data.data.length) {
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index d42e021..7f97ca7 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -1,5 +1,5 @@
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
-<view class="container">
+<view class="container" wx:if="{{show_all}}">
   <view>
      <block wx:for="{{prom_goods_list}}">
          <view  class="fs30 ellipsis-1" style="padding: 20rpx 30rpx">
@@ -332,4 +332,11 @@
     </view>
   </view>
 
-<share_box id="share"></share_box>
\ No newline at end of file
+<share_box id="share"></share_box>
+<view class="t-c fs32" wx:if="{{err_txt}}">
+	<view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}">
+		<image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
+		<view class="no-data-title">{{err_txt}}</view>
+		<navigator class="lookat" url="/pages/index/index/index">回到首页</navigator>
+	</view>
+</view>
\ No newline at end of file