From 249f0fa73dbefe7eb7d36c588cadcb40b0fa66b0 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Fri, 8 Sep 2023 20:32:14 +0800 Subject: [PATCH] 1、 单赠品 赠品限购的bug优化 --- packageE/pages/cart/cart2/cart2.js | 4 ++-- pages/cart/cart/cart.js | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index f6f64ba..0a121ad 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -2329,9 +2329,9 @@ Page({ var other_gift=0; other_gift=th.get_other_gift(c_arr,get_data.gift_id,pickid); - //------end------- + //------end------- ,因为增加了限购数量不限的情况 if (get_data.gift_id && parseInt(get_data.zp_mode) != 1 - && get_data.zp_num * item_map.bs <= get_data.limit_num-other_gift + && (get_data.zp_num * item_map.bs <= get_data.limit_num-other_gift || !get_data.limit_num) && get_data.zp_num * item_map.bs <= get_data.gift_storecount && get_data.zp_num>get_data.must_num //增加一个超量 ) { diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 4878549..c9b3a3e 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -4254,7 +4254,7 @@ Page({ } else { //---如果有打折的信息，赠送的信息,赠送的时候要判断是不是限购数量--- - if (discount && discount['goods_id'] && discount.limit_num >= discount.bs * discount.zp_num && + if (discount && discount['goods_id'] && (!discount.limit_num || discount.limit_num >= discount.bs * discount.zp_num) && discount.gift_storecount >= discount.bs * discount.zp_num) { //如果这礼品超了情况下 if (no_gift_arr.indexOf(discount.gift_id) != -1) continue; @@ -4302,7 +4302,7 @@ Page({ } //-- 赠品的数量超出库存数量和会员的限制,这里是保证所有的赠品部会超出 -- - if (discount.gift_storecount < all_num + newd.goods_num || discount.limit_num < all_limit_num + newd.goods_num) { + if (discount.gift_storecount < all_num + newd.goods_num || (discount.limit_num && discount.limit_num < all_limit_num + newd.goods_num)) { no_gift_arr.push(discount.gift_id); //--进入下一个循环 -- continue; @@ -4582,8 +4582,8 @@ Page({ } } else { - //---如果有打折的信息，赠送的信息,赠送的时候要判断是不是限购数量--- - if (discount && discount['goods_id'] && discount.limit_num >= discount.bs * discount.zp_num && + //---如果有打折的信息，赠送的信息,赠送的时候要判断是不是限购数量,因为增加了限购数量不限的情况--- + if (discount && discount['goods_id'] && (!discount.limit_num || discount.limit_num >= discount.bs * discount.zp_num) && discount.gift_storecount >= discount.bs * discount.zp_num) { //如果这礼品超了情况下 if (no_gift_arr.indexOf(discount.gift_id) != -1) continue; @@ -4631,7 +4631,7 @@ Page({ } //-- 赠品的数量超出库存数量和会员的限制,这里是保证所有的赠品部会超出 -- - if (discount.gift_storecount < all_num + newd.goods_num || discount.limit_num < all_limit_num + newd.goods_num) { + if (discount.gift_storecount < all_num + newd.goods_num || (discount.limit_num && discount.limit_num < all_limit_num + newd.goods_num)) { no_gift_arr.push(discount.gift_id); //--进入下一个循环 -- continue; -- libgit2 0.21.4