Commit 68aecbdd421796b746823c67d07593d1138a43d2
1 parent
db7bbb21
赠品包邮的优化
Showing
1 changed file
with
8 additions
and
4 deletions
packageE/pages/cart/cart2/cart2.js
... | ... | @@ -2526,16 +2526,20 @@ Page({ |
2526 | 2526 | }, |
2527 | 2527 | |
2528 | 2528 | //寻找活动在列表中的最后一个 |
2529 | - is_has_gift(ord_goods, prom_id) { | |
2529 | + is_has_gift(ord_goods, prom_id,get_data) { | |
2530 | 2530 | if (!ord_goods || ord_goods.length == 0) return false; |
2531 | 2531 | var len = ord_goods.length; |
2532 | + var is_ck=false; | |
2532 | 2533 | for (var i = 0; i < len; i++) { |
2533 | 2534 | var e = ord_goods[i]; |
2534 | 2535 | if (e.prom_type == 3 && e.prom_id == prom_id && e.is_gift == 1) { |
2535 | - return true; | |
2536 | + if(get_data.zp_by>0){ | |
2537 | + ord_goods[i].is_past=1; | |
2538 | + } | |
2539 | + is_ck=true; | |
2536 | 2540 | } |
2537 | 2541 | } |
2538 | - return false; | |
2542 | + return is_ck; | |
2539 | 2543 | }, |
2540 | 2544 | |
2541 | 2545 | |
... | ... | @@ -2550,7 +2554,7 @@ Page({ |
2550 | 2554 | cart_add_gift(item_map, pickid, i, ord_goods, get_data) { |
2551 | 2555 | |
2552 | 2556 | var th = this; |
2553 | - var is_has_gift = this.is_has_gift(ord_goods, item_map.prom_id) | |
2557 | + var is_has_gift = this.is_has_gift(ord_goods, item_map.prom_id,get_data) | |
2554 | 2558 | |
2555 | 2559 | //-- 没有赠品的时候才添加,避免购物车重复出现 -- |
2556 | 2560 | if (!is_has_gift) { | ... | ... |