Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

season
2 parents 31df539e aedf9e9a
Showing 5 changed files with 44 additions and 39 deletions
components/diy_floatingBox/diy_floatingBox.wxss
components/diy_service/diy_service.wxss
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2/cart2.wxml
pages/goods/categoryList/categoryList.wxml
@@ -22,7 +22,7 @@
   z-index: 100;
   background-color: #fff;
   border: 1px solid #adadad;
-  box-shadow: 0 0 10px 2px #adadad;
+  /* box-shadow: 0 0 10px 2px #adadad; */
   display: flex;
   align-items: center;
   justify-content: center;
 .custom-service{ width: 80rpx; height: 80rpx; border-radius: 50%; background-color: #fff;z-index: 100;
-  border: 1px solid #adadad;  box-shadow: 0 0 10px 2px #adadad; line-height: 28rpx;
+  border: 1px solid #adadad;  line-height: 28rpx;
   right: 2rpx; display: flex;align-items: center;justify-content: center;}
  .cs-img{ width: 36rpx; height: 36rpx;}
@@ -1027,39 +1027,43 @@ Page({
     //-- 判断组合购是总数量是不是存在 --
     var no_zh_num={};
     //-- 多促销活动调用接口需要的参数,和商品的购买数量和活动的购买数量的请求参数 --
-    var dug_cx_arr = [];
-    //获取 限购 和 多活动的促销---2024-2-1
-    for (var i = 0; i < carr.length; i++) {
-      let item1 = carr[i];
-      //如果不是活动的时候,不是代发商品的时候,不是赠品的时候,不是阶梯商品拆分的，不是组合购拆分的
-      if([1, 2, 4, 6, 8, 9].indexOf(item1.prom_type)== -1 && !item1.whsle_id
-          && !item1.is_gift && !item1.is_ld_split && !item1.is_zh_split ){
-        //-- 快速查找,组装查询多活动的列表 --
-        let f_idx=dug_cx_arr.findIndex(function (ele) {
-          return ele.goods_id == item1.goods_id
-        });
-        if(f_idx==-1) {
-          let gd_ite={
-            goods_id:carr[i].goods_id,
-            goods_num:1,
-            is_limit_show:1,
-            is_state:0
+    if(!is_change){
+      var dug_cx_arr = [];
+      //获取 限购 和 多活动的促销---2024-2-1
+      for (var i = 0; i < carr.length; i++) {
+
+        let item1 = carr[i];
+        //如果不是活动的时候,不是代发商品的时候,不是赠品的时候,不是阶梯商品拆分的，不是组合购拆分的
+        if([1, 2, 4, 6, 8, 9].indexOf(item1.prom_type)== -1 && !item1.whsle_id
+            && !item1.is_gift && !item1.is_ld_split && !item1.is_zh_split ){
+          //-- 快速查找,组装查询多活动的列表 --
+          let f_idx=dug_cx_arr.findIndex(function (ele) {
+            return ele.goods_id == item1.goods_id
+          });
+          if(f_idx==-1) {
+            let gd_ite={
+              goods_id:carr[i].goods_id,
+              goods_num:1,
+              is_limit_show:1,
+              is_state:0
+            }
+            dug_cx_arr.push(gd_ite);
           }
-          dug_cx_arr.push(gd_ite);
+
         }
+        if(is_change){
+          carr[i].collocationList=null;
+        }
       }
-
-      if(is_change){
-        carr[i].collocationList=null;
+      //-- 对商品的多促销进行判断 ---2024-2-1--
+      if(dug_cx_arr.length){
+        await th.buy_pro_group(dug_cx_arr,carr);
       }
     }
-    //-- 对商品的多促销进行判断 ---2024-2-1--
-    if(dug_cx_arr.length){
-       await th.buy_pro_group(dug_cx_arr,carr);
-    }
+
     //在分组的时候，就不要再调用接口，await
     for (var i = 0; i < carr.length; i++) {
       var item = carr[i];
@@ -2477,9 +2481,9 @@ Page({
               ord_goods.splice(pos+1,0,newd);
               th.data.old_cartlist[i].goods.splice(pos2+1,0,newd);
-              
-              var txt9 = "cartlist[" + i + "].goods["+(pos+1)+"]";
-              th.setData({ [txt9]: newd })
+              var txt9 = "cartlist[" + i + "].goods";
+              th.setData({ [txt9]: ord_goods })
+
           }
@@ -8610,6 +8614,11 @@ Page({
   //--- 不参与优惠促销的开关 ---
   no_cj_prom: function (e) {
+    //重新调用cart_next,进行下一步计算
+    wx.showLoading({
+      title: "处理中.",
+    })
+
     this.setData({
       send_lb:{},
       month_lb:{},
@@ -8693,10 +8702,7 @@ Page({
     th.data.cartlist_y = JSON.parse(JSON.stringify(n_goods))
-    //重新调用cart_next,进行下一步计算
-    wx.showLoading({
-      title: "处理中.",
-    })
+
     this.get_cart_next(null, 1, {prom_type: 0, prom_id: 0});
@@ -122,7 +122,7 @@
                <!-- 多个活动的时候 -->
-               <block wx:if="{{item.show_can_cx[items.goods_id].act_arr.length>1}}">
+               <block wx:if="{{item.show_can_cx[items.goods_id].act_arr.length>1 && !items.is_gift}}">
                    <!-- 组合购和阶梯促销要特殊出来 -->
                    <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 }}">
@@ -210,7 +210,7 @@
                           </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 class="bdb16" wx:if="{{pitem.is_duo_gd && pitem.act_arr.length>1 && util.check_is_last(index,items.goods_id) && !items.is_gift }}" >
                             <view bindtap="switch_cx_group"
                                   data-index="{{pidx}}"
                                   data-gd_key="{{index}}"
@@ -563,7 +563,6 @@
         </view>
       </block>
-
       <block wx:if="{{collocation_goods}}">
         <!-- 搭配购买的功能实现 -->
         <view class="order-detail" wx:for="{{collocation_goods}}">
@@ -306,7 +306,7 @@
             </swiper>
           </view>
           <view class="my-container">
-            <view class="classify_name fs28 flex-space-between ai-center" data-pid="0" data-cid="{{cat_id}}" bindtap="{{(one_level_classify[select_classify_on].diy_class) ? '' :'select_more'}} ">
+            <view class="classify_name fs28 flex-space-between ai-center" data-pid="0" data-cid="{{cat_id}}" bindtap="{{(one_level_classify[select_classify_on].diy_class) ? '' :'select_more'}}">
               <view class="classify_title ellipsis-1">{{classify_name}}</view>
               <view class="flex select_more ai-center" wx:if="{{!(one_level_classify[select_classify_on].diy_class)}}">
                 <view class="red-co fs24">更多</view>
@@ -340,7 +340,7 @@
               <block wx:for="{{goodslist}}" wx:for-item="goods" wx:for-index="inds">
               <view>
-                <view class="classify_name fs28 flex-space-between ai-center" data-pid="{{goods.items.parent_id}}" data-cid="{{goods.items.id}}" bindtap="{{one_level_classify[select_classify_on][diy_class] ? '' :'select_more'}} ">
+                <view class="classify_name fs28 flex-space-between ai-center" data-pid="{{goods.items.parent_id}}" data-cid="{{goods.items.id}}" bindtap="{{one_level_classify[select_classify_on][diy_class] ? '' :'select_more'}}">
                   <view class="classify_title ellipsis-1" style="margin-left: 25rpx;">{{goods.items.name}}</view>
                   <view class="flex select_more ai-center" wx:if="{{!one_level_classify[select_classify_on].diy_class}}">