wxd / MShopWeApp

Commit c33c9d8e333a406126f45bdb2fe3451b6ac54564

Authored by 后端开发-许程
1 parent cae5b07f

样式修改

Inline Side-by-side
Showing 2 changed files with 18 additions and 7 deletions
pages/goods/goodsInfo/goodsInfo.wxml
  View file @c33c9d8
... ... @@ -320,7 +320,8 @@
320 320 <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
321 321 </view>
322 322 <view class="distance fs24"wx:if="{{def_pick_store.distance!=null}}">
323   - 距离：{{filters.toFix(def_pick_store.distance,0)}}m
  323 + 距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
  324 +
324 325 </view>
325 326 </view>
326 327 <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view>
... ... @@ -791,7 +792,8 @@
791 792 <view class="flex ai_end" wx:if="{{def_pick_store}}">
792 793 <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
793 794 <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
794   - 距离:{{filters.toFix(def_pick_store.distance,0)}}m
  795 + 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
  796 +
795 797 </view>
796 798 </view>
797 799  
... ... @@ -1084,13 +1086,13 @@
1084 1086 <view class="circle xc-hooks"></view>
1085 1087 </block>
1086 1088 <view class="address-frame xc-ash">
1087   - <view class="flex-vertical-between ">
  1089 + <view class="flex-vertical-between butttem5">
1088 1090 <view class="flex xc-ash">
1089 1091 <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
1090 1092 </view>
1091 1093 <view>
1092 1094 <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
1093   - 距离:{{filters.toFix(item.distance/1000,2)}}km</view>
  1095 + 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view>
1094 1096 </view>
1095 1097 </view>
1096 1098 <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
... ... @@ -1115,7 +1117,9 @@
1115 1117 <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
1116 1118 </view>
1117 1119 <view>
1118   - <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">距离:{{filters.toFix(item.distance/1000,2)}}km</view>
  1120 + <view class="distance fs24 address-val"
  1121 + wx:if="{{item.distance!=null}}">距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}
  1122 + </view>
1119 1123 </view>
1120 1124 </view>
1121 1125 <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
... ... @@ -1141,7 +1145,7 @@
1141 1145 <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
1142 1146 </view>
1143 1147 <view>
1144   - <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}"> 距离:{{filters.toFix(item.distance/1000,2)}}km</view>
  1148 + <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>
1145 1149 </view>
1146 1150 </view>
1147 1151 <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
... ...
pages/goods/goodsInfo/goodsInfo.wxss
  View file @c33c9d8
... ... @@ -2273,7 +2273,7 @@ width: 40rpx;
2273 2273 .address{
2274 2274 width: 87%;
2275 2275 margin-top: 5rpx;
2276   -
  2276 + margin-bottom: 5rpx;
2277 2277 }
2278 2278 .distance{
2279 2279 padding-left: 15rpx;
... ... @@ -2282,6 +2282,9 @@ width: 40rpx;
2282 2282 border-radius: 20rpx;
2283 2283 margin-right: 5rpx;
2284 2284 color: #999;
  2285 + height: 38rpx;
  2286 +line-height: 38rpx;
  2287 +
2285 2288 }
2286 2289 /* 选择门店的弹窗 */
2287 2290 .mongolia-layer{
... ... @@ -2478,4 +2481,8 @@ border-radius: 55rpx;
2478 2481 }
2479 2482 .select_store_height{
2480 2483 height: 50rpx;
  2484 +}
  2485 +.butttem5{
  2486 +margin-bottom: 5rpx;
  2487 +
2481 2488 }
2482 2489 \ No newline at end of file
... ...