From b60a86709793caeda0a5ecbe0d92ed51aa2119c7 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@yolipai.com>
Date: Mon, 18 Nov 2019 14:54:50 +0800
Subject: [PATCH] 关于购买时等级价显示的bug修复

---
 pages/goods/goodsInfo/goodsInfo.js   |  2 +-
 pages/goods/goodsInfo/goodsInfo.wxml | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index e3447b0..95529d2 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -848,7 +848,7 @@ Page({
         newd.member_goods_price = th.data.prom_price,
           newd.prom_type = th.data.prom_type;
         newd.prom_id = th.data.prom_id;
-      } else if (th.data.prom_type == 3) {
+      } else if (th.data.prom_type == 3 || th.data.prom_type == 2 || th.data.prom_type == 4 || th.data.prom_type == 5) {
         newd.prom_type = 0;
         newd.prom_id = 0;
       }
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index efb1d69..ef7cb6d 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -857,14 +857,14 @@
         <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}}">			  
+          <view class="spec-goods-price" wx:if="{{prom_price==null}}" >			  
 			  <text class="fs20">￥</text>
 		            	 <!-- 如果是等级会员，且有等级价 -->
-			 			  <block wx:if="card_field && sele_g[card_field]>0">
+			 			  <block wx:if="{{card_field && sele_g[card_field]>0}}">
 			 			      {{sele_g[card_field]}}
 			 			  </block> 		 
 			 			  <block wx:else>
-			 			      {{sele_g.shop_price}} 
+			 			      {{sele_g.shop_price}}
 			 			  </block>	  
 			  
 		      </view>
@@ -981,10 +981,10 @@
         <image class="wh100 spec-img xc-distance-bottom" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
         <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}}">
+          <view class="flex ai_end xc-val-money {{sele_g[card_field]}}" >
+            <view class="spec-goods-price" wx:if="{{is_normal==1}}" >
 			                 <!-- 如果是等级会员，且有等级价 -->
-			     			  <block wx:if="card_field && sele_g[card_field]>0">
+			     			  <block wx:if="{{card_field && sele_g[card_field]>0}}">
 			     			    ￥ {{sele_g[card_field]}}
 			     			  </block> 		 
 			     			  <block wx:else>
--
libgit2 0.21.4