Commit fcf31a6bc3d020c6cf696cb1038d30dc2384c28a
1 parent
7ecb2993
团购的优化
Showing
1 changed file
with
4 additions
and
3 deletions
packageE/pages/cart/cart2/cart2.js
... | ... | @@ -1572,12 +1572,12 @@ Page({ |
1572 | 1572 | t.data.data.thi_rate = tt.data.data.thi_rate; |
1573 | 1573 | t.data.data.commission = tt.data.data.commission; |
1574 | 1574 | |
1575 | - if(e.is_order_yh){ | |
1575 | + if(tt.is_order_yh){ | |
1576 | 1576 | th.data.bn_is_order_yh=1; |
1577 | 1577 | }else{ |
1578 | 1578 | th.data.bn_is_order_yh=0; |
1579 | 1579 | } |
1580 | - if(e.is_post_temp){ | |
1580 | + if(tt.is_post_temp){ | |
1581 | 1581 | th.data.bn_is_post_temp=1; |
1582 | 1582 | }else{ |
1583 | 1583 | th.data.bn_is_post_temp=0; |
... | ... | @@ -2335,6 +2335,7 @@ Page({ |
2335 | 2335 | //--------循环计算总价----------- |
2336 | 2336 | for (var j = 0; j < item.length; j++) { |
2337 | 2337 | |
2338 | + | |
2338 | 2339 | //如果是一件代发商品,不计算运费 |
2339 | 2340 | if (item[j].whsle_id) continue; |
2340 | 2341 | //如果商品本身是包邮了 |
... | ... | @@ -2345,7 +2346,7 @@ Page({ |
2345 | 2346 | if (th.data.using_quan[pickid] && th.data.using_quan[pickid].isby == 1 && th.data.is_quan_by[pickid]) { |
2346 | 2347 | continue; |
2347 | 2348 | } |
2348 | - | |
2349 | + | |
2349 | 2350 | |
2350 | 2351 | if (back_data && back_data['is_by_all'] && item[j].is_post_temp |
2351 | 2352 | && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item[j].goods_id) == -1)) { | ... | ... |