From 0dc48a94c1de835c1837ddec970b6dcc6321962e Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 11 Aug 2023 16:30:05 +0800
Subject: [PATCH] 组合购的bug优化

---
 packageE/pages/cart/cart2/zh_calculate.js | 8 ++++----
 pages/cart/cart/zh_calculate.js           | 4 ++--
 utils/more_cx.js                          | 4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packageE/pages/cart/cart2/zh_calculate.js b/packageE/pages/cart/cart2/zh_calculate.js
index 445bc02..2720c17 100644
--- a/packageE/pages/cart/cart2/zh_calculate.js
+++ b/packageE/pages/cart/cart2/zh_calculate.js
@@ -156,9 +156,9 @@ module.exports = {
 
                     //看一下是几倍
                     let be = parseInt(no_in_arr.length / act.zhbuyqty);
-                    //如果有总数控制的时候
+                    //如果有总数控制的时候,看还能买几组
                     if(act.zh_num){
-                        var be1=act.zh_num-act.zh_buy_num-1;
+                        var be1= parseInt((act.zh_num-act.zh_buy_num)/ act.zhbuyqty)-1;
                         if(be1<be) be=be1;
                     }
 
@@ -207,8 +207,8 @@ module.exports = {
 
                         }
                         if (!zhqty_len) {
-                            aprice += be1 * act.zhprice;
-                            let pop_num = be1 * act.zhbuyqty - delete_num;
+                            aprice += be * act.zhprice;
+                            let pop_num = be * act.zhbuyqty - delete_num;
                             for (var m = 0; m < pop_num; m++) {
                                 no_in_arr.pop();
                             }
diff --git a/pages/cart/cart/zh_calculate.js b/pages/cart/cart/zh_calculate.js
index c9eff0c..3c72a38 100644
--- a/pages/cart/cart/zh_calculate.js
+++ b/pages/cart/cart/zh_calculate.js
@@ -240,9 +240,9 @@ module.exports = {
 					var zhqty_len = 0; //几个超量倍增
 					var be = parseInt(no_in_arr.length / act.zhbuyqty); //看一下是几倍
 
-					//如果有总数控制的时候
+					//如果有总数控制的时候,看还能买几组
 					if(act.zh_num){
-						var be1=act.zh_num-act.zh_buy_num-1;
+						var be1= parseInt((act.zh_num-act.zh_buy_num)/ act.zhbuyqty)-1;
 						if(be1<be) be=be1;
 					}
 
diff --git a/utils/more_cx.js b/utils/more_cx.js
index 1cd5a22..a005e34 100644
--- a/utils/more_cx.js
+++ b/utils/more_cx.js
@@ -46,6 +46,7 @@ module.exports = {
 
         let no_in_arr = []; //剩余的未加入组合购
         let out_arr = []; //超出活动限购的商品放入
+        let zhqty_bz = []; //超量
 
         //-- 判断组合购的总数量是不是到了 --
         if(act.zh_num>0){
@@ -135,6 +136,9 @@ module.exports = {
                 all_num += item.num;
                 //当有起购数的控制的时候
                 if (item.zhqty) {
+
+                    zhqty_bz.push(item);
+
                     all_zhqty += item.zhqty;
                     if (item.num < item.zhqty) {
                         need_to_buy += item.zhqty - item.num;
--
libgit2 0.21.4