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 @@ {{def_pick_store.pickup_name}} - 距离:{{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"}} + 地址:{{def_pick_store.fulladdress}} @@ -791,7 +792,8 @@ {{def_pick_store.pickup_name}} - 距离:{{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"}} + @@ -1084,13 +1086,13 @@ - + {{item.pickup_name}} - 距离:{{filters.toFix(item.distance/1000,2)}}km + 距离:{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}} 地址:{{item.fulladdress}} @@ -1115,7 +1117,9 @@ {{item.pickup_name}} - 距离:{{filters.toFix(item.distance/1000,2)}}km + 距离:{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}} + 地址:{{item.fulladdress}} @@ -1141,7 +1145,7 @@ {{item.pickup_name}} - 距离:{{filters.toFix(item.distance/1000,2)}}km + 距离:{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}} 地址:{{item.fulladdress}} 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