diff --git a/pages/goods/goodsInfo/buy_com_pop.wxml b/pages/goods/goodsInfo/buy_com_pop.wxml
index ec0a0b0..0018476 100644
--- a/pages/goods/goodsInfo/buy_com_pop.wxml
+++ b/pages/goods/goodsInfo/buy_com_pop.wxml
@@ -129,7 +129,7 @@
         <block wx:else>
 
 
-            <block wx:if="{{only_pk.length && !only_pk.length}}">
+            <block wx:if="{{only_pk && !only_pk.length}}">
                 <view class="spec-cart-btn fs32" data-action="add"
                       style="background-color: #dcdcdc;color: #999;">库存不足
                 </view>
diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml
index a15a554..b413b66 100644
--- a/pages/goods/goodsInfo/buy_integral.wxml
+++ b/pages/goods/goodsInfo/buy_integral.wxml
@@ -93,7 +93,7 @@
 				  		   <block wx:else>
 				  		   
 				  		 			  
-				  			  <block wx:if="{{only_pk.length && !only_pk.length}}">
+				  			  <block wx:if="{{only_pk && !only_pk.length}}">
 				  				   <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 424fc88..6046921 100644
--- a/pages/goods/goodsInfo/buy_pt.wxml
+++ b/pages/goods/goodsInfo/buy_pt.wxml
@@ -174,7 +174,7 @@
 		  		   <block wx:else>
 		  		   
 		  		 			  
-		  			  <block wx:if="{{only_pk.length && !only_pk.length}}">
+		  			  <block wx:if="{{only_pk && !only_pk.length}}">
 		  				   <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/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 25bbf40..0a5aa9d 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -3703,66 +3703,71 @@ Page({
                               def_pick_store: th.data.def_pick_store
                             })
                         }
-
                       }
 
-                      var his_cate_num = 0;
-                      for (let i in e.data.data.pageData) {
-                        let item = e.data.data.pageData[i];
-                        if (item.category_id > 0) {
-                          his_cate_num = 1;
-                        }
-                        if (getApp().is_virtual(th.data.sele_g) && th.data.sales_rules >= 2) {
-                          e.data.data.pageData[i].CanOutQty = 100000;
+                      //过滤后门店数量还是要大于0
+                      if(e.data.data.pageData.length > 0) {
+
+                        var his_cate_num = 0;
+                        for (let i in e.data.data.pageData) {
+                          let item = e.data.data.pageData[i];
+                          if (item.category_id > 0) {
+                            his_cate_num = 1;
+                          }
+                          if (getApp().is_virtual(th.data.sele_g) && th.data.sales_rules >= 2) {
+                            e.data.data.pageData[i].CanOutQty = 100000;
+                          }
                         }
-                      }
 
-                      e.his_cate_num = his_cate_num;
+                        e.his_cate_num = his_cate_num;
 
-                      if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}' &&
-                        getApp().is_virtual(th.data.sele_g) && th.data.sales_rules >= 2) {
-                        th.setData({
-                          'def_pick_store.CanOutQty': 100000
-                        })
-                      }
+                        if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}' &&
+                            getApp().is_virtual(th.data.sele_g) && th.data.sales_rules >= 2) {
+                          th.setData({
+                            'def_pick_store.CanOutQty': 100000
+                          })
+                        }
 
-                      //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
-                      if (dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store) == '{}') && th.data.bconfig && th.data.bconfig.is_sort_storage) {
-                        th.setData({
-                          def_pick_store: e.data.data.pageData[0],
-                          sto_sele_name: e.data.data.pageData[0].pickup_name,
-                          sto_sele_id: e.data.data.pageData[0].pickup_id,
-                          sto_sele_distr: e.data.data.pageData[0].distr_type
-                        });
-                        th.data.fir_def_store = e.data.data.pageData[0];
-                      }
+                        //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
+                        if (dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store) == '{}') && th.data.bconfig && th.data.bconfig.is_sort_storage) {
+                          th.setData({
+                            def_pick_store: e.data.data.pageData[0],
+                            sto_sele_name: e.data.data.pageData[0].pickup_name,
+                            sto_sele_id: e.data.data.pageData[0].pickup_id,
+                            sto_sele_distr: e.data.data.pageData[0].distr_type
+                          });
+                          th.data.fir_def_store = e.data.data.pageData[0];
+                        }
 
-                      //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 --
-                      if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}') {
-                        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); //删除
-                            break;
+                        //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 --
+                        if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}') {
+                          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); //删除
+                              break;
+                            }
                           }
+                          e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
                         }
-                        e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
-                      }
 
 
-                      th.setData({
-                        all_pick_list: e.data.data.pageData
-                      });
+                        th.setData({
+                          all_pick_list: e.data.data.pageData
+                        });
 
-                      //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购--
-                      if (!getApp().is_virtual(th.data.sele_g) && th.data.sales_rules >= 2 && !th.data.is_newsales_rules
-                          && !th.data.sele_g.whsle_id && ([1, 2, 4, 6, 8, 9].indexOf(th.data.prom_type) == -1 || is_normal == 1)) {
-                        setTimeout(function () {
-                          th.deal_pickup_dline(e);
-                        }, 800)
-                      } else {
-                        setTimeout(function () {
-                          th.deal_pickup(e); //--普通门店排版--
-                        }, 800)
+                        //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购--
+                        if (!getApp().is_virtual(th.data.sele_g) && th.data.sales_rules >= 2 && !th.data.is_newsales_rules
+                            && !th.data.sele_g.whsle_id && ([1, 2, 4, 6, 8, 9].indexOf(th.data.prom_type) == -1 || is_normal == 1)) {
+                          setTimeout(function () {
+                            th.deal_pickup_dline(e);
+                          }, 800)
+                        } else {
+                          setTimeout(function () {
+                            th.deal_pickup(e); //--普通门店排版--
+                          }, 800)
+                        }
+                      }else{
+                        wx.hideLoading();
                       }
                     } else {
                       wx.hideLoading();
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 956e0c9..4a8445f 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -1426,7 +1426,7 @@
           </view>
         </block>
         <block wx:else>
-          <block wx:if="{{only_pk.length && !only_pk.length}}">
+          <block wx:if="{{only_pk && !only_pk.length}}">
             <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
               库存不足
             </view>