Commit 6821ba5fb543f4d46c1c07b5b41d74e05e31609a
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
1 changed file
with
6 additions
and
1 deletions
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -102,7 +102,12 @@ | @@ -102,7 +102,12 @@ | ||
| 102 | <image class="abs" style="width: 120rpx;top: 32rpx; right: 220rpx;" mode="widthFix" src='{{iurl+"/miniapp/images/activity-time.png"}}'></image> | 102 | <image class="abs" style="width: 120rpx;top: 32rpx; right: 220rpx;" mode="widthFix" src='{{iurl+"/miniapp/images/activity-time.png"}}'></image> |
| 103 | 103 | ||
| 104 | <image class="secondkill-img" src='{{iurl+"/miniapp/images/group_img.png"}}'></image> | 104 | <image class="secondkill-img" src='{{iurl+"/miniapp/images/group_img.png"}}'></image> |
| 105 | - <view class="stop fs26 abs" style="color: #fff;" style="color: #fff;top: 22rpx" >结束时间</view> | 105 | + <view class="stop fs26 abs" style="color: #fff;" style="color: #fff;top: 22rpx" > |
| 106 | + | ||
| 107 | + <block wx:if="{{prom_st==0 && !prom_r_null}}">开始时间</block> | ||
| 108 | + <block wx:else>结束时间</block> | ||
| 109 | + | ||
| 110 | + </view> | ||
| 106 | <view class="secview flex abs fs24 xc-miaosha-time" style="color: #fff;top: 68rpx"> | 111 | <view class="secview flex abs fs24 xc-miaosha-time" style="color: #fff;top: 68rpx"> |
| 107 | <block wx:if="djs.day">{{djs.day}}天</block>{{djs.hou}}小时{{djs.min}}分{{djs.sec}}秒 | 112 | <block wx:if="djs.day">{{djs.day}}天</block>{{djs.hou}}小时{{djs.min}}分{{djs.sec}}秒 |
| 108 | </view> | 113 | </view> |