diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index df742b9..2d3e58e 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -365,10 +365,19 @@ Page({
 
     //获取用户的默认门店
     getApp().get_user_store(function(ee) {
+      
       if(!ee) {
         th.data.fir_def_store={}; //赋值空对象
         return false;
       }
+      var g_distr_type=th.data.data.distr_type;
+
+      //--如果默认门店的配送方式不对，就不能被选择--
+      if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){
+        th.data.fir_def_store={}; //赋值空对象
+        return false;
+      }
+
 	  var appd=getApp().globalData;
       var w_time = setInterval(function() {
         if (that.data.is_get_local_ok == 0) return false;
@@ -1708,7 +1717,7 @@ Page({
       if (th.data.is_get_local_ok == 0) return false;
       var dd = null,
         i = getApp().request;
-      var g_distr_type = th.data.data.distr_type;
+      var g_distr_type = th.data.sele_g.distr_type;
       if (g_distr_type != 0) {
         dd = {
           store_id: o.stoid,
@@ -1729,6 +1738,12 @@ Page({
         dd.lon = th.data.lon;
       }
       clearInterval(timer_get);
+
+      if(th.data.def_pick_store && g_distr_type!=0 && th.data.def_pick_store.distr_type!=0 && th.data.def_pick_store.distr_type!=g_distr_type ){
+         th.setData({def_pick_store:null});
+      }
+
+
       //----------获取门店----------------
       getApp().request.promiseGet("/api/weshop/pickup/list", {
         data: dd,
@@ -1748,7 +1763,7 @@ Page({
           }
 
           //-- 如果有默认选择门店的时候，要把默认门店放在第一位 --
-          if (th.data.def_pick_store) {
+          if (th.data.def_pick_store && (th.data.def_pick_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type )){
             for (var k = 0; k < e.data.data.pageData.length; k++) {
               if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
                 e.data.data.pageData.splice(k, 1); //删除
@@ -1780,6 +1795,9 @@ Page({
   //------------处理门店---------------
   deal_pickup(e){
 	  var th=this;
+
+	  var g_distr_type=th.data.sele_g.distr_type;
+
 	  //单总量超出5个的时候
 	  if (e.data.data.total > 5) {
 	     getApp().request.get("/api/weshop/storagecategory/page", {
@@ -1883,8 +1901,8 @@ Page({
 	               });
 	              //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
 	              if (!th.data.def_pick_store) {
-	              th.setData({def_pick_store:e.data.data.pageData[0]})
-	            }
+	                 th.setData({def_pick_store:e.data.data.pageData[0]})
+	              }
 	          }
 	        } else {
 	          th.setData({
@@ -1914,7 +1932,6 @@ Page({
 	      })
 	    }
 	}
-	    
   },
   //------------处理线下门店库存--------
   deal_pickup_dline(e){
@@ -1931,7 +1948,9 @@ Page({
 	  var o_plist=e.data.data.pageData;
 	  var new_list=[];
 	  var is_find_def_store=0;
-	  
+
+
+	  var g_distr_type=th.data.sele_g.distr_type;
 	  var lock=[];
 	  //先读取门店的lock,采用链式写法，少用await
 	  getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
@@ -1962,8 +1981,8 @@ Page({
 									   if(n_item.CanOutQty>lock_num){									   
 										   o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num;														 
 										   new_list.push(o_plist[kk]);  
-										   //如果找到默认门店
-										   if(th.data.fir_def_store && n_item.StorageNo==th.data.fir_def_store.pickup_no){
+										   //--如果找到默认门店,同时也应该判断配送方式对不对--
+										   if(th.data.fir_def_store && n_item.StorageNo==th.data.fir_def_store.pickup_no  &&  (g_distr_type==0 ||  th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){
 											   th.data.fir_def_store.CanOutQty=n_item.CanOutQty-lock_num;												   
 											   if(def_pick_store.pickup_id==th.data.fir_def_store.pickup_id)
 											        th.setData({def_pick_store:th.data.fir_def_store})											   
@@ -1978,9 +1997,10 @@ Page({
 						//数据组装下
 						var em={};em.data={};em.data.data={};
 						em.data.data.total=new_list.length;
-						em.data.data.pageData=new_list;																														
-						
-						if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id){
+						em.data.data.pageData=new_list;
+
+                        //--如果找到默认门店,同时也应该判断配送方式对不对--
+						if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id  &&  (g_distr_type==0 || th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){
 							  th.data.fir_def_store.CanOutQty=0;							  
 							  //--当选择的门店是客户默认的门店的时候--
 							  if(th.data.def_pick_store && th.data.fir_def_store.pickup_id==th.data.def_pick_store.pickup_id)	{