diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 8d9504e..f762957 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -8254,13 +8254,13 @@ Page({ buyed=zbuy.data.data.userbuynum; } if (zh['zh_num'] > 0 && zh['zh_buy_num'] + num0 > zh['zh_num']) { - func({'code': -1, 'msg': '超出组合购活动总数量'}); - return false; + //func({'code': -1, 'msg': '超出组合购活动总数量'}); + //return false; } if (zh && zh['buy_limit'] > 0 && num0+buyed > zh['buy_limit']) { - func({'code': -1, 'msg': '超出超出组合购活动的限购'}); - return false; + //func({'code': -1, 'msg': '超出超出组合购活动的限购'}); + //return false; } } @@ -8292,8 +8292,8 @@ Page({ return e.goods_id == gid; }) if (gdlist['buyqty'] > 0 && num1 + promgoodsbuynum > gdlist['buyqty']) { - func({'code': -1, 'msg': '超出组合购商品的限购'}); - return false; + //func({'code': -1, 'msg': '超出组合购商品的限购'}); + //return false; } } } diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 75c72b6..453aee9 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -3488,7 +3488,7 @@ Page({ console.log('活动次数:' + userbuynum); - if(userbuynum >= i_arr[j].act.zh_num && i_arr[j].act.zh_num>0){ + if(0 >= i_arr[j].act.zh_num-i_arr[j].act.zh_buy_num && i_arr[j].act.zh_num>0){ i_arr[j].out_all_num=1; checkArr7.push(i_arr[j]) }else if (userbuynum >= i_arr[j].act.buy_limit && i_arr[j].act.buy_limit>0) {