Commit eb90e544a73289ac83b0aa6679ee20bcabaa86b8

Authored by yvan.ni
1 parent 7df24b59

选择门店的优化

pages/goods/goodsInfo/goodsInfo.wxml
@@ -1100,6 +1100,7 @@ @@ -1100,6 +1100,7 @@
1100 <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> 1100 <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
1101 <view>客服</view> 1101 <view>客服</view>
1102 </view> --> 1102 </view> -->
  1103 +
1103 1104
1104 <view class="custom-service cart-ico new_split" bindtap="openCS"> 1105 <view class="custom-service cart-ico new_split" bindtap="openCS">
1105 <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> 1106 <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
@@ -1430,6 +1431,39 @@ @@ -1430,6 +1431,39 @@
1430 </block> 1431 </block>
1431 </view> 1432 </view>
1432 1433
  1434 + <!-- 选择门店模块 -->
  1435 + <view class="flex-space-between address ai_end xc-width ">
  1436 + <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
  1437 + <text class="fs30 xc-black3 shop_name bold {{def_pick_store.distance!=null?'max':''}} ">{{def_pick_store.pickup_name}}</text>
  1438 + <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">
  1439 + 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
  1440 + </view>
  1441 + </view>
  1442 + <!-- 没有门店的时候 -->
  1443 + <view class="flex" bindtap="choice_store" wx:else>
  1444 + <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
  1445 + <view class="fs30" style="color:black;">选择门店</view>
  1446 + </view>
  1447 + <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
  1448 + </view>
  1449 + <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
  1450 + <block wx:else>
  1451 + <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
  1452 + <block wx:else>
  1453 + <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
  1454 +
  1455 + <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor}}">(该店不可售)</view>
  1456 + <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor && is_normal}}">(该店不可售)</view>
  1457 + <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_act && !is_normal}}">(该店不可售)</view>
  1458 + <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0 &&!sele_g.whsle_id }}">
  1459 + (库存不足)
  1460 + </view>
  1461 + </block>
  1462 + </block>
  1463 + <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.fulladdress}}">
  1464 + 地址:{{def_pick_store.fulladdress}}
  1465 + </view>
  1466 +
1433 </view> 1467 </view>
1434 1468
1435 <!-- 商品的属性项目 --> 1469 <!-- 商品的属性项目 -->
@@ -1449,6 +1483,7 @@ @@ -1449,6 +1483,7 @@
1449 </block> 1483 </block>
1450 </view> 1484 </view>
1451 </view> 1485 </view>
  1486 +
1452 <view class="b_num"> 1487 <view class="b_num">
1453 <view>购买数量</view> 1488 <view>购买数量</view>
1454 <view class="count"> 1489 <view class="count">