From 9011c26f9f41080334ad512df445a7547db218b2 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Fri, 9 Oct 2020 15:57:06 +0800
Subject: [PATCH] 等级卡立即续费的时候。要用手店价格来计算优惠金额

---
 pages/goods/goodsInfo/goodsInfo.wxml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 7f06a39..18429eb 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -298,7 +298,7 @@
                </view>
             </view>
 		    <!-- 立即续费的显示 -->	
-			<view wx:elif="{{is_near_date && data[card_field]>0}}">
+			<view wx:elif="{{is_near_date && data[card_field]>0 && prom_type!=1}}">
 				    <view class="beauty-makeup-frame flex ai-center">
 				 				   <view class="left flex ai-center">
 				 					   <view class="flex ai-center  grade-card-frame card-frame advert-card">
@@ -306,7 +306,7 @@
 				 							<view class="fs24 white view card-name ellipsis-1">{{card_name}}</view>
 				 					   </view>
 				 					   <view class="card-effect">
-				 					     <view class="fs24 xc-black3">成为{{card_name}}立<text class="co-red">省{{filters.toFix(data.market_price-data[card_field],2)}}</text>元</view>
+				 					     <view class="fs24 xc-black3">成为{{card_name}}立<text class="co-red">省{{filters.toFix(data.shop_price[card_field],2)}}</text>元</view>
 				 					      <view class="fs22 xc-ash"> 开通会员 尽享更多优惠 </view>
 				 				       </view>
 				     </view>				 				   				
--
libgit2 0.21.4