From 19eaa3f1cfa0c6173c86383de7e477b60047f754 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 21 Feb 2024 17:42:32 +0800
Subject: [PATCH] 参与活动的优化

---
 packageE/pages/cart/cart2/cart2.js   |  6 +++++-
 packageE/pages/cart/cart2/cart2.wxml | 30 +++++++++++++++++++-----------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index df2c0a4..a3713c5 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -1384,8 +1384,12 @@ Page({
                 }
 
               }else{
+
+                let obj=arr[k].show_can_cx[key_o];
                 //不是优惠促销的不参与  不是订单促销参与（订单促销不是实收价的时候）
-                if( !(arr[k].show_can_cx.no_cj_prom && arr[k].show_can_cx.cur_act.prom_type==3) && !th.data.can_use_ord_prom[arr[k].pick_id]){
+                let ck1=obj.no_cj_prom && obj.cur_act.prom_type==3;
+                let ck2=th.data.can_use_ord_prom[arr[k].pickup_id];
+                if( !ck1 && !ck2){
                   item1.prom_id = arr[k].show_can_cx[key_o].cur_act.prom_id;
                   item1.prom_type = arr[k].show_can_cx[key_o].cur_act.prom_type;
                 }
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index 11e1d30..933a0df 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -171,12 +171,17 @@
                    </block>
                </block>
 
-               <view class="set-mes" wx:if="{{items.prom_type==3 || (items.prom_type==0 && item.show_can_cx[items.goods_id].no_cj_prom) }}">
-                 <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{items.goods_id}}"  bindtap='no_cj_prom'>
-                   <icon color="{{!item.show_can_cx[items.goods_id].no_cj_prom?'red':'gray'}}" size="16" type="success"></icon>
-                   <view class="yu_er">参与优惠活动</view>
+               <!-- 如果不是点击使用订单促销的话 -->
+               <block wx:if="{{!can_use_ord_prom[item.pickup_id]}}">
+                 <view class="set-mes" wx:if="{{items.prom_type==3 || (items.prom_type==0 && item.show_can_cx[items.goods_id].no_cj_prom) }}">
+                   <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{items.goods_id}}"  bindtap='no_cj_prom'>
+                     <icon color="{{!item.show_can_cx[items.goods_id].no_cj_prom?'red':'gray'}}" size="16" type="success"></icon>
+                     <view class="yu_er">参与优惠活动</view>
+                   </view>
                  </view>
-               </view>
+               </block>
+
+
 
              </block>
 
@@ -231,12 +236,15 @@
                           </view>
                         </block>
 
-                        <view class="set-mes" wx:if="{{pitem.is_duo_gd && pitem.sele_prom_type==3 && util.check_is_last(index,items.goods_id) }}">
-                          <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{index}}"  bindtap='no_cj_prom'>
-                            <icon color="{{!pitem.no_cj_prom?'red':'gray'}}" size="16" type="success"></icon>
-                            <view class="yu_er">参与优惠活动</view>
+
+                        <block wx:if="{{!can_use_ord_prom[item.pickup_id]}}">
+                          <view class="set-mes" wx:if="{{pitem.is_duo_gd && pitem.sele_prom_type==3 && util.check_is_last(index,items.goods_id) }}">
+                            <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{index}}"  bindtap='no_cj_prom'>
+                              <icon color="{{!pitem.no_cj_prom?'red':'gray'}}" size="16" type="success"></icon>
+                              <view class="yu_er">参与优惠活动</view>
+                            </view>
                           </view>
-                        </view>
+                        </block>
 
                     </block>
             </block>
@@ -1102,7 +1110,7 @@
           </view>
           <view class="count">
             <view bindtap="{{items.goods_num <= 1 ? '':'subNum'}}" class="sub fs28 {{items.goods_num <= 1 ? 'active':''}}" data-pitems="{{pidx}}" data-item="{{idx}}">一</view>
-            <input class="goodadd" bindblur="valueToNum" data-item="{{idx}}" bindinput="refresh_input" data-item="{{idx}}" type="number" value="{{items.goods_num}}"></input>
+            <input class="goodadd" bindblur="valueToNum" data-item="{{idx}}" bindinput="refresh_input"  type="number" value="{{items.goods_num}}"></input>
             <view class="add" bindtap="addNum" data-item="{{idx}}">+</view>
           </view>
         </view>
--
libgit2 0.21.4