From 51b91a712b354fd7243d1af30843f0b6f4ff7f4a Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sun, 23 Apr 2023 11:01:20 +0800
Subject: [PATCH] 多促销的优化

---
 pages/cart/cart/cart.wxml    | 37 ++++++++++++++++++++-----------------
 pages/cart/cart/g_filter.wxs |  7 +++++++
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index 2e76e99..a4d708a 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -128,28 +128,31 @@
                 </view>
             </view>
 
+
             <!-- 验证活动是不是多个，要不要显示切换 -->
             <!-- 新增促销多活动的排版 -->
-            <view class="bdb16"
-                  wx:if="{{g_filter.is_more_act(items,item.show_can_cx) && item.show_can_cx[items.goods_id] && item.show_can_cx[items.goods_id].act_arr.length>1}}">
-                <view bindtap="switch_cx_group"
-                      data-index="{{pidx}}"
-                      data-gd_key="{{items.goods_id}}"
-                      class="cx-frame flex" style="position: relative">
-                    <view class="cx-sizs fs30">促销</view>
-                    <view class="flex ai_c f1 pdh20">
-                        <view class="xc-coupon-fram" wx:for="{{item.show_can_cx[items.goods_id].act_arr}}" >
-                            <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word">优惠促销</view>
-                            <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word">搭配促销</view>
-                            <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word">组合购</view>
-                            <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word">阶梯促销</view>
+            <block  wx:if="{{g_filter.is_more_act(items,item.show_can_cx) && item.show_can_cx[items.goods_id] && item.show_can_cx[items.goods_id].act_arr.length>1}}">
+                <view class="bdb16" wx:if="{{util.check_show(items,item.show_can_cx[items.goods_id].sele_prom_type)}}">
+                    <view bindtap="switch_cx_group"
+                          data-index="{{pidx}}"
+                          data-gd_key="{{items.goods_id}}"
+                          class="cx-frame flex" style="position: relative">
+                        <view class="cx-sizs fs30">促销</view>
+                        <view class="flex ai_c f1 pdh20">
+                            <view class="xc-coupon-fram" wx:for="{{item.show_can_cx[items.goods_id].act_arr}}" >
+                                <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word">优惠促销</view>
+                                <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word">搭配促销</view>
+                                <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word">组合购</view>
+                                <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word">阶梯促销</view>
+                            </view>
+                        </view>
+                        <view class="cx-obtain-coupon wsize">
+                            <text class="bg_jj"></text>
                         </view>
-                    </view>
-                    <view class="cx-obtain-coupon wsize">
-                        <text class="bg_jj"></text>
                     </view>
                 </view>
-            </view>
+            </block>
+
 
         </block >
 
diff --git a/pages/cart/cart/g_filter.wxs b/pages/cart/cart/g_filter.wxs
index 3930850..a5b31f8 100644
--- a/pages/cart/cart/g_filter.wxs
+++ b/pages/cart/cart/g_filter.wxs
@@ -35,6 +35,12 @@ var g_filters = {
 		if([1,2,4,6,8,9].indexOf(items.prom_type)>-1) return false;
         if(!show_can_cx) return false;
         return true;
+	},
+	check_show:function(items,sele_prom_type){
+		if([7,10].indexOf(sele_prom_type)>-1){
+			if(!items.is_act_last) return false;
+		}
+		return true;
 	}
 }
 module.exports = {
@@ -43,4 +49,5 @@ module.exports = {
 	end_time: g_filters.end_time,
 	toFix: g_filters.toFix,
 	is_more_act: g_filters.is_more_act,
+	check_show:g_filters.check_show
 }
\ No newline at end of file
--
libgit2 0.21.4