From c785440755f2023056973ba24da59d331d4a97c9 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Fri, 23 Oct 2020 16:31:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=95=86=E5=93=81--=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v3/GoodsActivityReportController.php      | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/app/Admin/Controllers/v3/GoodsActivityReportController.php b/app/Admin/Controllers/v3/GoodsActivityReportController.php
index 77959a4..d1ca7b7 100644
--- a/app/Admin/Controllers/v3/GoodsActivityReportController.php
+++ b/app/Admin/Controllers/v3/GoodsActivityReportController.php
@@ -24,8 +24,10 @@ use Maatwebsite\Excel\Facades\Excel;
 class GoodsActivityReportController extends AdminController
 {
     protected $GoodsActivityReport = null;
-    protected $marketId = 0;
-    protected $newParams = [];
+    public $marketId = 0;
+    public $newParams = [];
+    public $marketList = [];
+    public $storeList = [];
     public function __construct()
     {
     }
@@ -39,14 +41,8 @@ class GoodsActivityReportController extends AdminController
     {
         
         return Grid::make(new GoodsActivityReport($this->newParams), function (Grid $grid) {
-            if($this->marketId){
-                $marketList = MarketModel::getMarketArray([['id','=',$this->marketId]]);
-                $storeList = StoreModel::getStoreArray([['market_id','=',$this->marketId]]);
-            }else{
-                $marketList = MarketModel::getMarketArray();
-                $storeList = StoreModel::getStoreArray();
-            }
-
+            $marketList = $this->marketList;
+            $storeList = $this->storeList;
             $grid->column('goods_id')->sortable();
             $grid->column('cover_img')->image('',50);
             $grid->column('name','商品名称');
@@ -113,6 +109,14 @@ class GoodsActivityReportController extends AdminController
         if($this->marketId){
             $this->newParams = ['market_id'=>$this->marketId];
         }
+        if($this->marketId){
+            $this->marketList = MarketModel::getMarketArray([['id','=',$this->marketId]]);
+            $this->storeList = StoreModel::getStoreArray([['market_id','=',$this->marketId]]);
+        }else{
+            $this->marketList = MarketModel::getMarketArray();
+            $this->storeList = StoreModel::getStoreArray();
+        }
+
         return $content->title('活动商品统计')
             ->body(function(Row $row){
                 // $row->column(2,function (Column $column){
@@ -129,9 +133,14 @@ class GoodsActivityReportController extends AdminController
                 //     $card->style('background-color:#4e9876');
                 //     $column->row($card);
                 // });
-                $row->column(4,new OrderGoodsActivityTotalChart($this->newParams));
-                $row->column(4,new OrderGoodsActivityCountChart($this->newParams));
-                $row->column(4,new OrderGoodsActivityMarketChart($this->newParams));
+                $newParams = [
+                    'market_id'=>$this->marketId,
+                    'data' => [],
+                    'markets' => $this->marketList
+                ];
+                $row->column(4,new OrderGoodsActivityTotalChart($newParams));
+                $row->column(4,new OrderGoodsActivityCountChart($newParams));
+                $row->column(4,new OrderGoodsActivityMarketChart($newParams));
             })
             ->body(function(Row $row){
                 $row->column(12,$this->grid());