From a1e0891ef65c2161fd2e8aee07883e058e531d59 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 6 May 2023 16:02:06 +0800
Subject: [PATCH] 预售显示  即将开始  和 零售价

---
 components/diy_pregoods/diy_pregoods.wxml       | 7 +++++++
 components/diy_pregoods/diy_pregoods.wxss       | 3 ++-
 packageC/pages/presell/goodsInfo/goodsInfo.js   | 5 ++++-
 packageC/pages/presell/goodsInfo/goodsInfo.wxml | 8 ++++----
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/components/diy_pregoods/diy_pregoods.wxml b/components/diy_pregoods/diy_pregoods.wxml
index da62e69..7186dca 100644
--- a/components/diy_pregoods/diy_pregoods.wxml
+++ b/components/diy_pregoods/diy_pregoods.wxml
@@ -30,6 +30,13 @@
 					     <span class='s_top_kill'>火热进行</span>
 					   </view>
 					 </block>
+
+                    <block wx:if="{{aitem.start_time>newTime}}">
+                        <view class="rob">
+                            <span class='s_top_kill' style="background-color: #ffe718">即将开始</span>
+                        </view>
+                    </block>
+
 					 <block wx:if="{{aitem.buy_goodnum>=aitem.presell_sumqty}}">
 					   <view class="rob">
 					     <span class='s_top_kill gray'>已抢光</span>
diff --git a/components/diy_pregoods/diy_pregoods.wxss b/components/diy_pregoods/diy_pregoods.wxss
index 11e5447..b3569b8 100644
--- a/components/diy_pregoods/diy_pregoods.wxss
+++ b/components/diy_pregoods/diy_pregoods.wxss
@@ -57,6 +57,7 @@ swiper {
 .sp .sp_top {
   height: 220rpx;
   min-width: 30%;
+  position: relative;
 }
 
 .sp .sp_top .s_img {
@@ -76,7 +77,7 @@ swiper {
   font-size: 24rpx;
   height: 38rpx;
   line-height: 38rpx;
-  left: 6rpx;
+  left: 2rpx;
   padding: 4rpx 10rpx;
   border-radius: 10rpx;
   z-index: 999;
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index 7e53247..5394814 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -255,6 +255,8 @@ Page({
     pre_arr: null,
 
     hiddenCS: true,
+
+    is_retail_price: 0,
   },
 
   //------初始化加载----------
@@ -391,7 +393,8 @@ Page({
         store_config: e,
         sys_switch: json_d,
         is_closecoupon: json_d.is_closecoupon,
-        is_newsales_rules: json_d.is_newsales_rules
+        is_newsales_rules: json_d.is_newsales_rules,
+        is_retail_price: json_d.is_retail_price || 0,
       });
       // ee.init(gid);
       //------几人评价-------
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
index f13b41e..7cc56c4 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -80,10 +80,10 @@
           <!-- <view class="flex" style='height:40rpx; margin-top:5rpx;'> -->
           <view class="abs xc-qt-price fs28 xc-qtsign">预售价</view>
           <view class="abs flex presell_price">
-            <view class="fs28 val" style="margin-right:100rpx">￥{{presellList.presell_price}}</view>
-<!--            <view class="word-line fs26 xc-qtunit-price">-->
-<!--              零售价￥{{filters.toFix(data.market_price,2)}}-->
-<!--            </view>--> 
+            <view class="fs28 val" style="margin-right:60rpx">￥{{presellList.presell_price}}</view>
+            <view wx:if="{{is_retail_price}}" class="word-line fs26 xc-qtunit-price">
+               零售价￥{{filters.toFix(data.market_price,2)}}
+            </view>
           </view>
 
 
--
libgit2 0.21.4