From d2da33ba078dd0d246e4f045112e8169491ba24a Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 5 Dec 2023 17:15:36 +0800
Subject: [PATCH] 商品列表的优化

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

diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index ea8f46d..7d6faa1 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -523,7 +523,7 @@
                 <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
                 <!--如果有显示价格 -->
                 <view class='zs_wz2' wx:if="{{object.goodsprice}}">
-                  <block wx:if="{{item.prom_price || item.prom_integral}}">
+                  <block wx:if="{{(item.prom_price && item.prom_type!=3 && item.prom_type!=5 && item.prom_type!=7 && item.prom_type!=10) || item.prom_integral}}">
                     <view class='wz_red'>
                       <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
                       <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
@@ -693,7 +693,7 @@
                     <view class='zs_wz1_2l ellipsis-2' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
                     <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}">
 
-                      <block wx:if="{{item.prom_price || item.prom_integral}}">
+                      <block wx:if="{{(item.prom_price && item.prom_type!=3 && item.prom_type!=5 && item.prom_type!=7 && item.prom_type!=10) || item.prom_integral}}">
                         <view class='wz_red'>
                           <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
                           <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
@@ -862,7 +862,7 @@
 
                       <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
                       <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}">
-                        <block wx:if="{{item.prom_price || item.prom_integral}}">
+                        <block wx:if="{{(item.prom_price && item.prom_type!=3 && item.prom_type!=5 && item.prom_type!=7 && item.prom_type!=10) || item.prom_integral}}">
                           <view class='wz_red'>
                             <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
                             <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
@@ -1033,7 +1033,7 @@
                 <view class='zs_wz1_x ellipsis-2' style="width: 360rpx; margin-top: 10rpx" wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
                 <view class='zs_wz2_x' wx:if="{{object.goodsprice}}">
 
-                  <block wx:if="{{item.prom_price || item.prom_integral}}">
+                  <block wx:if="{{(item.prom_price && item.prom_type!=3 && item.prom_type!=5 && item.prom_type!=7 && item.prom_type!=10) || item.prom_integral}}">
                     <view class='wz_red'>
                       <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
                       <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
@@ -1224,7 +1224,7 @@
                   <view class='sp_wz'>
                     <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{aitem.goods_name}}</view>
                     <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}">
-                      <block wx:if="{{aitem.prom_price || aitem.prom_integral }}">
+                      <block wx:if="{{(aitem.prom_price && aitem.prom_type!=3 && aitem.prom_type!=5 && aitem.prom_type!=7 && aitem.prom_type!=10) || aitem.prom_integral }}">
                         <view class='wz_red'>
                           <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}</text>
                           <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text>
diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index 5702fd8..f7c147c 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -15,7 +15,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 && item.prom_type!=7 && item.prom_type!=10}}">
+          <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=3  && item.prom_type!=5 && item.prom_type!=7 && item.prom_type!=10 }}">
             <view class="pdt10">
               <view class="money flex xc-wc" style="line-height:28rpx">
                 <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 f08e5de..fa34472 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -88,7 +88,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 && item.prom_type!=7 && item.prom_type!=10 }}">
+        <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0  && item.prom_type!=3  && item.prom_type!=5 && item.prom_type!=7 && item.prom_type!=10 }}">
 				<view class="flex on">
 					<!-- 活动价 -->
 					<view class="price">
diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml
index 14ed09e..1b7c591 100644
--- a/pages/goods/search/search.wxml
+++ b/pages/goods/search/search.wxml
@@ -87,7 +87,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 && item.prom_type!=7 && item.prom_type!=10}}">
+        <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_id>0 && item.prom_type!=3 && item.prom_type!=5 && item.prom_type!=7 && item.prom_type!=10}}">
           <!-- 活动价 -->
           <view class="price">
 			  <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
--
libgit2 0.21.4