From 123f736e92ff86bf24786b4e07e5dd42e2841fea Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 3 Nov 2021 18:07:10 +0800
Subject: [PATCH] 小程序商品详情

---
 pages/goods/goodsInfo/goodsInfo.wxml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 6a12859..3c7a5f3 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -325,6 +325,9 @@
         </view>
         <!-- 不是拼团，不是积分购 -->
         <block wx:if="{{prom_type!=6 && prom_type!=4}}">
+
+
+
           <view class="goods-price">
             <view class="flex jc_sb">
               <view class="co-red" style="" wx:if="{{prom_type==0 || prom_type==3}}">
@@ -360,7 +363,8 @@
             </view>
             <!-- 不是秒杀 -->
             <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 -->
-            <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && prom_type!=1 && card_list && card_list.length>0}}">
+            <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && prom_type!=1 && card_list && card_list.length>0 && g_filters.get_card_price(data,card_list,1)!=''}}">
+
               <view class="flex ai-center  grade-card-frame card-frame">
                 <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
                 <view class="fs24 white view card-name ellipsis-1">
@@ -374,7 +378,7 @@
             <!-- 等级卡的显示,购买, 等级卡近30天要显示续费 -->
             <block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}">
               <!-- 不是秒杀，且会员不是等级会员 -->
-              <view wx:if="{{!card_field && prom_type!=1 && card_list && card_list.length>0}}">
+              <view wx:if="{{!card_field && prom_type!=1 && card_list && card_list.length>0 && g_filters.get_card_price(data,card_list,1)!=''}}">
                 <view class="beauty-makeup-frame flex ai-center">
                   <view class="left flex ai-center jc_sa">
                     <view class="flex ai-center  grade-card-frame card-frame advert-card">
@@ -570,9 +574,7 @@
             </view>
           </view>
         </block>
-				
-				
-				
+
         <!-- 要判断是不是有订单优惠 -->
         <block wx:if="{{order_prom}}">
           <view class="cx-frame flex" style="position: relative; height: auto">
--
libgit2 0.21.4