From e2cfdfc7621cefb7c9f11a2dd37a4495f6399376 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Thu, 5 Nov 2020 14:31:09 +0800
Subject: [PATCH] 3.0小程序普通立即购买，拼团购买，再切换地址后，物流公司没有选一开始的物流公司

---
 pages/cart/cart2/cart2.js       | 11 ++++++++---
 pages/cart/cart2_pt/cart2_pt.js | 25 ++++++++++++++++---------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 7d92245..ff1e2ae 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -536,15 +536,20 @@ Page({
             case 2: et = 0; break;
           }
 		  
-		 if(th.data.bn_goods)  et=th.data.bn_exp_type
-		  
-          var m_wind=0,def_exp_code=getApp().globalData.userInfo.def_exp_code;
+		 	  
+          var m_wind=0,def_exp_code=getApp().globalData.userInfo.def_exp_code;  
           if(et==0 && def_exp_code){
                 for(var k=0;k<th.data.wu_arr.length;k++){
                     var item=th.data.wu_arr[k]; if(def_exp_code==item.code){  m_wind=k; }
                 }
           }
 		  
+		  
+		  if(th.data.bn_goods){
+		      et=th.data.bn_exp_type;
+			  m_wind=th.data.index;
+		  }  
+		  
 		  //---是不是购买等级卡成功的返回---等级卡显示的判断---
 		  var is_card_back=getApp().globalData.is_card_back;
 		  if(is_card_back){			  
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index 1391773..52adf3e 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -201,14 +201,18 @@ Page({
 					 		 th.setData({card_cut_price:cut_p});
 					 	}			  
 					 }
+					 
+					 if(th.data.bn_goods){
+					     et=th.data.bn_exp_type;
+					 }  
+					 
 					 					 
                      th.setData({
                        bn_goods: t.data.data, bn_pickname: gg.pick_name,
-                       bn_pick: gg.pick_id, bn_t_exp_t: distr_t, is_normal:1
-                     });					 
-					 if(!th.data.add_back){
-					 	th.setData({ bn_exp_type: et }) 
-					 }	
+                       bn_pick: gg.pick_id, bn_t_exp_t: distr_t, is_normal:1,bn_exp_type:et
+                     });	
+									  
+					 
 					 					 
                      th.calculatePrice2();
                }else{
@@ -241,14 +245,17 @@ Page({
                        t.data.data.prom_type = 0;
                        t.data.data.is_normal=1;
                      }
+					 
+					 if(th.data.bn_goods){
+					     et=th.data.bn_exp_type;
+					 }  
+					 
                      th.setData({
                        bn_goods: t.data.data, bn_pickname: gg.pick_name,
-                       bn_pick: gg.pick_id, bn_t_exp_t: distr_t
+                       bn_pick: gg.pick_id, bn_t_exp_t: distr_t,bn_exp_type:et
                      });
 					
-					if(!th.data.add_back){
-						th.setData({ bn_exp_type: et }) 
-					} 
+					
                      //计算价格
                      th.calculatePrice2();
                    }
--
libgit2 0.21.4