Commit 1de5a132af7ac643412f2ce7b4627d2e0bc33894
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
3 changed files
with
8 additions
and
9 deletions
packageA/pages/goodsInfo/goodsInfo.js
| @@ -207,7 +207,7 @@ Page({ | @@ -207,7 +207,7 @@ Page({ | ||
| 207 | sto_sele_name_1:'',//分享的门店名称 | 207 | sto_sele_name_1:'',//分享的门店名称 |
| 208 | 208 | ||
| 209 | // 秒杀 | 209 | // 秒杀 |
| 210 | - prom_st: 0, | 210 | + prom_st: null, |
| 211 | prom_r_null: 0, | 211 | prom_r_null: 0, |
| 212 | 212 | ||
| 213 | hiddenCS: true, //控制客服操作菜单显示和控制 | 213 | hiddenCS: true, //控制客服操作菜单显示和控制 |
| @@ -3237,6 +3237,7 @@ Page({ | @@ -3237,6 +3237,7 @@ Page({ | ||
| 3237 | if (endTime1 > newTime) { | 3237 | if (endTime1 > newTime) { |
| 3238 | ee.setData({ | 3238 | ee.setData({ |
| 3239 | prom_time_text: '距秒杀开始还有', | 3239 | prom_time_text: '距秒杀开始还有', |
| 3240 | + prom_st: 0, | ||
| 3240 | }) | 3241 | }) |
| 3241 | ee.countDown(endTime1, 0); | 3242 | ee.countDown(endTime1, 0); |
| 3242 | } else { | 3243 | } else { |
packageA/pages/goodsInfo/goodsInfo.wxml
| @@ -71,15 +71,13 @@ | @@ -71,15 +71,13 @@ | ||
| 71 | <!-- 即将开始 --> | 71 | <!-- 即将开始 --> |
| 72 | <image class="secondkill-img" src='{{iurl+"/miniapp/images/blue_ks.png"}}' wx:if="{{prom_st==0}}"></image> | 72 | <image class="secondkill-img" src='{{iurl+"/miniapp/images/blue_ks.png"}}' wx:if="{{prom_st==0}}"></image> |
| 73 | <!-- 进行中 --> | 73 | <!-- 进行中 --> |
| 74 | - <image class="secondkill-img" src='{{iurl+"/miniapp/images/red_jx.png"}}' wx:elif="{{prom_st!=0}}"></image> | 74 | + <image class="secondkill-img" src='{{iurl+"/miniapp/images/red_jx.png"}}' wx:elif="{{prom_st!=0 && prom_st!=null}}"></image> |
| 75 | <image class="abs spike-img" src="{{iurl}}/miniapp/images/xsmiaosha.png"></image> | 75 | <image class="abs spike-img" src="{{iurl}}/miniapp/images/xsmiaosha.png"></image> |
| 76 | <view class="start fs26 abs" wx:if="{{prom_st==0}}">距活动开始还有</view> | 76 | <view class="start fs26 abs" wx:if="{{prom_st==0}}">距活动开始还有</view> |
| 77 | - <view class="stop fs26 abs" wx:if="{{prom_st==1 || prom_st==3}}">距活动结束还有</view> | ||
| 78 | - <view class="secview flex abs fs24 xc-miaosha-time"> | ||
| 79 | - <block wx:if="djs.day"> | ||
| 80 | - <view class='day-val' style="color:{{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">{{djs.day}}</view> | ||
| 81 | - <view class="day white" style="color: {{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">天</view> | ||
| 82 | - </block> | 77 | + <view class="stop fs26 abs" wx:elif="{{prom_st==1 || prom_st==3}}">距活动结束还有</view> |
| 78 | + <view class="secview flex abs fs24 xc-miaosha-time" wx:if="{{prom_st!=null}}"> | ||
| 79 | + <view class='day-val' style="color:{{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">{{djs.day}}</view> | ||
| 80 | + <view class="day white" style="color: {{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">天</view> | ||
| 83 | <view class='time-val white t-c' style=" background:{{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">{{djs.hou}}</view> | 81 | <view class='time-val white t-c' style=" background:{{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">{{djs.hou}}</view> |
| 84 | <view class="time" style="color: {{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">时</view> | 82 | <view class="time" style="color: {{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">时</view> |
| 85 | <view class='time-val white t-c' style=" background:{{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">{{djs.min}}</view> | 83 | <view class='time-val white t-c' style=" background:{{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">{{djs.min}}</view> |
pages/index/index/index.js
| @@ -408,7 +408,7 @@ Page({ | @@ -408,7 +408,7 @@ Page({ | ||
| 408 | } | 408 | } |
| 409 | } | 409 | } |
| 410 | 410 | ||
| 411 | - Promise.all(promisies).then((values) => { | 411 | + Promise.all(promisies).then(() => { |
| 412 | var arr = new Array(); | 412 | var arr = new Array(); |
| 413 | //--三个三个一组--- | 413 | //--三个三个一组--- |
| 414 | for (var i = 0; i < flash_data.length; i += 3) { | 414 | for (var i = 0; i < flash_data.length; i += 3) { |