diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 48812e7..811cd1f 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -257,28 +257,7 @@ Page({
           supportPageScroll: !0
         });
 
-        if(e.is_sort_storage){
-          wx.getLocation({
-            type: 'wgs84',
-            success: function (res) {
-              th.data.lat=res.latitude;
-              th.data.lon=res.longitude;
-              th.data.is_get_local_ok=1;
-            },
-            fail: function (res) {
-             
-              if (res.errCode == 2) {
-                th.setData({ is_gps: 0 });
-              } else {
-                th.setData({ is_gps: "3" });
-              }
-         
-              th.data.is_get_local_ok=1;
-            }
-          })
-        }else{
-          th.data.is_get_local_ok=1;
-        }
+        
 
     })
 
@@ -303,6 +282,32 @@ Page({
         },500)
 
     })
+
+    if (e.is_sort_storage) {
+      wx.getLocation({
+        type: 'wgs84',
+        success: function (res) {
+          th.data.lat = res.latitude;
+          th.data.lon = res.longitude;
+          th.data.is_get_local_ok = 1;
+        },
+        fail: function (res) {
+          if (res.errCode == 2) {
+            th.setData({ is_gps: 0 });
+            if (th.data.is_gps == 0) {
+              s.showWarning("请开启GPS定位", null, 3800000, !1);
+            }
+           
+          } else {
+            th.setData({ is_gps: "3" });
+          }
+
+          th.data.is_get_local_ok = 1;
+        }
+      })
+    } else {
+      th.data.is_get_local_ok = 1;
+    }
     
   },
 
@@ -2687,6 +2692,7 @@ Page({
         tt();
       },
       fail: function (res) {
+
         ee.data.share_goods_img= "../../../images/share/default_g_img.gif";  //分享的图片不能用网络的
         tt();
       }
@@ -2745,6 +2751,9 @@ Page({
  choice_store:function(ee){
    var th=this;
    var ind=ee.currentTarget.dataset.ind;
+   var bconfig = th.data.bconfig;
+   console.log("男士水水水水水", bconfig);
+   if (bconfig.is_sort_storage){
    wx.getLocation({
      type: 'wgs84',
      success: function (res) {
@@ -2760,7 +2769,7 @@ Page({
        if (res.errCode == 2) {
          th.setData({ is_gps: 0 });
          if (th.data.is_gps == 0) {
-           s.showWarning("请开启GPS定位", null, 1000, !1);
+           s.showWarning("请开启GPS定位", null, 25000, !1);
          }
        } else {
          th.setData({ is_gps: "3" });
@@ -2769,7 +2778,7 @@ Page({
        th.data.is_get_local_ok = 1;
      }
    })
-  
+   }
    this.setData({
      open_ind_store: ind,
      store:1,
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index ffaa03f..b11c4dd 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -320,7 +320,7 @@
                        <text class="fs32 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
                     
                      </view>
-                     <view class="distance fs20">
+                     <view class="distance fs20"wx:if="{{def_pick_store.distance!=null}}">
                       距离:{{filters.toFix(def_pick_store.distance,0)}}m
                      </view>
                   </view>
@@ -782,7 +782,7 @@
 
                      <view class="flex ai_end" wx:if="{{def_pick_store}}">
                        <text class="fs28 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
-                         <view class="distance fs20 xc-ash">
+                         <view class="distance fs20 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
                           距离:{{filters.toFix(def_pick_store.distance,0)}}m
                           </view>
                      </view>
@@ -1087,7 +1087,7 @@
                        <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
                    </view>
                   <view>
-                    <view class="distance fs20 address-val">距离:{{filters.toFix(item.distance,0)}}m</view>
+                    <view class="distance fs20 address-val"wx:if="{{item.distance!=null}}">距离:{{filters.toFix(item.distance,0)}}m</view>
                   </view>
               </view>
               <view class="fs20">地址:{{item.fulladdress}}</view>
@@ -1112,7 +1112,7 @@
                        <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
                      </view>
                      <view>
-                       <view class="distance fs20 address-val">距离:{{filters.toFix(item.distance,0)}}m</view>
+                       <view class="distance fs20 address-val"wx:if="{{item.distance!=null}}">距离:{{filters.toFix(item.distance,0)}}m</view>
                      </view>
                    </view>
                    <view class="fs20">地址:{{item.fulladdress}}</view>
@@ -1138,7 +1138,7 @@
                           <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
                         </view>
                         <view>
-                          <view class="distance fs20 address-val">距离:{{filters.toFix(item.distance,0)}}m</view>
+                          <view class="distance fs20 address-val"wx:if="{{item.distance!=null}}">距离:{{filters.toFix(item.distance,0)}}m</view>
                         </view>
                       </view>
                       <view class="fs20">地址:{{item.fulladdress}}</view>