From a9ba1e1ea6efd2bec7d41e7fdfcfb1958bb0cee7 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Wed, 19 Aug 2020 09:47:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=96=B0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8--=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/StoreUserReportController.php | 24 +++++++++----------
 resources/lang/zh-CN/store-user-report.php    |  2 +-
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/Admin/Controllers/StoreUserReportController.php b/app/Admin/Controllers/StoreUserReportController.php
index 0b0da84..f31d267 100644
--- a/app/Admin/Controllers/StoreUserReportController.php
+++ b/app/Admin/Controllers/StoreUserReportController.php
@@ -24,16 +24,9 @@ class StoreUserReportController extends AdminController
             $grid->disableEditButton();
             $grid->disableQuickEditButton();
             $grid->disableViewButton();
-            $marketList = [];
-            $list = marketModel::select('id','name')->get()->toArray();
-            foreach($list as $value){
-                $marketList[$value['id']] = $value['name'];
-            }
 
             $grid->store_id;
-            $grid->market_id->filter(
-                Grid\Column\Filter\In::make($marketList)
-            )->display(function ($markrtId) {
+            $grid->market_id->display(function ($markrtId) {
                 $market = marketModel::find($markrtId);
                 if (!$market) {
                     return '<span style="color: red">数据错误</span>';
@@ -41,14 +34,19 @@ class StoreUserReportController extends AdminController
                 return $market->name;
             });
             $grid->store_name;
-            $grid->mm_user_id->display(function ($markrtId) {
-                return '未关联';
-            });
+            // $grid->mm_user_id->display(function ($markrtId) {
+            //     return '未关联';
+            // });
             $grid->new_user_total;
         
             $grid->filter(function (Grid\Filter $filter) {
-                $filter->equal('store_id');
-                $filter->like('store.name');
+                $marketList = [];
+                $list = marketModel::select('id','name')->get()->toArray();
+                foreach($list as $value){
+                    $marketList[$value['id']] = $value['name'];
+                }
+                $filter->in('market_id')->multipleSelect($marketList);
+                $filter->like('store.name','店铺名称');
                 $filter->whereBetween('time', function ($q) {
                     $start = $this->input['start'] ?? null;
                     $end = $this->input['end'] ?? null;
diff --git a/resources/lang/zh-CN/store-user-report.php b/resources/lang/zh-CN/store-user-report.php
index 79a3fde..8bc8bc8 100644
--- a/resources/lang/zh-CN/store-user-report.php
+++ b/resources/lang/zh-CN/store-user-report.php
@@ -8,11 +8,11 @@ return [
         'store_id' => '店铺ID',
         'market_id' => '所属市场',
         'name' => '商家名称',
+        'store.name' => '商家名称',
         'store_name' => '商家名称',
         'new_user_total' => '新增用户总数',
         'mm_user_id' => '所属市场经理',
         'time' => '时间',
-        'created_at' => '时间'
     ],
     'options' => [
     ],