Commit b0cec5a29a51c08d9bdfaf2765a82efd0418662e
1 parent
0eefb76e
判断优惠促销的商品限购数量
Showing
2 changed files
with
30 additions
and
2 deletions
pages/user/order_detail/order_detail.js
| ... | ... | @@ -450,7 +450,7 @@ Page({ |
| 450 | 450 | }) |
| 451 | 451 | |
| 452 | 452 | //-- 要进行判断指定门店的判断优化,先做普通商品 -- |
| 453 | - if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids){ | |
| 453 | + if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids && !good.is_gift){ | |
| 454 | 454 | var idx0=gg.pick_up_lists.findIndex(function (e){ |
| 455 | 455 | return e.pickup_id==order.pickup_id; |
| 456 | 456 | }) |
| ... | ... | @@ -655,7 +655,19 @@ Page({ |
| 655 | 655 | var content = good.goods_name + '未找到活动,请取消订单重新购买'; |
| 656 | 656 | th.toast(content); |
| 657 | 657 | p_ok = 0; |
| 658 | + }else if(r_data.promGoodsLists && good.prom_type == 3){ | |
| 659 | + var fir_act = r_data.promGoodsLists[0]; | |
| 660 | + //如果是有限购的时候 | |
| 661 | + if (fir_act.gd_limit_num>0){ | |
| 662 | + if(promgoodsbuynum+good.goods_num > fir_act.gd_limit_num){ | |
| 663 | + var content = good.goods_name + '超出优惠促销活动商品限购,请取消订单重新购买'; | |
| 664 | + th.toast(content) | |
| 665 | + p_ok = 0; | |
| 666 | + } | |
| 667 | + } | |
| 668 | + | |
| 658 | 669 | } |
| 670 | + | |
| 659 | 671 | if (!r_data.ladderLists && good.prom_type == 10) { |
| 660 | 672 | var content = good.goods_name + '未找到活动,请取消订单重新购买'; |
| 661 | 673 | th.toast(content); | ... | ... |
pages/user/order_list/order_list.js
| ... | ... | @@ -764,7 +764,7 @@ Page({ |
| 764 | 764 | }) |
| 765 | 765 | |
| 766 | 766 | //-- 要进行判断指定门店的判断优化,先做普通商品 -- |
| 767 | - if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids){ | |
| 767 | + if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids && !good.is_gift){ | |
| 768 | 768 | var idx0=gg.pick_up_lists.findIndex(function (e){ |
| 769 | 769 | return e.pickup_id==order.pickup_id; |
| 770 | 770 | }) |
| ... | ... | @@ -966,16 +966,32 @@ Page({ |
| 966 | 966 | th.toast(content) |
| 967 | 967 | p_ok = 0; |
| 968 | 968 | } |
| 969 | + | |
| 969 | 970 | if (!r_data.promGoodsLists && good.prom_type == 3) { |
| 970 | 971 | var content = good.goods_name + '未找到活动,请取消订单重新购买'; |
| 971 | 972 | th.toast(content); |
| 972 | 973 | p_ok = 0; |
| 974 | + }else if(r_data.promGoodsLists && good.prom_type == 3){ | |
| 975 | + var fir_act = r_data.promGoodsLists[0]; | |
| 976 | + //如果是有限购的时候 | |
| 977 | + if (fir_act.gd_limit_num>0){ | |
| 978 | + if(promgoodsbuynum+good.goods_num > fir_act.gd_limit_num){ | |
| 979 | + var content = good.goods_name + '超出优惠促销活动商品限购,请取消订单重新购买'; | |
| 980 | + th.toast(content) | |
| 981 | + p_ok = 0; | |
| 982 | + } | |
| 983 | + } | |
| 984 | + | |
| 973 | 985 | } |
| 986 | + | |
| 974 | 987 | if (!r_data.ladderLists && good.prom_type == 10) { |
| 975 | 988 | var content = good.goods_name + '未找到活动,请取消订单重新购买'; |
| 976 | 989 | th.toast(content); |
| 977 | 990 | p_ok = 0; |
| 978 | 991 | } |
| 992 | + | |
| 993 | + | |
| 994 | + | |
| 979 | 995 | } else { |
| 980 | 996 | |
| 981 | 997 | var content = good.goods_name + '未找到活动,请取消订单重新购买' | ... | ... |