Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

后端研发-苏泰源
2 parents 1d8f2181 ddf4cb1d
Showing 1 changed file with 6 additions and 1 deletions
pages/goods/goodsInfo/goodsInfo.wxml
@@ -102,7 +102,12 @@
           <image class="abs" style="width: 120rpx;top: 32rpx; right: 220rpx;" mode="widthFix" src='{{iurl+"/miniapp/images/activity-time.png"}}'></image>
  
           <image class="secondkill-img" src='{{iurl+"/miniapp/images/group_img.png"}}'></image>
-          <view class="stop fs26 abs" style="color: #fff;" style="color: #fff;top: 22rpx" >结束时间</view>
+          <view class="stop fs26 abs" style="color: #fff;" style="color: #fff;top: 22rpx" >
+
+            <block wx:if="{{prom_st==0 && !prom_r_null}}">开始时间</block>
+            <block wx:else>结束时间</block>
+            
+          </view>
           <view class="secview  flex abs fs24 xc-miaosha-time" style="color: #fff;top: 68rpx">
             <block wx:if="djs.day">{{djs.day}}天</block>{{djs.hou}}小时{{djs.min}}分{{djs.sec}}秒
           </view>