diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 0455e93..1c369e1 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -710,17 +710,20 @@ Page({
 					 				  
                       narr.push(t.data.data);
 					  
+					  //-- 搭配促销的门店配送方式的修复 --
+					  et=1;distr_t=0;
 					  for(var hi in narr){
 						  var dis_t=narr[hi].distr_type;
 						  if(dis_t==2){
-							  th.setData({ is_all_zt:0});
-							  break;
+							  th.setData({ is_all_zt:0});et=0;
+						  }						  
+						  if(dis_t>0){
+							  distr_t=dis_t;
 						  }
 					  }
-					  
-					  
+					  		  
                       var ie = {
-                         pickup_id: gg.pick_id, pname: gg.pick_name, goods: narr, exp_type: et, wind: m_wind, distr_t: distr_t,
+                         pickup_id: gg.pick_id, pname: gg.pick_name, goods: narr, exp_type: et, wind: m_wind, distr_t: distr_t,bn_t_exp_t: distr_t,
                          goods_price: 0, shipping_price: 0, user_money: 0, total_amount: 0, order_amount: 0, user_note:0};
                       cart_arr.push(ie);
                       th.data.old_cartlist=cart_arr;
diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml
index d962525..be8b5ca 100644
--- a/pages/goods/goodsInfo/buy_integral.wxml
+++ b/pages/goods/goodsInfo/buy_integral.wxml
@@ -81,7 +81,7 @@
 				  <view class="spec-cart-btns">					  
 				     <!-- 根本就找不到门店 -->
 				     <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
-				     	   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配{{def_pick_store.is_no_dis}}</view>		   
+				     	   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view>		   
 				     </block>	
 				 
 					 <block wx:else> 
diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml
index 4243364..9286740 100644
--- a/pages/goods/goodsInfo/buy_pt.wxml
+++ b/pages/goods/goodsInfo/buy_pt.wxml
@@ -69,6 +69,7 @@
           </view>
         </view>
 		<view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
+		<view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view>
         <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
       </view>
       <!----商品的属性项目---->
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 22d6d48..bd18414 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -2492,10 +2492,10 @@ Page({
           //---把数组组装进去---
           th.deal_pickup(em);
         }else{
-          th.setData({def_pick_store:null,all_sto:null,only_pk:null})
+          th.setData({def_pick_store:null,all_sto:null,only_pk:null,def_pickpu_list:null})
         }
       }else{
-        th.setData({def_pick_store:null,all_sto:null,only_pk:null})
+        th.setData({def_pick_store:null,all_sto:null,only_pk:null,def_pickpu_list:null})
       }
     })
   },
@@ -4424,12 +4424,12 @@ Page({
             is_gps: 1
           });
           //th.onShow();
-          th.get_sto();
+          th.get_sto(th.data.is_normal);
         },
         fail: function(res) {
           //th.onShow();
           th.data.is_get_local_ok = 1;
-          th.get_sto();
+          th.get_sto(th.data.is_normal);
           if (res.errCode == 2) {
             th.setData({
               is_gps: 0
@@ -4447,7 +4447,7 @@ Page({
       })
     }else{
       th.data.is_get_local_ok = 1;
-      th.get_sto();
+      th.get_sto(th.data.is_normal);
     }
 
     if(ind!=undefined && ind!=null ){
@@ -5076,6 +5076,7 @@ Page({
 	 
 	 //-- 积分购 --
 	 go_pay_integral:function(){
+		this.get_sto(0)
 		this.setData({openSpecModal_inte:1}); 
 	 },
 	  //-- 积分购普通购买 --
@@ -5088,7 +5089,6 @@ Page({
 		 this.setData({openSpecModal_inte:0}); 
 	 } ,
 	 closeSpecModal_inte_normal:function(){
-		 this.get_sto()
 		 this.setData({openSpecModal_inte_normal:0}); 
 	 },