tab页

.env

@@ -52,4 +52,4 @@ PUSHER_APP_CLUSTER=mt1
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 
-START_IFRAME_TAB=false
+START_IFRAME_TAB=true

app/Admin/Actions/Grid/HandleInquiry.php

@@ -22,7 +22,7 @@ class HandleInquiry extends BatchAction
         return Modal::make()->lg()->title($this->title)->body($form)
         return Modal::make()->lg()->title($this->title)->body($form)
             ->onLoad($this->getModalScript())
             ->onLoad($this->getModalScript())
             ->button('<button class="btn btn-primary">
             ->button('<button class="btn btn-primary">
-        <i class="feather icon-filter"></i><span class="d-none d-sm-inline" style="margin-left: 5px">'.$buttonName.'</span>
+        <i class="feather icon-check-circle"></i><span class="d-none d-sm-inline" style="margin-left: 5px">'.$buttonName.'</span>
     </button>');
     </button>');
     }
     }
 
 

app/Admin/Controllers/InquiryController.php

@@ -34,23 +34,25 @@ class InquiryController extends AdminController
                     $end = strtotime($this->input['end'] ?? null);
                     $end = strtotime($this->input['end'] ?? null);
                     $q->whereBetween('create_time', [$start, $end]);
                     $q->whereBetween('create_time', [$start, $end]);
                 })->datetime()->width(3);
                 })->datetime()->width(3);
-                $filter->like('user.company_name')->width(3);
-                $filter->like('user.id')->width(3);
+                $filter->startWith('user.company_name')->width(3);
+                $filter->startWith('user.id')->width(3);
                 $filter->equal('inquiry_id')->width(3);
                 $filter->equal('inquiry_id')->width(3);
-                $filter->like('user.email')->width(3);
-                $filter->like('user.phone')->width(3);
+                $filter->startWith('user.email')->width(3);
+                $filter->startWith('user.phone')->width(3);
                 $filter->like('inquiry_sn')->width(3);
                 $filter->like('inquiry_sn')->width(3);
                 $filter->equal('priority')->select(admin_trans('inquiry.options.priority'))->width(3);
                 $filter->equal('priority')->select(admin_trans('inquiry.options.priority'))->width(3);
                 $filter->equal('status')->select(admin_trans('inquiry.options.status'))->width(3);
                 $filter->equal('status')->select(admin_trans('inquiry.options.status'))->width(3);
-                $filter->equal('sales_name')->select(CmsUser::pluck('name', 'userId')->toArray())->width(3);
+                $filter->equal('sales_id',trans('inquiry.fields.sales_name'))->select(CmsUser::pluck('name', 'userId')->toArray())->width(3);
 
 
             });
             });
 
 
 
 
             $grid->tools(new HandleInquiry(admin_trans('inquiry.labels.handle')));
             $grid->tools(new HandleInquiry(admin_trans('inquiry.labels.handle')));
 
 
+            $grid->model()->orderBy('inquiry_id', 'desc');
             $grid->column('inquiry_sn')->modal(function (Grid\Displayers\Modal $modal) {
             $grid->column('inquiry_sn')->modal(function (Grid\Displayers\Modal $modal) {
                 $modal->xl();
                 $modal->xl();
+                $modal->icon('fa fa-list-ul');
                 // 标题
                 // 标题
                 $modal->title(admin_trans('inquiry.labels.inquiry_detail'));
                 $modal->title(admin_trans('inquiry.labels.inquiry_detail'));
                 $detail = InquiryDetail::make(['key' => $this->inquiry_id]);
                 $detail = InquiryDetail::make(['key' => $this->inquiry_id]);
@@ -58,31 +60,31 @@ class InquiryController extends AdminController
                 return new Card($detail) . new Card($list);
                 return new Card($detail) . new Card($list);
             });
             });
             $grid->column('task_type')->display(admin_trans('inquiry.options.task_type.1'));
             $grid->column('task_type')->display(admin_trans('inquiry.options.task_type.1'));
-            $grid->column('user.phone');
-            $grid->column('user.email');
-            $grid->column('status')->using(admin_trans('inquiry.options.status'))->badge([
+            $grid->column('user.phone')->copyable();
+            $grid->column('user.email')->copyable();
+            $grid->column('status')->using(admin_trans('inquiry.options.status'))->dot([
                 -1 => 'danger',
                 -1 => 'danger',
-                0 => 'primary',
+                0 => 'info',
                 1 => 'success'
                 1 => 'success'
             ])->sortable();
             ])->sortable();
             $grid->column('priority')->using(admin_trans('inquiry.options.priority'))->badge([
             $grid->column('priority')->using(admin_trans('inquiry.options.priority'))->badge([
+                0 => 'default',
                 1 => 'primary',
                 1 => 'primary',
-                2 => 'success',
-                3 => 'danger'
-            ]);
+                2 => 'danger'
+            ])->sortable();
             $grid->column('remark')->limit(10);
             $grid->column('remark')->limit(10);
             $grid->column('sales_user.name');
             $grid->column('sales_user.name');
             $grid->column('user_types')->using(admin_trans('inquiry.options.user_types'));
             $grid->column('user_types')->using(admin_trans('inquiry.options.user_types'));
             $grid->column('processing_time')->display(function ($time) {
             $grid->column('processing_time')->display(function ($time) {
                 return $time ? date('Y-m-d H:i:s', $time) : '';
                 return $time ? date('Y-m-d H:i:s', $time) : '';
-            });
+            })->sortable();
 
 
             $grid->column('create_time')->display(function ($time) {
             $grid->column('create_time')->display(function ($time) {
                 return date('Y-m-d H:i:s', $time);
                 return date('Y-m-d H:i:s', $time);
-            });
+            })->sortable();
             $grid->column('update_time')->display(function ($time) {
             $grid->column('update_time')->display(function ($time) {
                 return $time ? date('Y-m-d H:i:s', $time) : '';
                 return $time ? date('Y-m-d H:i:s', $time) : '';
-            });
+            })->sortable();
         });
         });
     }
     }
 
 

app/Admin/bootstrap.php

@@ -41,8 +41,13 @@ body {
     font-size: 12px;!important;
     font-size: 12px;!important;
 }
 }
 
 
-.content-body {
-  margin-top: -15px;
+/*.content-body {*/
+/*  margin-top: -15px;*/
+/*}*/
+
+.filter-box {
+    padding: 0;
+    padding-top: 1.8rem;
 }
 }
 
 
 .table-main {
 .table-main {
@@ -133,6 +138,10 @@ background: #f2f2f2;
   background: white;
   background: white;
 }
 }
 
 
+.app-content {
+  background: white;
+}
+
 body:not(.dark-mode) .table-main table.custom-data-table thead,
 body:not(.dark-mode) .table-main table.custom-data-table thead,
 body:not(.dark-mode) .table-fixed table.custom-data-table thead tr th{
 body:not(.dark-mode) .table-fixed table.custom-data-table thead tr th{
     position: sticky;
     position: sticky;

app/Admin/routes.php

@@ -12,7 +12,7 @@ Route::group([
     'middleware' => config('admin.route.middleware'),
     'middleware' => config('admin.route.middleware'),
 ], function (Router $router) {
 ], function (Router $router) {
 
 
-    $router->get('/', 'HomeController@index');
+    $router->get('/index', 'HomeController@index');
     $router->resource('userAddress', 'UserAddressController');
     $router->resource('userAddress', 'UserAddressController');
     $router->resource('inquiry', 'InquiryController');
     $router->resource('inquiry', 'InquiryController');
     $router->resource('order', 'OrderController');
     $router->resource('order', 'OrderController');