订单自提还会显示物流公司的bug

yvan.ni
1 parent a82319fc
Showing 1 changed file with 22 additions and 21 deletions
pages/cart/cart2/cart2.js
@@ -625,28 +625,28 @@ Page({
                     if (arr.length > 0) {
                         for (var j = 0; j < arr.length; j++) {
                             if (arr[j].pickup_id == pcid) {
-                                //if(item.is_gift!=1){
-                                //确定配送方式
-                                if (arr[j].distr_t == 0) {
-                                    arr[j].distr_t = car_item.distr_type;
-                                }
-                                var e_t = 0
-                                switch (arr[j].distr_t) {
-                                    case 0:
-                                        e_t = 1;
-                                        if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) e_t = 0;
-                                        break;
-                                    case 1:
-                                        e_t = 1;
-                                        break;
-                                    case 2:
-                                        e_t = 0;
-                                        break;
+                                if(item.is_gift!=1){
+                                    //确定配送方式
+                                    if (arr[j].distr_t == 0) {
+                                        arr[j].distr_t = car_item.distr_type;
+                                    }
+                                    var e_t = 0
+                                    switch (arr[j].distr_t) {
+                                        case 0:
+                                            e_t = 1;
+                                            if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) e_t = 0;
+                                            break;
+                                        case 1:
+                                            e_t = 1;
+                                            break;
+                                        case 2:
+                                            e_t = 0;
+                                            break;
+                                    }
+                                    arr[j].exp_type = e_t;
+                                    if (e_t == 0) th.setData({is_all_zt: 0});
+                                    else if(e_t==1) th.setData({is_all_zt: 1});
                                 }
-                                arr[j].exp_type = e_t;
-                                if (e_t == 0) th.setData({is_all_zt: 0});
-                                else if(e_t==1) th.setData({is_all_zt: 1});
-                                //}
  
                                 //-- 把等级卡会优惠多少钱装进去 --
                                 if (car_item.cut_price1) arr[j].card_cut_price += car_item.cut_price1;
@@ -689,6 +689,7 @@ Page({
                         }
                         //如果是物流的话，全部自提的控制要弄成0
                         if (e_t == 0) th.setData({is_all_zt: 0});
+                        else  th.setData({is_all_zt: 1});
  
                         var narr = new Array();
                         narr.push(car_item);