From f170f85fd61d14e22a075b5cf4b3c057a7ad24f1 Mon Sep 17 00:00:00 2001
From: cheng.xu <cheng.xu@meidd.com>
Date: Wed, 13 Nov 2019 16:39:43 +0800
Subject: [PATCH] 商品详情的价格修改

---
 pages/goods/goodsInfo/goodsInfo.wxml | 8 +++++++-
 pages/goods/goodsInfo/goodsInfo.wxss | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index e89f9d6..d7c58b4 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -235,6 +235,9 @@
 				      <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view>
 				     </view>
 				     <text class="rel yuan">￥</text>{{filters.toFix(data[card_field],2)}}
+           <view class='yj' style="top:35rpx">
+                  <text>原价:￥{{data.market_price}}</text>
+                </view>
 				  </block>
 				  <block wx:else>
                      <text class="rel yuan">￥</text>{{ filters.toFix(data.shop_price,2)}}
@@ -255,7 +258,10 @@
 					    	<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
 					        <view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view>
                   </view>
-                  <view class="fs32 xc-black3 ai_and"><text class="fs26">￥</text>{{g_filters.get_card_price(data,card_list,0)}}</view>
+                  <view class="fs32 xc-black3 ai_and carde_frame">
+                  <text class="fs26">
+                  ￥</text>{{g_filters.get_card_price(data,card_list,0)}}
+                  </view>
 			</view>
 			
 				
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index fe14616..e533e88 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -2298,4 +2298,8 @@ right:17rpx; top:55rpx;
         transform: rotate(45deg);display:inline-block;
         margin-bottom:3rpx;
 
+}
+.carde_frame{
+  height: 50rpx;
+  line-height: 18rpx
 }
\ No newline at end of file
--
libgit2 0.21.4