From 5ed417589ff783cc95a0134e5b379fef86fb332b Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 6 Dec 2023 14:05:56 +0800
Subject: [PATCH] 取价方式的优化

---
 packageE/pages/cart/cart2/cart2.js   |  30 +++++++++++++++++++++++++++---
 packageE/pages/cart/cart2/cart2.wxml | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------
 2 files changed, 125 insertions(+), 86 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 19dd45c..3317088 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -6811,7 +6811,19 @@ Page({
           if (fid > -1) return false;
         }
 
-        ob.price += item.goods_price * item.goods_num;
+        //优惠促销取价的优化
+        let f_price=item.goods_price;
+        if(ob.discount_field!=undefined){
+          switch (ob.discount_field){
+            case 0: f_price=item.goods_price;break;
+            case 1: f_price=item.shop_price;break;
+            case 2: f_price=item.market_price;break;
+          }
+        }
+
+        item.goods_price=f_price;
+
+        ob.price += f_price * item.goods_num;
         ob.goods_num += item.goods_num;
         ob.goods.push({ goods_id: item.goods_id, goods_price: item.goods_price, goods_num: item.goods_num });
 
@@ -6858,10 +6870,12 @@ Page({
             switch (prom.discount_field){
               case 0: f_price=item.goods_price;break;
               case 1: f_price=item.shop_price;break;
-              case 2: f_price=item.market_price;break;
+              case 2: f_price=item.goods_market_price;break;
             }
         }
 
+        item.goods_price=f_price;
+
         ob.price = f_price * item.goods_num;
         ob.goods_num = item.goods_num;
         ob.is_bz = prom.is_bz;
@@ -6869,6 +6883,7 @@ Page({
         ob.is_xz_yh = prom.is_xz_yh;
         ob.is_order_yh = prom.is_order_yh;
         ob.is_post_temp = prom.is_post_temp;
+        ob.discount_field = prom.discount_field;
         ob.goods = new Array();
         ob.goods.push({ goods_id: item.goods_id, goods_price: item.goods_price, goods_num: item.goods_num });
         map[pickid][item.prom_id] = ob;
@@ -6911,14 +6926,17 @@ Page({
 
       //优惠促销取价的优化
       let f_price=item.goods_price;
+
       if(prom.discount_field!=undefined){
         switch (prom.discount_field){
           case 0: f_price=item.goods_price;break;
           case 1: f_price=item.shop_price;break;
-          case 2: f_price=item.market_price;break;
+          case 2: f_price=item.goods_market_price;break;
         }
       }
 
+      item.goods_price=f_price;
+
       ob.prom_id = item.prom_id;
       ob.name = prom.name;
       ob.price = f_price * item.goods_num;
@@ -6927,6 +6945,7 @@ Page({
       ob.is_xz_yh = prom.is_xz_yh;
       ob.is_order_yh = prom.is_order_yh;
       ob.is_post_temp = prom.is_post_temp;
+      ob.discount_field = prom.discount_field;
       ob.goods = new Array();
       ob.goods.push({ goods_id: item.goods_id, goods_price: item.goods_price, goods_num: item.goods_num });
       var obj = {};
@@ -8320,6 +8339,11 @@ Page({
       }
     }
     func({'code': 0, 'msg': '成功'})
+  },
+
+  //--- 不参与优惠促销的开关 ---
+  no_cj_prom:function (e){
+     let can_cx_idx=e.currentTarget.dataset.can_cx_idx;
   }
 
 
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index 8523ff9..6a37c8d 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -118,57 +118,65 @@
 
              <!-- 验证活动是不是多个，要不要显示切换 -->
              <!-- 新增促销多活动的排版,单商品的时候 -->
-             <block  wx:if="{{(util.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)}}">
-
-
-               <!-- 组合购和阶梯促销要特殊出来 -->
-               <block wx:if="{{item.show_can_cx[items.goods_id].sele_prom_type==7 || item.show_can_cx[items.goods_id].sele_prom_type==10 }}">
-
-                 <!-- 是不是活动的最后一个商品 -->
-                 <view class="bdb16" wx:if="{{items.is_act_last}}"  >
-                   <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 {{!item.sele?'gray':'' }} ">优惠促销</view>
-                         <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
-                         <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
-                         <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+             <block  wx:if="{{(util.is_more_act(items,item.show_can_cx) && item.show_can_cx[items.goods_id])}}">
+
+
+               <!-- 多个活动的时候 -->
+               <block wx:if="{{item.show_can_cx[items.goods_id].act_arr.length>1}}">
+                   <!-- 组合购和阶梯促销要特殊出来 -->
+                   <block wx:if="{{item.show_can_cx[items.goods_id].sele_prom_type==7 || item.show_can_cx[items.goods_id].sele_prom_type==10 }}">
+
+                     <!-- 是不是活动的最后一个商品 -->
+                     <view class="bdb16" wx:if="{{items.is_act_last}}"  >
+                       <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 {{!item.sele?'gray':'' }} ">优惠促销</view>
+                             <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
+                             <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
+                             <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+                           </view>
+                         </view>
+                         <view class="cx-obtain-coupon wsize">
+                           <text class="bg_jj"></text>
+                         </view>
                        </view>
                      </view>
-                     <view class="cx-obtain-coupon wsize">
-                       <text class="bg_jj"></text>
-                     </view>
-                   </view>
-                 </view>
 
-               </block>
-               <block wx:else>
-                   <view class="bdb16">
-                   <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 {{!item.sele?'gray':'' }} ">优惠促销</view>
-                         <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
-                         <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
-                         <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+                   </block>
+                   <block wx:else>
+                     <view class="bdb16">
+                       <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 {{!item.sele?'gray':'' }} ">优惠促销</view>
+                             <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
+                             <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
+                             <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+                           </view>
+                         </view>
+                         <view class="cx-obtain-coupon wsize">
+                           <text class="bg_jj"></text>
+                         </view>
                        </view>
                      </view>
-                     <view class="cx-obtain-coupon wsize">
-                       <text class="bg_jj"></text>
-                     </view>
-                   </view>
-                 </view>
+                   </block>
                </block>
 
-
+               <view class="set-mes" wx:if="{{items.prom_type==3 || items.cj_prom_type==3}}">
+                 <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>
 
              </block>
 
@@ -177,54 +185,61 @@
              <block wx:if="{{item.show_can_cx}}">
                     <block  wx:for="{{item.show_can_cx}}" wx:for-item="pitem">
 
-                      <!-- 组合购和阶梯促销要特殊出来 -->
-                      <block wx:if="{{ pitem.sele_prom_type==7 || pitem.sele_prom_type==10 }}">
-                        <!-- 是不是活动的最后一个商品 -->
-                        <view class="bdb16" wx:if="{{pitem.is_duo_gd && pitem.act_arr.length>1 && items.is_act_last}}" >
-
-                          <view bindtap="switch_cx_group"
-                                data-index="{{pidx}}"
-                                data-gd_key="{{index}}"
-                                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="{{pitem.act_arr}}" >
-                                <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
-                                <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
-                                <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
-                                <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+                        <!-- 组合购和阶梯促销要特殊出来 -->
+                        <block wx:if="{{ pitem.sele_prom_type==7 || pitem.sele_prom_type==10 }}">
+                          <!-- 是不是活动的最后一个商品 -->
+                          <view class="bdb16" wx:if="{{pitem.is_duo_gd && pitem.act_arr.length>1 && items.is_act_last}}" >
+
+                            <view bindtap="switch_cx_group"
+                                  data-index="{{pidx}}"
+                                  data-gd_key="{{index}}"
+                                  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="{{pitem.act_arr}}" >
+                                  <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
+                                  <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
+                                  <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
+                                  <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</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 wx:else>
-                        <view class="bdb16" wx:if="{{pitem.is_duo_gd && pitem.act_arr.length>1 && util.check_is_last(index,items.goods_id) }}" >
-                          <view bindtap="switch_cx_group"
-                                data-index="{{pidx}}"
-                                data-gd_key="{{index}}"
-                                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="{{pitem.act_arr}}" >
-                                <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
-                                <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
-                                <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
-                                <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+                        </block>
+                        <block wx:else>
+                          <view class="bdb16" wx:if="{{pitem.is_duo_gd && pitem.act_arr.length>1 && util.check_is_last(index,items.goods_id) }}" >
+                            <view bindtap="switch_cx_group"
+                                  data-index="{{pidx}}"
+                                  data-gd_key="{{index}}"
+                                  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="{{pitem.act_arr}}" >
+                                  <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
+                                  <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
+                                  <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
+                                  <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</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>
+                        </block>
+
+                        <view class="set-mes" wx:if="{{(items.prom_type==3 || items.cj_prom_type==3) && util.check_is_last(index,items.goods_id) && pitem.is_duo_gd }}">
+                          <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{index}}"  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>
-                      </block>
 
                     </block>
-                  </block>
+            </block>
 
         </block>
 
--
libgit2 0.21.4