订单统计--表头搜索

app/Admin/Controllers/v3/OrderReportController.php

@@ -5,7 +5,9 @@ namespace App\Admin\Controllers\v3;
 use App\Admin\Repositories\v3\OrderReport;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Controllers\AdminController;
-use App\Models\v3\Market as marketModel;
+use App\Models\v3\Market as MarketModel;
+use App\Admin\Metrics\Examples\Order\OrderReportCard;
+use Dcat\Admin\Grid\Filter;
 
 class OrderReportController extends AdminController
 {
@@ -19,20 +21,17 @@ class OrderReportController extends AdminController
     {
         return Grid::make(new OrderReport(), function (Grid $grid) {
 
-            // $grid->column('user_total','现存用户总数');
-            // $grid->column('order_total_money','订单总额');
-            // $grid->column('new_user_total_money','平台新用户补贴总额');
-            // $grid->column('store_user_total_money','店铺用户每日首单补贴');
-            // $grid->column('new_add_user','新增用户数');
-          
+            $marketList = MarketModel::getMarketArray();
+
             $grid->combine('默认统计今天的数据【'.date('Y-m-d').'】', ['name', 'value'])->responsive()->help('如果未选择时间，则默认只统计当天的所有市场的数据，特殊：现存用户默认统计所有的数据');
 
             $grid->column('name');
             $grid->column('value');
 
-            $grid->filter(function (Grid\Filter $filter) {
-                //市场
-                $marketList = MarketModel::getMarketArray();
+            $grid->filter(function (Grid\Filter $filter) use($marketList){
+                // 更改为 panel 布局
+                $filter->panel();
+                
                 $filter->equal('market_id','市场')->select($marketList);
                 $filter->equal('start_time','开始时间')->date();
                 $filter->equal('end_time','结束时间')->date();

app/Admin/Repositories/v3/OrderReport.php

@@ -3,7 +3,7 @@
 namespace App\Admin\Repositories\v3;
 
 use App\Admin\Controllers\v3\OrderReportController;
-use App\Models\v3\Store as Model;
+use App\Models\ImsCjdcOrderMain as Model;
 use Dcat\Admin\Grid\Model as GridModel;
 use Dcat\Admin\Repositories\EloquentRepository;
 use Illuminate\Support\Facades\DB;