Commit a52a11ba9a5204ddaac597770c8c9ab9c8e80458
1 parent
878718aa
因为赠品,物流和自选,自提和自选的没有办法同时选
Showing
1 changed file
with
3 additions
and
0 deletions
pages/cart/cart/cart.js
... | ... | @@ -404,6 +404,7 @@ Page({ |
404 | 404 | iarr = item; |
405 | 405 | if (!sele && item.length > 0) { |
406 | 406 | for (var i = 0; i < iarr.length; i++) { |
407 | + if(iarr[i].is_gift==1) continue; | |
407 | 408 | if (iarr[i].distr_type != 0) { |
408 | 409 | if (fir == 0) { |
409 | 410 | fir = iarr[i].distr_type; |
... | ... | @@ -452,6 +453,8 @@ Page({ |
452 | 453 | //当数量大于1,且是选择的时候 |
453 | 454 | if (iarr.length > 1 && !a.selected) { |
454 | 455 | for (var i = 0; i < iarr.length; i++) { |
456 | + if(iarr[i].is_gift==1) continue; | |
457 | + | |
455 | 458 | //---当不是本身选择项目---- |
456 | 459 | var sel = iarr[i].selected; |
457 | 460 | if (iarr[i].distr_type != 0 && (sel || iarr[i].id == a.id)) { | ... | ... |