From f894b5b1fccb3a888ba3d592ae714c150c11defc Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Mon, 11 Nov 2024 17:47:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cart/payment/shareOrderGoods.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/cart/payment/shareOrderGoods.vue b/pages/cart/payment/shareOrderGoods.vue
index 5902746..90cdfe3 100644
--- a/pages/cart/payment/shareOrderGoods.vue
+++ b/pages/cart/payment/shareOrderGoods.vue
@@ -14,6 +14,9 @@
         <span v-if="isBuy &&!master.toBeGroupedNum >0">
           已成功拼团
         </span>
+        <span v-if="!master.toBeGroupedNum >0">
+          拼团已结束
+        </span>
       </div>
 
       <div v-if="isMaster && !isOver">
@@ -24,7 +27,7 @@
           去首页逛逛
         </div>
       </div>
-      <div v-if="!isMaster && !isOver && !isBuy">
+      <div v-if="!isMaster && !isOver && !isBuy && master.toBeGroupedNum">
         <div class="share-user" @click="toBuy">
           参与拼团
         </div>
@@ -45,7 +48,7 @@
     </div>
 
     <!-- 倒计时 -->
-    <div class="count-down" v-if="!isOver">
+    <div class="count-down" v-if="!isOver && master.toBeGroupedNum">
       <u-count-down bg-color="#ededed" :hide-zero-day="true" @end="isOver" :timestamp="timeStamp"></u-count-down>
     </div>
 

From 2cd7b7b63f9591e509fa81efc12ec640b1c1ada5 Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Thu, 21 Nov 2024 10:30:31 +0800
Subject: [PATCH 2/2] refactor: update goods list fetching to use
 currentGoodsId

---
 pages/product/goods.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index bb88575..67edadb 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -793,8 +793,8 @@ export default {
       getGoodsList({
         pageNumber: 1,
         pageSize: 10,
-        category: this.goodsDetail.categoryId,
-        keyword: this.goodsDetail.name,
+        currentGoodsId: this.goodsDetail.id,
+        keyword: this.goodsDetail.name
       }).then((res) => {
         this.likeGoodsList = res.data.result.records;
       });