From c33c9d8e333a406126f45bdb2fe3451b6ac54564 Mon Sep 17 00:00:00 2001
From: cheng.xu <cheng.xu@meidd.com>
Date: Wed, 25 Sep 2019 18:51:12 +0800
Subject: [PATCH] 样式修改

---
 pages/goods/goodsInfo/goodsInfo.wxml | 16 ++++++++++------
 pages/goods/goodsInfo/goodsInfo.wxss |  9 ++++++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 08e5eb4..9355b84 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -320,7 +320,8 @@
                        <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
                      </view>
                      <view class="distance fs24"wx:if="{{def_pick_store.distance!=null}}">
-                      距离：{{filters.toFix(def_pick_store.distance,0)}}m
+                      距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+                     
                      </view>
                   </view>
                   <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view>
@@ -791,7 +792,8 @@
                      <view class="flex ai_end" wx:if="{{def_pick_store}}">
                        <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}}">
-                          距离:{{filters.toFix(def_pick_store.distance,0)}}m
+                          距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+                         
                           </view>
                      </view>
 
@@ -1084,13 +1086,13 @@
                <view class="circle  xc-hooks"></view>
              </block>
                 <view class="address-frame xc-ash">
-              <view class="flex-vertical-between ">
+              <view class="flex-vertical-between butttem5">
                   <view class="flex xc-ash">
                        <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
                    </view>
                   <view>
                     <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
-                    距离:{{filters.toFix(item.distance/1000,2)}}km</view>
+                    距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view>
                   </view>
               </view>
               <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
@@ -1115,7 +1117,9 @@
                        <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
                      </view>
                      <view>
-                       <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">距离:{{filters.toFix(item.distance/1000,2)}}km</view>
+                       <view class="distance fs24 address-val"
+                       wx:if="{{item.distance!=null}}">距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}
+                     </view>
                      </view>
                    </view>
                    <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
@@ -1141,7 +1145,7 @@
                           <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
                         </view>
                         <view>
-                          <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">                         距离:{{filters.toFix(item.distance/1000,2)}}km</view>
+                          <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">                         距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
                         </view>
                       </view>
                       <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index eae9bea..239a44a 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -2273,7 +2273,7 @@ width: 40rpx;
 .address{
   width: 87%;
   margin-top: 5rpx;
-
+  margin-bottom: 5rpx;
 }
 .distance{
   padding-left: 15rpx;
@@ -2282,6 +2282,9 @@ width: 40rpx;
   border-radius: 20rpx;
   margin-right: 5rpx;
   color: #999;
+  height: 38rpx;
+line-height: 38rpx;
+
 }
 /* 选择门店的弹窗 */
 .mongolia-layer{
@@ -2478,4 +2481,8 @@ border-radius: 55rpx;
 }
 .select_store_height{
   height: 50rpx;
+}
+.butttem5{
+margin-bottom: 5rpx;
+
 }
\ No newline at end of file
--
libgit2 0.21.4