From 98ed06afeee62743414d209271d259c9715799cf Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@yolipai.com>
Date: Sat, 16 Nov 2019 18:01:29 +0800
Subject: [PATCH] 商品详情的等级价格显示，购买

---
 pages/goods/goodsInfo/goodsInfo.wxml | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index f45f4b9..940dd39 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -274,10 +274,8 @@
                   </view>
 			</view>
 
-
-
-                   <!-- 等级卡的显示,购买, 等级卡近30天要显示续费-->
-                <view>{{g_filters.is_has_rank(rank_switch,data)}}</view>
+              <!-- 等级卡的显示,购买, 等级卡近30天要显示续费-->
+              
 			<block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}">	
          
             <view wx:if="{{!card_field }}">
@@ -847,6 +845,7 @@
   <nav_box></nav_box>
 
 </block>
+
 <!----弹起来,选择规格数量,普通商品购买和秒杀------>
 <view hidden="{{!openSpecModal}}">
   <view bindtap="closeSpecModal" class="cover-layer"></view>
@@ -858,7 +857,17 @@
         <view class="spec-goods-info">
           <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view>
           <view class="flex ai_end xc-val-money">
-          <view class="spec-goods-price" wx:if="{{prom_price==null}}"><text class="fs20">￥</text>{{sele_g.shop_price}}</view>
+          <view class="spec-goods-price" wx:if="{{prom_price==null}}">			  
+			  <text class="fs20">￥</text>
+		            	 <!-- 如果是等级会员，且有等级价 -->
+			 			  <block wx:if="card_field && sele_g[card_field]>0">
+			 			      {{sele_g[card_field]}}
+			 			  </block> 		 
+			 			  <block wx:else>
+			 			      {{sele_g.shop_price}} 
+			 			  </block>	  
+			  
+		      </view>
           <view class="spec-goods-price" wx:else><text class="fs20">￥</text>{{prom_price}}</view>
         </view>
        
@@ -973,7 +982,15 @@
         <view class="spec-goods-info">
           <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view>
           <view class="flex ai_end xc-val-money">
-            <view class="spec-goods-price" wx:if="{{is_normal==1}}">￥ {{sele_g.shop_price}}</view>
+            <view class="spec-goods-price" wx:if="{{is_normal==1}}">
+			                 <!-- 如果是等级会员，且有等级价 -->
+			     			  <block wx:if="card_field && sele_g[card_field]>0">
+			     			    ￥ {{sele_g[card_field]}}
+			     			  </block> 		 
+			     			  <block wx:else>
+			     			    ￥ {{sele_g.shop_price}} 
+			     			  </block>	 
+			</view>
             <view class="spec-goods-price" wx:else>￥ {{prom_price}}</view>
           </view>
 
--
libgit2 0.21.4