diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index acfe1d7..8a9bf21 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -4556,7 +4556,11 @@ Page({
           var th = this;
           var ind = parseInt(e.currentTarget.dataset.ind);
 
-          th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)});
+          if(th.data.front_pick && th.data.front_pick.pickup_id){
+             th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)});
+          }
+
+
 
           //ind == 1是普通购买
           if (ind == 1) {
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 2755d5d..aca01f4 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -293,6 +293,8 @@ Page({
 
         fir_set_sto:1,     //最初始的一下，获取门店
         front_pick:null,  //在详情页面上显示的门店
+
+        get_sto_ing:1,  //默认是不让弹出框的
       },
 
       //------初始化加载----------
@@ -2776,7 +2778,9 @@ Page({
               return false;
             }
 
-            th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)});
+            if(th.data.front_pick && th.data.front_pick.pickup_id>0 ){
+              th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)});
+            }
 
             this.setData({
               store: 0,
@@ -5524,7 +5528,7 @@ Page({
                       //如果是拼单活动的普通购买
                       if (ind == 1) {
 
-                        if(th.data.front_pick){
+                        if(th.data.front_pick && th.data.front_pick.pickup_id){
                           th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)});
                         }else if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){  //要把不匹配还原
                           th.data.def_pick_store.is_no_dis_nor=0;
@@ -8605,7 +8609,7 @@ Page({
                               this.data.g_buy_num = new Map();
                               var th = this;
 
-                              if(th.data.front_pick){
+                              if(th.data.front_pick && th.data.front_pick.pickup_id){
                                 th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)});
                               }else if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){    //要把不匹配还原
                                 th.data.def_pick_store.is_no_dis_nor=0;