From f829c2da841db787368f209daaa0376aaf15a770 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 22 Oct 2024 14:15:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=BF=AE=E5=A4=8D=E5=94=AE=E7=BD=84=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageProduct/index/components/goods.vue | 7 +++----
 pageProduct/index/index.vue            | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pageProduct/index/components/goods.vue b/pageProduct/index/components/goods.vue
index 0598bfd..7eb9cf3 100644
--- a/pageProduct/index/components/goods.vue
+++ b/pageProduct/index/components/goods.vue
@@ -52,7 +52,9 @@
 								@click="guigeClick(index)">
 								<text>{{item.specSnap||item.name}}</text>
 								<view class="tag-primary tag" v-if="item.isGrounding">上架中</view>
-								<view class="tag-gray tag" v-else>已下架</view>
+								<view class="tag-gray tag" v-if="item.isPauseSale">已售罄</view>
+								<view class="tag-gray tag" v-if="!item.isGrounding">已下架</view>
+								
 								<!-- <template v-if="item.isPauseSale">
 									<view class="tag-gray tag" >已售罄</view>
 								</template>
@@ -113,9 +115,6 @@
 			</view>
 		</view>
 
-
-
-
 	</view>
 </template>
 
diff --git a/pageProduct/index/index.vue b/pageProduct/index/index.vue
index 4ab5da9..d0a60e3 100644
--- a/pageProduct/index/index.vue
+++ b/pageProduct/index/index.vue
@@ -131,7 +131,7 @@
 		<edit-stock :category="pageData.categoryList" v-model:show="popup.stock.show" @save="changeStockConfirm"
 			:goods="pageData.selGoods"></edit-stock>
 		<!-- 规格弹窗 -->
-		<edit-guige @isGroundingChange="isGroundingChange" v-model:show="popup.guige.show"
+		<edit-guige @isGroundingChange="isGroundingChange" v-model:show="popup.guige.show" @isPauseSaleChange="isPauseSaleChange"
 			:goods="popup.guige.data"></edit-guige>
 		<!-- 报损 -->
 		<baosun-vue :category="pageData.categoryList" v-model:show="popup.baosun.show"