From 3fb1b88c79bd2cc5f0f5f11e48bb2e775e0e60e2 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 15 Aug 2023 14:08:41 +0800
Subject: [PATCH] 服务卡项 优化暂无可售门店

---
 packageA/pages/goodsInfo/goodsInfo.js   |  6 +++---
 packageA/pages/goodsInfo/goodsInfo.wxml | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index a2a43e9..f8b8197 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -2697,16 +2697,16 @@ Page({
         return false;
     }
     if(!th.data.only_pk && !th.data.def_pickpu_list){
-      getApp().confirmBox("门店库存不足", null, 25000, !1);
+      getApp().confirmBox("暂无可售门店", null, 25000, !1);
       return false;
     }
 
     if(th.data.only_pk && !th.data.only_pk.length){
-      getApp().confirmBox("门店库存不足", null, 25000, !1);
+      getApp().confirmBox("暂无可售门店", null, 25000, !1);
       return false;
     }
     if(th.data.def_pickpu_list &&  !th.data.def_pickpu_list.length){
-      getApp().confirmBox("门店库存不足", null, 25000, !1);
+      getApp().confirmBox("暂无可售门店", null, 25000, !1);
       return false;
     }
 
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index cfbf176..3d51015 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -174,7 +174,7 @@
 								<view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(未找到门店)</view>
 								<text wx:elif="{{def_pick_store.is_no_dis_act}}" class="no_store">(该店不可售)</text>
 								<block wx:else>
-									<view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(配送不匹配)</view>
+									<view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(该店不可售)</view>
 								</block>
 							</block>
 
@@ -667,7 +667,7 @@
 			<!-- 选择门店模块 -->
 			<view class="flex-space-between address ai_end xc-width" style="padding-top: 30rpx;">
 				<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>
+					<text class="fs30 xc-black3 shop_name" style="width:360rpx">{{def_pick_store.pickup_name}}</text>
 					<view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">
 						距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}</view>
 				</view>
@@ -686,7 +686,7 @@
 			<block wx:else>
 				<view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
 				<block wx:else>
-					<view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
+					<view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(该店不可售)</view>
 					<view class="no_store" wx:elif="{{def_pick_store.is_no_dis_act}}">(该店不可售)</view>
 					<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>
 				</block>
@@ -710,7 +710,7 @@
 
 
 		<view class="spec-cart-btns">
-			<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>
+			<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>
 			<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>
 			<block wx:else>
 
@@ -835,7 +835,7 @@
 										<view class="flex xc-ash">
 											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}
 												<block wx:if="{{tool.is_no_dis(data.storageId,item.keyid)}}">
-													<text class="no_store">(配送不匹配)</text>
+													<text class="no_store">(该店不可售)</text>
 												</block>
 												<text wx:elif="{{item.is_no_dis_act}}" class="no_store">(该店不可售)</text>
 
@@ -867,7 +867,7 @@
 										<view class="flex xc-ash">
 											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}
 												<block wx:if="{{tool.is_no_dis(data.storageId,item.keyid)}}">
-													<text class="no_store">(配送不匹配)</text>
+													<text class="no_store">(该店不可售)</text>
 												</block>
 												<text wx:elif="{{item.is_no_dis_act}}" class="no_store">(该店不可售)</text>
 											</view>
@@ -900,7 +900,7 @@
 									<view class="flex xc-ash">
 										<view class="fs28 xc-black3 address_name">{{item.pickup_name}}
 											<block wx:if="{{tool.is_no_dis(data.storageId,item.keyid)}}">
-												<text class="no_store">(配送不匹配)</text>
+												<text class="no_store">(该店不可售)</text>
 											</block>
 											<text wx:elif="{{item.is_no_dis_act}}" class="no_store">(该店不可售)</text>
 										</view>
--
libgit2 0.21.4