From 829dd823b80dc5788406bc8b400237f70583cf60 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sun, 25 Oct 2020 12:06:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods/groupBuyBatchManage/groupBuyBatchManage.html      | 6 +++++-
 .../pages/goods/groupBuyBatchManage/groupBuyBatchManage.js  | 5 +++--
 public/pages/goods/groupBuyManage/groupBuyManage.js         | 4 ++++
 .../goods/groupBuyProductManage/groupBuyProductManage.html  | 2 ++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/public/pages/goods/groupBuyBatchManage/groupBuyBatchManage.html b/public/pages/goods/groupBuyBatchManage/groupBuyBatchManage.html
index faa0d9418..c53ad0e06 100644
--- a/public/pages/goods/groupBuyBatchManage/groupBuyBatchManage.html
+++ b/public/pages/goods/groupBuyBatchManage/groupBuyBatchManage.html
@@ -55,7 +55,7 @@
                                 <th class="text-center">结束时间</th>
                                 <th class="text-center">当前批次</th>
                                 <th class="text-center">创建时间</th>
-
+                                <th class="text-center">操作</th>
                             </tr>
                         </thead>
                         <tbody>
@@ -66,6 +66,10 @@
                                 <td class="text-center">{{product.batchEndTime}}</td>
                                 <td class="text-center">{{product.curBatch == 'Y'?'是':'否'}}</td>
                                 <td class="text-center">{{product.createTime}}</td>
+                                <th class="text-center">
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_toGroupBuy(product)">拼团列表</button>
+                                </th>
                             </tr>
                         </tbody>
                         <tfoot>
diff --git a/public/pages/goods/groupBuyBatchManage/groupBuyBatchManage.js b/public/pages/goods/groupBuyBatchManage/groupBuyBatchManage.js
index 00f13cefa..a83203bf8 100644
--- a/public/pages/goods/groupBuyBatchManage/groupBuyBatchManage.js
+++ b/public/pages/goods/groupBuyBatchManage/groupBuyBatchManage.js
@@ -68,9 +68,10 @@
                 } else {
                     vc.component.groupBuyBatchManageInfo.moreCondition = true;
                 }
+            },
+            _toGroupBuy:function(product){
+                vc.jumpToPage('/admin.html#/pages/goods/groupBuyManage?batchId='+product.batchId);
             }
-
-
         }
     });
 })(window.vc);
diff --git a/public/pages/goods/groupBuyManage/groupBuyManage.js b/public/pages/goods/groupBuyManage/groupBuyManage.js
index 2a58633f9..12ac4c298 100644
--- a/public/pages/goods/groupBuyManage/groupBuyManage.js
+++ b/public/pages/goods/groupBuyManage/groupBuyManage.js
@@ -20,6 +20,10 @@
             }
         },
         _initMethod: function () {
+            let batchId = vc.getParam('batchId');
+            if(batchId){
+                $that.groupBuyManageInfo.conditions.batchId = batchId;
+            }
             vc.component._listProducts(DEFAULT_PAGE, DEFAULT_ROWS);
         },
         _initEvent: function () {
diff --git a/public/pages/goods/groupBuyProductManage/groupBuyProductManage.html b/public/pages/goods/groupBuyProductManage/groupBuyProductManage.html
index 042a87a67..657d291f4 100644
--- a/public/pages/goods/groupBuyProductManage/groupBuyProductManage.html
+++ b/public/pages/goods/groupBuyProductManage/groupBuyProductManage.html
@@ -57,6 +57,7 @@
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
                             <tr>
+                                <th class="text-center">当前批次</th>
                                 <th class="text-center">商品ID</th>
                                 <th class="text-center">商品图片</th>
                                 <th class="text-center">拼团名称</th>
@@ -70,6 +71,7 @@
                         </thead>
                         <tbody>
                             <tr v-for="product in groupBuyProductManageInfo.products">
+                                <td class="text-center">{{product.batchId}}</td>
                                 <td class="text-center">{{product.productId}}</td>
                                 <td class="text-center">
                                     <img style="width: 60px; height: 60px; border-radius: 5px;"