Commit db0875f07ecb42aad8cc9012e54f6163b2e1a031
1 parent
773836e4
活动显示未开始
Showing
2 changed files
with
30 additions
and
3 deletions
pages/goods/goodsList/goodsList.js
... | ... | @@ -22,7 +22,8 @@ Page({ |
22 | 22 | is_hot:0, |
23 | 23 | prom_goods_list:null, |
24 | 24 | rq_data:null, |
25 | - isToggle: false, //切换商品视图控制符 | |
25 | + isToggle: false, //切换商品视图控制符 | |
26 | + show_all:1, //判断显示 | |
26 | 27 | }, |
27 | 28 | |
28 | 29 | onLoad: function(t) { |
... | ... | @@ -115,6 +116,25 @@ Page({ |
115 | 116 | }).then(res=>{ |
116 | 117 | if(res.data.code==0 && res.data.data){ |
117 | 118 | var arr= res.data.data; |
119 | + | |
120 | + if(arr.is_end==1){ | |
121 | + th.setData({show_all:0}); | |
122 | + th.setData({err_txt:'活动已结束'}); | |
123 | + return false; | |
124 | + } | |
125 | + if(arr.start_time>ut.gettimestamp()){ | |
126 | + th.setData({show_all:0}); | |
127 | + th.setData({err_txt:'活动还未开始'}); | |
128 | + return false; | |
129 | + } | |
130 | + if(arr.end_time<ut.gettimestamp()){ | |
131 | + th.setData({show_all:0}); | |
132 | + th.setData({err_txt:'活动还未开始'}); | |
133 | + return false; | |
134 | + } | |
135 | + | |
136 | + | |
137 | + | |
118 | 138 | var url1="/api/weshop/prom/ladderList/list?store_id="+oo.stoid+"&form_id="+arr.id; |
119 | 139 | getApp().request.promiseGet(url1, {}).then(rs=>{ |
120 | 140 | if(rs.data.code==0 && rs.data.data && rs.data.data.length) { | ... | ... |
pages/goods/goodsList/goodsList.wxml
1 | 1 | <wxs module="g_filter" src="g_filter.wxs"></wxs> |
2 | -<view class="container"> | |
2 | +<view class="container" wx:if="{{show_all}}"> | |
3 | 3 | <view> |
4 | 4 | <block wx:for="{{prom_goods_list}}"> |
5 | 5 | <view class="fs30 ellipsis-1" style="padding: 20rpx 30rpx"> |
... | ... | @@ -332,4 +332,11 @@ |
332 | 332 | </view> |
333 | 333 | </view> |
334 | 334 | |
335 | -<share_box id="share"></share_box> | |
336 | 335 | \ No newline at end of file |
336 | +<share_box id="share"></share_box> | |
337 | +<view class="t-c fs32" wx:if="{{err_txt}}"> | |
338 | + <view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}"> | |
339 | + <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image> | |
340 | + <view class="no-data-title">{{err_txt}}</view> | |
341 | + <navigator class="lookat" url="/pages/index/index/index">回到首页</navigator> | |
342 | + </view> | |
343 | +</view> | |
337 | 344 | \ No newline at end of file | ... | ... |