Commit bb66b66f931720431fafb6802f03e0a9d6160c10
1 parent
a82319fc
订单自提还会显示物流公司 的bug
Showing
1 changed file
with
22 additions
and
21 deletions
pages/cart/cart2/cart2.js
| @@ -625,28 +625,28 @@ Page({ | @@ -625,28 +625,28 @@ Page({ | ||
| 625 | if (arr.length > 0) { | 625 | if (arr.length > 0) { |
| 626 | for (var j = 0; j < arr.length; j++) { | 626 | for (var j = 0; j < arr.length; j++) { |
| 627 | if (arr[j].pickup_id == pcid) { | 627 | if (arr[j].pickup_id == pcid) { |
| 628 | - //if(item.is_gift!=1){ | ||
| 629 | - //确定配送方式 | ||
| 630 | - if (arr[j].distr_t == 0) { | ||
| 631 | - arr[j].distr_t = car_item.distr_type; | ||
| 632 | - } | ||
| 633 | - var e_t = 0 | ||
| 634 | - switch (arr[j].distr_t) { | ||
| 635 | - case 0: | ||
| 636 | - e_t = 1; | ||
| 637 | - if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) e_t = 0; | ||
| 638 | - break; | ||
| 639 | - case 1: | ||
| 640 | - e_t = 1; | ||
| 641 | - break; | ||
| 642 | - case 2: | ||
| 643 | - e_t = 0; | ||
| 644 | - break; | 628 | + if(item.is_gift!=1){ |
| 629 | + //确定配送方式 | ||
| 630 | + if (arr[j].distr_t == 0) { | ||
| 631 | + arr[j].distr_t = car_item.distr_type; | ||
| 632 | + } | ||
| 633 | + var e_t = 0 | ||
| 634 | + switch (arr[j].distr_t) { | ||
| 635 | + case 0: | ||
| 636 | + e_t = 1; | ||
| 637 | + if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) e_t = 0; | ||
| 638 | + break; | ||
| 639 | + case 1: | ||
| 640 | + e_t = 1; | ||
| 641 | + break; | ||
| 642 | + case 2: | ||
| 643 | + e_t = 0; | ||
| 644 | + break; | ||
| 645 | + } | ||
| 646 | + arr[j].exp_type = e_t; | ||
| 647 | + if (e_t == 0) th.setData({is_all_zt: 0}); | ||
| 648 | + else if(e_t==1) th.setData({is_all_zt: 1}); | ||
| 645 | } | 649 | } |
| 646 | - arr[j].exp_type = e_t; | ||
| 647 | - if (e_t == 0) th.setData({is_all_zt: 0}); | ||
| 648 | - else if(e_t==1) th.setData({is_all_zt: 1}); | ||
| 649 | - //} | ||
| 650 | 650 | ||
| 651 | //-- 把等级卡会优惠多少钱装进去 -- | 651 | //-- 把等级卡会优惠多少钱装进去 -- |
| 652 | if (car_item.cut_price1) arr[j].card_cut_price += car_item.cut_price1; | 652 | if (car_item.cut_price1) arr[j].card_cut_price += car_item.cut_price1; |
| @@ -689,6 +689,7 @@ Page({ | @@ -689,6 +689,7 @@ Page({ | ||
| 689 | } | 689 | } |
| 690 | //如果是物流的话，全部自提的控制要弄成0 | 690 | //如果是物流的话，全部自提的控制要弄成0 |
| 691 | if (e_t == 0) th.setData({is_all_zt: 0}); | 691 | if (e_t == 0) th.setData({is_all_zt: 0}); |
| 692 | + else th.setData({is_all_zt: 1}); | ||
| 692 | 693 | ||
| 693 | var narr = new Array(); | 694 | var narr = new Array(); |
| 694 | narr.push(car_item); | 695 | narr.push(car_item); |