diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index b4532c5..cde6347 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -2756,13 +2756,8 @@ Page({ } //商品的普通购买 ,不要进行判断 - if ((good.prom_type == 1 || good.prom_type == 6 || good.prom_type == 4) && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal) { - if (gg.prom_type != good.prom_type) { + if ((good.prom_type == 1 || good.prom_type == 2 || good.prom_type == 4 || good.prom_type == 6 || good.prom_type == 8 || good.prom_type == 9 ) && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal) { - var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买'; - th.toast(content); - return false; - } } else { if ((gg.prom_type == 1 || gg.prom_type == 3 || gg.prom_type == 5 || gg.prom_type == 6 || gg.prom_type == 4) && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 7be1032..3c8276e 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -1046,7 +1046,7 @@ Page({ var pre_arr = all_pre_goods[idx]; var prom_buy_limit = pre_arr.vip_butyqty; - if (goods.goods_num > th.data.pre_arr.presell_sumqty - th.data.pre_arr.buy_goodnum) { + if (goodsinfo.goods_num > pre_arr.presell_sumqty - pre_arr.buy_goodnum) { wx.showToast({ title: "超出活动商品库存", icon: 'none', duration: 3000 }); return false; } diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 791b22e..51e2ce4 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -843,8 +843,10 @@ Page({ } }) + if (presellList) { + if (good.goods_num > presellList.presell_sumqty - presellList.buy_goodnum) { var content = good.goods_name + '购买数量超出商品库存,请取消订单'; th.toast(content); @@ -861,7 +863,7 @@ Page({ } } - + //如果优惠促销和搭配购的时候 if ((good.prom_type == 3 || good.prom_type == 5 || good.prom_type == 10) && good.is_gift != 1 && good.is_collocation != 1) { var p_ok = 1, is_g_prom = 0; @@ -1343,7 +1345,7 @@ Page({ var pre_arr = all_pre_goods[idx]; var prom_buy_limit = pre_arr.vip_butyqty; - if (goods.goods_num > th.data.pre_arr.presell_sumqty - th.data.pre_arr.buy_goodnum) { + if (goodsinfo.goods_num > pre_arr.presell_sumqty - pre_arr.buy_goodnum) { wx.showToast({ title: "超出活动商品库存", icon: 'none', duration: 3000 }); return false; }