Authored by hongyong.zhao

bug fix

1 <view> 1 <view>
2 - <block wx:if="{{product.status === 0}}"> 2 + <block wx:if="{{product.status === 0 || product.is_full === 1}}">
3 <view class="btn cancel" >活动结束</view> 3 <view class="btn cancel" >活动结束</view>
4 </block> 4 </block>
5 5
@@ -38,7 +38,7 @@ Component({ @@ -38,7 +38,7 @@ Component({
38 },1000) 38 },1000)
39 }, 39 },
40 formatCountDown:function formatCountDown(end) { 40 formatCountDown:function formatCountDown(end) {
41 - if (end === 0) { 41 + if (end === 0 || (end * 1000 - Date.now() < 0)) {
42 return '00000000' 42 return '00000000'
43 } 43 }
44 var timeInSecond = (end * 1000 - Date.now()) / 1000 44 var timeInSecond = (end * 1000 - Date.now()) / 1000
@@ -232,9 +232,9 @@ Page(Object.assign({ @@ -232,9 +232,9 @@ Page(Object.assign({
232 232
233 let participantCount = r1.code === 200 ? r1.data.joinNum : 0; 233 let participantCount = r1.code === 200 ? r1.data.joinNum : 0;
234 234
235 - if (product.status >= ACTIVITY.END) {  
236 - participantCount = product.limit;  
237 - } 235 + // if (product.status >= ACTIVITY.END) {
  236 + // participantCount = product.limit;
  237 + // }
238 238
239 this.setData({ 239 this.setData({
240 product: product, 240 product: product,