From eea1c4638b435ec8acba39a8978e4c47f05a59b4 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 19 Apr 2022 17:16:51 +0800
Subject: [PATCH] 购物车购买

---
 pages/cart/cart/cart.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index a00528d..caf9cd3 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -3069,20 +3069,21 @@ Page({
 
                              for (var i in alllist) {
                                  var list_item = alllist[i];
+                                 if(list_item.pid==list.pid) continue;
                                  for (var j in list_item.goods) {
                                      //如果赠品的ID一样，要进行统计数量
                                      if (list_item.goods[j].is_gift == 1 && list_item.goods[j].gift_id == newd.gift_id) {
                                          all_num += list_item.goods[j].goods_num;
                                      }
                                      if (list_item.goods[j].is_gift == 1 && list_item.goods[j].gift_id == newd.gift_id && list_item.goods[j].prom_id == p_item[0]) {
-                                         all_limit_num += list_item.goods[j].limit_num;
+                                         all_limit_num += list_item.goods[j].goods_num;
                                      }
 
                                  }
                              }
 
                              //-- 赠品的数量超出库存数量和会员的限制,这里是保证所有的赠品部会超出 --
-                             if (discount.gift_storecount < all_num || discount.limit_num < all_limit_num) {
+                             if (discount.gift_storecount < all_num+newd.goods_num || discount.limit_num <all_limit_num+newd.goods_num ) {
                                  no_gift_arr.push(discount.gift_id);
                                  //--进入下一个循环 --
                                  continue;
--
libgit2 0.21.4