From b6eb5aeb37be11720d268ae55701d5ca45261925 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 13 Dec 2022 15:24:27 +0800
Subject: [PATCH] 1、幸运购要显示购买按钮 2、预售的虚拟销量的由阿胡

---
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml | 2 +-
 packageC/pages/presell/goodsInfo/goodsInfo.wxml                 | 2 +-
 pages/goods/goodsInfo/goodsInfo.wxml                            | 6 +++---
 pages/goods/goodsInfo/goodsInfo.wxss                            | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index 2ea6553..aeca89a 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -911,7 +911,7 @@
     <!-- 普通商品购买 -->
     <block>
       <!-- 线上销售的时候，要判断库存量，  线下库存的时候不用判断 -->
-      <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules==2 }}">
+      <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules>=2 }}">
 			<view class="btn-container f1">
 				<view bindtap="openSpecModel_pt" data-ind="1" data-it="1" class="btn-yellow flex f1 fdc jc-center">
 					<view class="lh1">
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
index 197d3f2..f13b41e 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -132,7 +132,7 @@
             <view class="stock" style="color:#999">尾款:{{filters.format_time(presellForm.pay_begindate,1)}}-{{filters.format_time(presellForm.pay_enddate,1)}}</view>
           </view>
           <view class="goods-num">
-            <block wx:if="{{presellList.virtual_qty}}">
+            <block wx:if="{{presellList.virtual_qty && type !=0}}">
               <view class="stock">总数量:{{presellList.presell_sumqty+presellList.virtual_qty}}件</view>
               <view class="stock" wx:if="{{presellList.vip_butyqty}}">限购:{{presellList.vip_butyqty}}件</view>
               <view class="stock" wx:else>限购:不限</view>
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 3dd9e1d..3e66702 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -1552,7 +1552,7 @@
                   <view class="flex-vertical-between butttem5">
                     <view class="flex xc-ash">
                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}
-                        <text class="c-red2" wx:if="{{item.is_no_qyt}}">(无货)</text>
+                        <text class="c-red22" wx:if="{{item.is_no_qyt}}">(库存不足)</text>
                       </view>
                     </view>
                     <view>
@@ -1580,7 +1580,7 @@
                   <view class="flex-vertical-between ">
                     <view class="flex xc-ash">
                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}
-                        <text class="c-red2" wx:if="{{item.is_no_qyt}}">(无货)</text>
+                        <text class="c-red22" wx:if="{{item.is_no_qyt}}">(库存不足)</text>
                       </view>
                     </view>
                     <view>
@@ -1610,7 +1610,7 @@
                 <view class="flex-vertical-between ">
                   <view class="flex xc-ash">
                     <view class="fs28 xc-black3 address_name">{{item.pickup_name}}
-                      <text class="c-red2" wx:if="{{item.is_no_qyt}}">(无货)</text>
+                      <text class="c-red22" wx:if="{{item.is_no_qyt}}">(库存不足)</text>
                     </view>
                   </view>
                   <view>
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index ca2dc4b..2ceca1d 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -3649,11 +3649,12 @@ button.custom-service::after {
 	border: 0;
 }
 
-.no_store {
+.no_store,.c-red22 {
 	color: #d60021;
 	font-size: 26rpx;
 }
 
+
 .cx_show_view {
 	width: 580rpx;
 	/* line-height: 30rpx; margin-bottom: 6rpx; */
--
libgit2 0.21.4