From 9fd07d315426bd26efc3a9903db5b3d812d07226 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 17 Jun 2023 17:36:44 +0800
Subject: [PATCH] 商品详情页面  如果是距离的时候，距离的线上优化

---
 packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml          | 2 +-
 packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml            | 4 ++--
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml | 2 +-
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss | 4 ++++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
index fd5a138..3e9a044 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
@@ -667,7 +667,7 @@
 								</block>
 								<view class="address-frame xc-ash">
 									<view class="flex-vertical-between butttem5">
-										<view class="flex xc-ash" style="flex-shrink:0;max-width: 69%;" >
+										<view class="flex xc-ash" style="flex-shrink:0;max-width: 62%;" >
 											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}
 												<block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
 													<text class="no_store">(配送不匹配)</text>
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
index 15fa211..c284941 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
@@ -48,8 +48,8 @@
       <view style="margin-top: 20rpx">
         <view  class="flex-space-between address ai_end xc-width ">
 
-          <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="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+            <text class="fs30 xc-black3 shop_name {{def_pick_store.distance!=null?'max':''}} ">{{def_pick_store.pickup_name}}</text>
 			
 			
             <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index 5ec27fe..ac7efef 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -1354,7 +1354,7 @@
                 </block>
                 <view class="address-frame xc-ash">
                   <view class="flex-vertical-between butttem5">
-                    <view class="flex xc-ash">
+                    <view class="flex xc-ash" style="flex-shrink:0;max-width: 62%;">
                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
                     </view>
                     <view>
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
index 7d49f88..d7eb219 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
@@ -3116,3 +3116,7 @@ button.custom-service::after{
  	overflow-y: auto;
  }
 
+.shop_name.max{
+    max-width:370rpx; flex-shrink: 0;
+}
+
--
libgit2 0.21.4