Commit 3fb1b88c79bd2cc5f0f5f11e48bb2e775e0e60e2
1 parent
ab095769
服务卡项 优化暂无可售门店
Showing
2 changed files
with
10 additions
and
10 deletions
packageA/pages/goodsInfo/goodsInfo.js
... | ... | @@ -2697,16 +2697,16 @@ Page({ |
2697 | 2697 | return false; |
2698 | 2698 | } |
2699 | 2699 | if(!th.data.only_pk && !th.data.def_pickpu_list){ |
2700 | - getApp().confirmBox("门店库存不足", null, 25000, !1); | |
2700 | + getApp().confirmBox("暂无可售门店", null, 25000, !1); | |
2701 | 2701 | return false; |
2702 | 2702 | } |
2703 | 2703 | |
2704 | 2704 | if(th.data.only_pk && !th.data.only_pk.length){ |
2705 | - getApp().confirmBox("门店库存不足", null, 25000, !1); | |
2705 | + getApp().confirmBox("暂无可售门店", null, 25000, !1); | |
2706 | 2706 | return false; |
2707 | 2707 | } |
2708 | 2708 | if(th.data.def_pickpu_list && !th.data.def_pickpu_list.length){ |
2709 | - getApp().confirmBox("门店库存不足", null, 25000, !1); | |
2709 | + getApp().confirmBox("暂无可售门店", null, 25000, !1); | |
2710 | 2710 | return false; |
2711 | 2711 | } |
2712 | 2712 | ... | ... |
packageA/pages/goodsInfo/goodsInfo.wxml
... | ... | @@ -174,7 +174,7 @@ |
174 | 174 | <view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(未找到门店)</view> |
175 | 175 | <text wx:elif="{{def_pick_store.is_no_dis_act}}" class="no_store">(该店不可售)</text> |
176 | 176 | <block wx:else> |
177 | - <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(配送不匹配)</view> | |
177 | + <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(该店不可售)</view> | |
178 | 178 | </block> |
179 | 179 | </block> |
180 | 180 | |
... | ... | @@ -667,7 +667,7 @@ |
667 | 667 | <!-- 选择门店模块 --> |
668 | 668 | <view class="flex-space-between address ai_end xc-width" style="padding-top: 30rpx;"> |
669 | 669 | <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> |
670 | - <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text> | |
670 | + <text class="fs30 xc-black3 shop_name" style="width:360rpx">{{def_pick_store.pickup_name}}</text> | |
671 | 671 | <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}"> |
672 | 672 | 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}</view> |
673 | 673 | </view> |
... | ... | @@ -686,7 +686,7 @@ |
686 | 686 | <block wx:else> |
687 | 687 | <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view> |
688 | 688 | <block wx:else> |
689 | - <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view> | |
689 | + <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(该店不可售)</view> | |
690 | 690 | <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_act}}">(该店不可售)</view> |
691 | 691 | <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules==2 && prom_type==0}}">(库存不足)</view> |
692 | 692 | </block> |
... | ... | @@ -710,7 +710,7 @@ |
710 | 710 | |
711 | 711 | |
712 | 712 | <view class="spec-cart-btns"> |
713 | - <view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view> | |
713 | + <view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">该店不可售</view> | |
714 | 714 | <view wx:elif="{{def_pick_store && def_pick_store.is_no_dis_act}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">该店不可售</view> |
715 | 715 | <block wx:else> |
716 | 716 | |
... | ... | @@ -835,7 +835,7 @@ |
835 | 835 | <view class="flex xc-ash"> |
836 | 836 | <view class="fs30 xc-black3 address_name">{{item.pickup_name}} |
837 | 837 | <block wx:if="{{tool.is_no_dis(data.storageId,item.keyid)}}"> |
838 | - <text class="no_store">(配送不匹配)</text> | |
838 | + <text class="no_store">(该店不可售)</text> | |
839 | 839 | </block> |
840 | 840 | <text wx:elif="{{item.is_no_dis_act}}" class="no_store">(该店不可售)</text> |
841 | 841 | |
... | ... | @@ -867,7 +867,7 @@ |
867 | 867 | <view class="flex xc-ash"> |
868 | 868 | <view class="fs30 xc-black3 address_name">{{item.pickup_name}} |
869 | 869 | <block wx:if="{{tool.is_no_dis(data.storageId,item.keyid)}}"> |
870 | - <text class="no_store">(配送不匹配)</text> | |
870 | + <text class="no_store">(该店不可售)</text> | |
871 | 871 | </block> |
872 | 872 | <text wx:elif="{{item.is_no_dis_act}}" class="no_store">(该店不可售)</text> |
873 | 873 | </view> |
... | ... | @@ -900,7 +900,7 @@ |
900 | 900 | <view class="flex xc-ash"> |
901 | 901 | <view class="fs28 xc-black3 address_name">{{item.pickup_name}} |
902 | 902 | <block wx:if="{{tool.is_no_dis(data.storageId,item.keyid)}}"> |
903 | - <text class="no_store">(配送不匹配)</text> | |
903 | + <text class="no_store">(该店不可售)</text> | |
904 | 904 | </block> |
905 | 905 | <text wx:elif="{{item.is_no_dis_act}}" class="no_store">(该店不可售)</text> |
906 | 906 | </view> | ... | ... |