From 51c3bb3baeddfe51975e2656f110c9cbd6dd62c0 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 29 Jan 2021 11:05:48 +0800
Subject: [PATCH] 1.   会员没有默认门店的时候，地址会显示空的显示bug

---
 pages/goods/goodsInfo/buy_integral.wxml        | 4 ++--
 pages/goods/goodsInfo/buy_integral_normal.wxml | 4 ++--
 pages/goods/goodsInfo/goodsInfo.wxml           | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml
index a49250f..0406e25 100644
--- a/pages/goods/goodsInfo/buy_integral.wxml
+++ b/pages/goods/goodsInfo/buy_integral.wxml
@@ -26,7 +26,7 @@
 		              <!-- 选择门店模块 -->
 		               <view  class="flex-space-between address ai_end xc-width ">
 		      
-		                           <view class="flex ai_end" wx:if="{{def_pick_store}}">
+		                           <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
 		                             <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
 		                               <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
 		                                距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
@@ -53,7 +53,7 @@
 		      						 </block>				       
 		      				   </block>
 		      				   	   
-		                         <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
+		                         <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
 		               
 		      
 		              <!--商品的属性项目-->
diff --git a/pages/goods/goodsInfo/buy_integral_normal.wxml b/pages/goods/goodsInfo/buy_integral_normal.wxml
index 8bb1445..e14a36f 100644
--- a/pages/goods/goodsInfo/buy_integral_normal.wxml
+++ b/pages/goods/goodsInfo/buy_integral_normal.wxml
@@ -28,7 +28,7 @@
 		              <!-- 选择门店模块 -->
 		               <view  class="flex-space-between address ai_end xc-width ">
 		      
-		                           <view class="flex ai_end" wx:if="{{def_pick_store}}">
+		                           <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
 		                             <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
 		                               <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
 		                                距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
@@ -54,7 +54,7 @@
 		      					     	  <view wx:if="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
 		      						 </block>				       
 		      				   </block>		      				   	   
-		                       <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
+		                       <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
 		               
 		      
 		              <!--商品的属性项目-->
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 78bb381..d56de6c 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -433,7 +433,7 @@
                     </view>
                   </view>
 
-                  <view wx:if="{{def_pick_store}}">
+                  <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
                   <view  class="flex-space-between address ai_end  ">
                      <view>
                        <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
@@ -1031,7 +1031,7 @@
         <!-- 选择门店模块 -->
          <view  class="flex-space-between address ai_end xc-width ">
 
-                     <view class="flex ai_end" wx:if="{{def_pick_store}}">
+                     <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
                        <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
                          <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
                           距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
@@ -1058,7 +1058,7 @@
 						 </block>				       
 				   </block>
 				   	   
-                   <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
+                   <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
          </view>
 
        <!--商品的属性项目-->
--
libgit2 0.21.4