From ac9e5f465e35ef340d934dfb45f11fdb0c756343 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 8 Feb 2023 23:42:11 +0800
Subject: [PATCH] 多活动的优化

---
 packageE/pages/cart/cart2/cart2.js   |  99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 packageE/pages/cart/cart2/cart2.wxml |  10 ++++++++--
 pages/goods/goodsInfo/goodsInfo.js   |  47 ++++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 146 insertions(+), 10 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 8d92e8d..c420620 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -5967,10 +5967,50 @@ Page({
   },
 
   setexptype2: function (e) {
+
+    if(this.data.all_collocation_list){
+       var bn_coll= this.selectComponent('#bn_coll');
+       bn_coll.clear_sele();
+       this.setData({ collocation_goods: [] });
+       //让主商品的活动变成5，搭配购
+       this.setData({ 'bn_goods.prom_type': 0, 'bn_goods.prom_id': 0 });
+    }
+
     this.debounce(this.setexptype.bind(this, e), 400)();
+
   },
 
   setexptype_w2: function (e) {
+
+
+    for (let i = 0; i <this.data.cartlist ; i++) {
+        var collocationList=this.data.cartlist[i].collocationList;
+        if(collocationList){
+
+            var txt2 = 'cartlist[' + cart_index + '].collocationList';
+            for (let jy = 0; jy <collocationList.length ; jy++) {
+               collocationList[jy].selected=0;
+            }
+            th.setData({[txt2]:collocationList})
+
+
+            var bn_coll= this.selectComponent("#col"+i);
+            bn_coll.clear_sele();
+            var goods = this.data.cartlist[i].goods;
+
+            var g_arr=[];
+            for (var j = 0; j < goods.length; j++) {
+                  if(goods[j].is_collocation) continue;
+                  g_arr.push(goods[j]);
+            }
+            var txt = 'cartlist[' + cart_index + '].goods';
+
+            th.setData({ [txt]: g_arr});
+        }
+    }
+
+    this.data.old_cartlist = JSON.parse(JSON.stringify(this.data.cartlist));
+
     this.debounce(this.setexptype_w.bind(this, e), 400)();
   },
 
@@ -6394,12 +6434,40 @@ Page({
     //如果是选中
     if (e.selected) {
       var item = this.data.all_collocation_list[e.index];
+
+      //如果是自提的时候
+      if(this.data.bn_exp_type==1){
+
+        if(item.distr_type==2){
+          wx.showToast({
+            title: "商品的配送方式不一致",
+            icon: 'none',
+            duration: 2000
+          })
+          th.setData({ submit: 0 });
+          return false;
+        }
+
+      }else{
+        if(item.distr_type==1){
+          wx.showToast({
+            title: "商品的配送方式不一致",
+            icon: 'none',
+            duration: 2000
+          })
+          th.setData({ submit: 0 });
+          return false;
+        }
+      }
+
+      var bn_coll = th.selectComponent("#bn_coll"); //组件的id
+      bn_coll.set_sele(e.index);
+
       item.goods_num = 1;
       item.goods_price = item.price;
       item.is_collocation = 1;
       item.prom_type = 5;
 
-
       var coll_arr = [];
       if (this.data.collocation_goods && this.data.collocation_goods.length) {
         coll_arr = this.data.collocation_goods;
@@ -6451,6 +6519,7 @@ Page({
       }
     }
   },
+
   //购物车购买的时候，选中和不选中搭配商品
   async select_coll_buy_cart(e) {
     var th = this;
@@ -6465,6 +6534,34 @@ Page({
 
     //-- 如果是选中 --
     if (e.selected) {
+
+      var exp_type=this.data.order_prom_list_cart[cart_index].exp_type; //配送方式
+      //如果是自提的时候
+      if(exp_type==1){
+
+        if(item.distr_type==2){
+          wx.showToast({
+            title: "商品的配送方式不一致",
+            icon: 'none',
+            duration: 2000
+          })
+          return false;
+        }
+
+      }else{
+        if(item.distr_type==1){
+          wx.showToast({
+            title: "商品的配送方式不一致",
+            icon: 'none',
+            duration: 2000
+          })
+          return false;
+        }
+      }
+
+      var bn_coll = th.selectComponent("#col"+cart_index); //组件的id
+      bn_coll.set_sele(index);
+
       item.goods_num = 1;
       item.goods_price = item.price;
       item.prom_type = 5;
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index 304d3fd..d4c1764 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -109,7 +109,11 @@
         </view>
 
         <!-- 使用搭配 -->
-        <cart_collect_temp bind:childFun="select_coll" sales_rules="{{sales_rules}}" pick="{{item.pickup_id}}" is_cart="1" cart_index="{{pidx}}" distr_t="{{item.distr_t}}" appoint_pick_keyid="{{appoint_pick_keyid}}" all_collocation_list="{{item.collocationList}}" />
+        <cart_collect_temp id="col{{pidx}}"
+                bind:childFun="select_coll" sales_rules="{{sales_rules}}"
+                pick="{{item.pickup_id}}" is_cart="1" cart_index="{{pidx}}"
+                distr_t="{{item.distr_t}}"
+                appoint_pick_keyid="{{appoint_pick_keyid}}" all_collocation_list="{{item.collocationList}}" />
 
         <!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
         <view class="plus_buy fs28" wx:if="{{item.card_cut_price>0}}">
@@ -384,7 +388,9 @@
       </block>
 
       <!-- 使用搭配 -->
-      <cart_collect_temp bind:childFun="select_coll" all_collocation_list="{{all_collocation_list}}" distr_t="{{bn_goods.distr_type}}" appoint_pick_keyid="{{appoint_pick_keyid}}" sales_rules="{{sales_rules}}" pick="{{bn_pick}}" />
+      <cart_collect_temp bind:childFun="select_coll" id="bn_coll"
+                         all_collocation_list="{{all_collocation_list}}" distr_t="{{bn_goods.distr_type}}"
+                         appoint_pick_keyid="{{appoint_pick_keyid}}" sales_rules="{{sales_rules}}" pick="{{bn_pick}}" />
 
 
       <!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index d818502..cb0b817 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -2210,6 +2210,12 @@ Page({
         newd.prom_id = th.data.collocationGoods.id;
       }
 
+      //如果有搭配购的时候的时候
+      if(th.data.zh_act  && newd.prom_type==0){
+        newd.prom_type = 7;
+        newd.prom_id = th.data.zh_act.id;
+      }
+
 
       newd['pick_name'] = th.data.sto_sele_name;
       newd['pick_dis'] = th.data.sto_sele_distr;
@@ -2288,6 +2294,11 @@ Page({
           e.prom_id=th.data.data.prom_id
           e.collocation_goods=[]
         }
+
+        if(th.data.collocationGoods){
+          e.prom_type=5
+          e.prom_id=th.data.collocationGoods.id
+        }
         
         s.set_b_now(e);
         /*--
@@ -7125,12 +7136,18 @@ Page({
     } else {
       //调用接口判断订单优惠，
       getApp().request.get("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + gid + "/0" + "/" + user_id, {
-        success: function (res) {
+        success: async function (res) {
           if (res.data.code == 0 && res.data.data) {
             var r_data = res.data.data;
-            var max = 0,
-              min = 0;
+            var max = 0, min = 0;
+
 
+            //暂时积分够 不和 优惠，阶梯重叠
+            if(th.data.has_jf || th.data.zh_act){
+               r_data.collocationList=null;
+               r_data.ladderLists=null;
+               r_data.promGoodsLists=null;
+            }
 
             if (r_data.collocationList) {
               for (var i in r_data.collocationList) {
@@ -7152,7 +7169,7 @@ Page({
             if (r_data.ladderLists) {
               var act_id = r_data.ladderLists[0].form_id;
               //-- 判断会员能不能参与阶梯促销 --
-              getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}).then(res => {
+              await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}).then(res => {
                 if (res.data.code == 0 && res.data.data) {
                   var prom_content = "";
 
@@ -7161,6 +7178,10 @@ Page({
                     return false;
                   }
 
+                  if(res.data.data.good_object==1){
+                     r_data.promGoodsLists=null;
+                  }
+
                   for (let jj in r_data.ladderLists) {
                     if (r_data.ladderLists[jj].discount == 10) {
                       prom_content += "第" + (parseInt(jj) + 1) + "件原价，";
@@ -7474,7 +7495,7 @@ Page({
           let item = arr_data[i];
           //找不到活动要剔除
           if (!item.act_name) continue;
-          if ([1,2,6].indexOf(item.prom_type)==-1) continue;
+          if ([1,2,4,6].indexOf(item.prom_type)==-1) continue;
           new_arr.push(item);
         }
 
@@ -7609,6 +7630,10 @@ Page({
             return e.s_time < ut.gettimestamp() && e.prom_type==7;
           })
 
+          var arr4 = arr.filter(function (e) {
+            return e.s_time < ut.gettimestamp() && e.prom_type==4;
+          })
+
           //-- 如果只有一个活动的话 --
           if (arr.length == 1) {
             th.data.prom_type = arr[0].prom_type;
@@ -7620,6 +7645,9 @@ Page({
             th.data.prom_id = arr2[0].act_id;
           }
 
+          if(arr4.length>0){
+            th.data.has_jf=1;
+          }
 
           if(arr3 && arr3.length>0){
             //获取活动信息
@@ -7640,13 +7668,18 @@ Page({
                   }
 
                 }
+
+                //-- 调用回调 --
+                func();
               }
             });
+          }else {
+            //-- 调用回调 --
+            func();
           }
 
         }
-        //-- 调用回调 --
-        func();
+
       }
     });
   },
--
libgit2 0.21.4