From 3b36fd31c7ed4e6d9c5a99492e39272f6a1e56d2 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 5 Aug 2022 20:50:39 +0800
Subject: [PATCH] 不显示零售价

---
 pages/index/index/index.wxss              | 8 ++++----
 pages/team/team_ping/team_ping.wxml       | 2 +-
 pages/team/team_show/team_show.wxml       | 2 +-
 pages/team/team_success/team_success.wxml | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss
index 8824018..dedb960 100644
--- a/pages/index/index/index.wxss
+++ b/pages/index/index/index.wxss
@@ -1,16 +1,16 @@
 /* 基本样式 */
 page {
 	width: 100%;
-	height: 100%;
-	overflow: hidden;
+	/*height: 100%;*/
+	/*overflow: hidden;*/
 	box-sizing: border-box;
 	position: relative;
 }
 /* 超出滚动 */
 .container {
 	width: 100%;
-	height: 100%;
-	overflow-y: auto;
+	height: auto;
+	/*overflow-y: auto;*/
 	overflow-x: hidden;
 }
 
diff --git a/pages/team/team_ping/team_ping.wxml b/pages/team/team_ping/team_ping.wxml
index 8700061..a2df4ec 100644
--- a/pages/team/team_ping/team_ping.wxml
+++ b/pages/team/team_ping/team_ping.wxml
@@ -33,7 +33,7 @@
               <view class="flex">
                 <text class='fs24 xc-wc {{item.pt_status==1?"xc-rmbs":"xc-rmb"}}'>￥</text>
                 <view class='pd-jg xc-wc'>{{item.order_goods[0].goods_price}}</view>
-                <view class="flex  word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}"><text class="fs24 xc-black">零售价:</text><text class="fs24 xc-wc">￥</text><text class="fs26  xc-wc">{{item.order_goods[0].market_price}}</text> </view>
+                <view class="flex  word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}"><text class="fs24 xc-black"></text><text class="fs24 xc-wc">￥</text><text class="fs26  xc-wc">{{item.order_goods[0].shop_price}}</text> </view>
               </view>
 
               <view class="xc-img-frame" wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 || item.pt_status==6}}">
diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml
index c6ef77c..2adbc63 100644
--- a/pages/team/team_show/team_show.wxml
+++ b/pages/team/team_show/team_show.wxml
@@ -19,7 +19,7 @@
 					<view class="fs40 xc-wc" style='font-size:40rpx'>
 						<span class="fs28" style="font-weight:500;">￥</span>{{teamlist.price}}</view>
 					<view class="fs22 word-line xc-wc">
-						零售价￥{{goods.market_price}}
+						￥{{goods.shop_price}}
 					</view>
 				</view>
 				<view class="xc-wc fs24">
diff --git a/pages/team/team_success/team_success.wxml b/pages/team/team_success/team_success.wxml
index 14ae682..ca21c62 100644
--- a/pages/team/team_success/team_success.wxml
+++ b/pages/team/team_success/team_success.wxml
@@ -18,7 +18,7 @@
           <view class="fs40 xc-wc" style='font-size:40rpx'>
             <span class="fs28 xc-rmbs" style="font-weight:500;">￥</span>{{teamlist.price}}</view>
           <view class="fs22 word-line xc-wc" style="width:172rpx;">
-            零售价￥{{goods.market_price}}
+            ￥{{goods.shop_price}}
           </view>
         </view>
         <view class="xc-wc fs24">
--
libgit2 0.21.4