From 049ceb4fbc44eea9f36619a16bb659f14e2eb54c Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Mon, 19 Jun 2023 14:59:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E9=97=AE=E9=A2=98=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/dao/activity/combination/StorePinkDao.php           | 2 +-
 .../activity/combination/StoreCombinationServices.php         | 4 ++--
 crmeb/app/services/activity/combination/StorePinkServices.php | 1 +
 .../pages/activity/goods_combination_details/index.vue        | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/crmeb/app/dao/activity/combination/StorePinkDao.php b/crmeb/app/dao/activity/combination/StorePinkDao.php
index 6f3ad7cf0..b47ed69d1 100644
--- a/crmeb/app/dao/activity/combination/StorePinkDao.php
+++ b/crmeb/app/dao/activity/combination/StorePinkDao.php
@@ -132,7 +132,7 @@ class StorePinkDao extends BaseDao
     public function successList(int $uid)
     {
         return $this->search(['status' => 2, 'is_refund' => 0])
-            ->where('uid', '<>', $uid)
+//            ->where('uid', '<>', $uid)
             ->select()->toArray();
     }
 
diff --git a/crmeb/app/services/activity/combination/StoreCombinationServices.php b/crmeb/app/services/activity/combination/StoreCombinationServices.php
index 6a01a7456..242ef304c 100644
--- a/crmeb/app/services/activity/combination/StoreCombinationServices.php
+++ b/crmeb/app/services/activity/combination/StoreCombinationServices.php
@@ -393,11 +393,11 @@ class StoreCombinationServices extends BaseServices
 
         /** @var StorePinkServices $pinkService */
         $pinkService = app()->make(StorePinkServices::class);
-        list($pink, $pindAll) = $pinkService->getPinkList($id, true);//拼团列表
+        list($pink, $pinkAll) = $pinkService->getPinkList($id, true);//拼团列表
         $data['pink_ok_list'] = $pinkService->getPinkOkList($uid);
         $data['pink_ok_sum'] = $pinkService->getPinkOkSumTotalNum();
         $data['pink'] = $pink;
-        $data['pindAll'] = $pindAll;
+        $data['pinkAll'] = $pinkAll;
 
         /** @var StoreOrderServices $storeOrderServices */
         $storeOrderServices = app()->make(StoreOrderServices::class);
diff --git a/crmeb/app/services/activity/combination/StorePinkServices.php b/crmeb/app/services/activity/combination/StorePinkServices.php
index 9715a4f06..933e3630f 100644
--- a/crmeb/app/services/activity/combination/StorePinkServices.php
+++ b/crmeb/app/services/activity/combination/StorePinkServices.php
@@ -157,6 +157,7 @@ class StorePinkServices extends BaseServices
         $where['cid'] = $id;
         $where['k_id'] = 0;
         $where['is_refund'] = 0;
+        $where['status'] = 1;
         $pinkList = $this->dao->pinkList($where);
         $ids = array_column($pinkList, 'id');
         $orderIdKey = array_column($pinkList, 'order_id_key');
diff --git a/template/uni-app/pages/activity/goods_combination_details/index.vue b/template/uni-app/pages/activity/goods_combination_details/index.vue
index 0b204114e..37bf4c431 100644
--- a/template/uni-app/pages/activity/goods_combination_details/index.vue
+++ b/template/uni-app/pages/activity/goods_combination_details/index.vue
@@ -618,7 +618,7 @@
 						'<img style="max-width:100%;height:auto;float:left;display:block" ');
 					that.attribute.productSelect.num = res.data.storeInfo.num;
 					that.pink = res.data.pink;
-					that.pindAll = res.data.pindAll;
+					that.pinkAll = res.data.pinkAll;
 					that.reply = res.data.reply ? [res.data.reply] : [];
 					that.replyCount = res.data.replyCount;
 					that.itemNew = res.data.pink_ok_list;