From 9c62cd60f5441134c00f22247366e4193e526382 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 6 Dec 2021 09:04:34 +0800
Subject: [PATCH] 商品列表。 组合购7  的商品列表plus标签显示

---
 components/goods_list/goods_list.wxml | 2 +-
 pages/goods/goodsList/goodsList.wxml  | 2 +-
 pages/goods/search/search.wxml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index 7790e1f..bef9f48 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -12,7 +12,7 @@
           <!-- 商品名称 -->
           <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view>
           <!-- 判断是否有活动价 -->
-          <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0}}">
+          <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7}}">
 						<view class="pdt10">
 							<view class="money flex xc-wc" >
 							<text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text>	
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index be027d6..b90eee8 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -62,7 +62,7 @@
       <view class="item-cont">
         <view class="title ellipsis-2">{{item.goods_name}}</view>
         <!-- 判断是否有活动价 -->
-        <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 }}">
+        <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7 }}">
 				<view class="flex on">
 					<!-- 活动价 -->
 					<view class="price">
diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml
index 91cdcf4..9f915b0 100644
--- a/pages/goods/search/search.wxml
+++ b/pages/goods/search/search.wxml
@@ -35,7 +35,7 @@
       <view class="item-cont">
         <view class="title ellipsis-2">{{item.goods_name}}</view>
         <!-- 判断是否有活动价，小程序没有有团购和拼单 -->
-        <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_id>0}}">
+        <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_id>0 && item.prom_type!=7}}">
           <!-- 活动价 -->
           <view class="price">
 			  <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
--
libgit2 0.21.4