From bb5d0c8b72c40e4ff63eb1a8e36d7065f47d7705 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 21 Feb 2024 15:27:17 +0800
Subject: [PATCH] 1、购物车点击的bug优化 2、确认订单页面的优惠促销订单参与和不参与的bug优化

---
 packageE/pages/cart/cart2/cart2.js | 13 ++++++++++---
 pages/cart/cart/cart.js            |  3 ++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 24f3232..82163db 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -2475,9 +2475,9 @@ Page({
                 newd.is_past=1;
               }
 
-              //ord_goods.splice(pos+1,0,newd);
+              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 })
 
@@ -8682,8 +8682,15 @@ Page({
       }
     }
 
+    //清理下赠品
+    let n_goods=[];
+    for (let ig = 0; ig <goods.length; ig++) {
+         if(!goods[ig].is_gift){
+           n_goods.push(goods[ig]);
+         }
+    }
     //原始数据要有深拷贝不能有地址的牵连
-    th.data.cartlist_y = JSON.parse(JSON.stringify(goods))
+    th.data.cartlist_y = JSON.parse(JSON.stringify(n_goods))
 
 
     //重新调用cart_next,进行下一步计算
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 56a6338..6495c93 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -1192,9 +1192,10 @@ Page({
     // if (this.data.btn_click) {
     //   return false;
     // }
-
     setTimeout(() => {
       if (this.data.up_dating == 1) return false;
+      this.data.up_dating=1
+
       this.data.btn_click = 1;
       var a = t.currentTarget.dataset.item;
       var b = t.currentTarget.dataset.pitems;
--
libgit2 0.21.4