Commit a1e0891ef65c2161fd2e8aee07883e058e531d59

Authored by yvan.ni
1 parent e1c91b18

预售显示 即将开始 和 零售价

components/diy_pregoods/diy_pregoods.wxml
@@ -30,6 +30,13 @@ @@ -30,6 +30,13 @@
30 <span class='s_top_kill'>火热进行</span> 30 <span class='s_top_kill'>火热进行</span>
31 </view> 31 </view>
32 </block> 32 </block>
  33 +
  34 + <block wx:if="{{aitem.start_time>newTime}}">
  35 + <view class="rob">
  36 + <span class='s_top_kill' style="background-color: #ffe718">即将开始</span>
  37 + </view>
  38 + </block>
  39 +
33 <block wx:if="{{aitem.buy_goodnum>=aitem.presell_sumqty}}"> 40 <block wx:if="{{aitem.buy_goodnum>=aitem.presell_sumqty}}">
34 <view class="rob"> 41 <view class="rob">
35 <span class='s_top_kill gray'>已抢光</span> 42 <span class='s_top_kill gray'>已抢光</span>
components/diy_pregoods/diy_pregoods.wxss
@@ -57,6 +57,7 @@ swiper { @@ -57,6 +57,7 @@ swiper {
57 .sp .sp_top { 57 .sp .sp_top {
58 height: 220rpx; 58 height: 220rpx;
59 min-width: 30%; 59 min-width: 30%;
  60 + position: relative;
60 } 61 }
61 62
62 .sp .sp_top .s_img { 63 .sp .sp_top .s_img {
@@ -76,7 +77,7 @@ swiper { @@ -76,7 +77,7 @@ swiper {
76 font-size: 24rpx; 77 font-size: 24rpx;
77 height: 38rpx; 78 height: 38rpx;
78 line-height: 38rpx; 79 line-height: 38rpx;
79 - left: 6rpx; 80 + left: 2rpx;
80 padding: 4rpx 10rpx; 81 padding: 4rpx 10rpx;
81 border-radius: 10rpx; 82 border-radius: 10rpx;
82 z-index: 999; 83 z-index: 999;
packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -255,6 +255,8 @@ Page({ @@ -255,6 +255,8 @@ Page({
255 pre_arr: null, 255 pre_arr: null,
256 256
257 hiddenCS: true, 257 hiddenCS: true,
  258 +
  259 + is_retail_price: 0,
258 }, 260 },
259 261
260 //------初始化加载---------- 262 //------初始化加载----------
@@ -391,7 +393,8 @@ Page({ @@ -391,7 +393,8 @@ Page({
391 store_config: e, 393 store_config: e,
392 sys_switch: json_d, 394 sys_switch: json_d,
393 is_closecoupon: json_d.is_closecoupon, 395 is_closecoupon: json_d.is_closecoupon,
394 - is_newsales_rules: json_d.is_newsales_rules 396 + is_newsales_rules: json_d.is_newsales_rules,
  397 + is_retail_price: json_d.is_retail_price || 0,
395 }); 398 });
396 // ee.init(gid); 399 // ee.init(gid);
397 //------几人评价------- 400 //------几人评价-------
packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -80,10 +80,10 @@ @@ -80,10 +80,10 @@
80 <!-- <view class="flex" style='height:40rpx; margin-top:5rpx;'> --> 80 <!-- <view class="flex" style='height:40rpx; margin-top:5rpx;'> -->
81 <view class="abs xc-qt-price fs28 xc-qtsign">预售价</view> 81 <view class="abs xc-qt-price fs28 xc-qtsign">预售价</view>
82 <view class="abs flex presell_price"> 82 <view class="abs flex presell_price">
83 - <view class="fs28 val" style="margin-right:100rpx">¥{{presellList.presell_price}}</view>  
84 -<!-- <view class="word-line fs26 xc-qtunit-price">-->  
85 -<!-- 零售价¥{{filters.toFix(data.market_price,2)}}-->  
86 -<!-- </view>--> 83 + <view class="fs28 val" style="margin-right:60rpx">¥{{presellList.presell_price}}</view>
  84 + <view wx:if="{{is_retail_price}}" class="word-line fs26 xc-qtunit-price">
  85 + 零售价¥{{filters.toFix(data.market_price,2)}}
  86 + </view>
87 </view> 87 </view>
88 88
89 89