搜索过滤增加条件

app/Admin/Controllers/BaseProductCategoryController.php

@@ -39,6 +39,7 @@ class BaseProductCategoryController extends AdminController
             $grid->column('updated_at')->sortable();
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->like('name');
+                $filter->equal('enabled', 'Enabled')->select(config('dictionary.enabled'));
             });
             $grid->disableViewButton();
             $grid->showQuickEditButton();

app/Admin/Controllers/BaseProductController.php

@@ -53,7 +53,7 @@ class BaseProductController extends AdminController
                 $filter->equal('sku');
                 $filter->like('title');
                 $filter->equal('category_id','Category')->select(BaseProductCategory::selectOptions());
-                $filter->equal('enabled', 'enabled')->select(config('dictionary.enabled'));
+                $filter->equal('enabled', 'Enabled')->select(config('dictionary.enabled'));
             });
             //排序
             $grid->model()->orderBy("is_pinned",'desc')->orderBy("order",'desc');

app/Admin/Controllers/BaseProductParameterController.php

@@ -35,9 +35,10 @@ class BaseProductParameterController extends AdminController
             $grid->column('enabled')->switch();
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
-//            $grid->filter(function (Grid\Filter $filter) {
-//                $filter->equal('id');
-//            });
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('name');
+                $filter->equal('enabled', 'Enabled')->select(config('dictionary.enabled'));
+            });
             $grid->disableViewButton();
             $grid->showQuickEditButton();
             $grid->enableDialogCreate();

app/Admin/Controllers/BaseVideoCategoryController.php

@@ -42,6 +42,10 @@ class BaseVideoCategoryController extends AdminController
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
             $grid->quickSearch('name');
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('name');
+                $filter->equal('enabled', 'Enabled')->select(config('dictionary.enabled'));
+            });
             //按钮
             $grid->disableViewButton();
             $grid->showQuickEditButton();

app/Admin/Controllers/DistAdminDistributorController.php

@@ -47,6 +47,7 @@ class DistAdminDistributorController extends AdminController
                 $filter->equal('company_name');
                 $filter->equal('site_name');
                 $filter->equal('level_domain');
+                $filter->equal('enabled', 'enabled')->select(config('dictionary.enabled'));
             });
             // 排序
             $grid->model()->orderBy("id",'desc');

app/Admin/Controllers/DistAdminUserController.php

@@ -48,6 +48,7 @@ class DistAdminUserController extends AdminController
                 $filter->equal('username');
                 $filter->equal('name','name');
                 $filter->like('distributor.company_name', 'Company Name');
+                $filter->equal('enabled', 'enabled')->select(config('dictionary.enabled'));
             });
             //排序
             $grid->model()->orderBy("id",'desc');

app/Admin/Controllers/DistAppearanceController.php

@@ -46,6 +46,7 @@ class DistAppearanceController extends AdminController
             $grid->column('updated_at')->sortable();
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('title');
+                $filter->equal('enabled', 'enabled')->select(config('dictionary.enabled'));
             });
         });
     }
@@ -62,11 +63,11 @@ class DistAppearanceController extends AdminController
         return Show::make($id, new DistAppearance(), function (Show $show) {
             $show->field('id');
             $show->field('title');
-            $show->field('cover_image')->display(function ($image) {
+            $show->field('cover_image')->as(function ($image) {
                 // 开始生成 HTML
                 $dataImages = [$image];
                 return CommonHelper::displayImage($dataImages,100);
-            });
+            })->unescape();
             $show->field('describe');
             $show->field('enabled')->using(config('dictionary.enabled'));
             $show->field('created_at');

app/Admin/Controllers/DistInquiryController.php

@@ -37,7 +37,7 @@ class DistInquiryController extends AdminController
             $grid->view('admin.grid.table');
             //字段
             $grid->column('id')->sortable();
-            $grid->column('order_noumber');
+            $grid->column('order_number');
             $grid->column('company_name');
             $grid->column('customer_name');
             $grid->column('email');
@@ -113,7 +113,7 @@ class DistInquiryController extends AdminController
     {
         return Form::make(new DistInquiry(), function (Form $form) {
             $form->display('id');
-            $form->display('order_noumber');
+            $form->display('order_number');
             $form->text('whats_app');
             $form->text('company_name');
             $form->text('customer_name');
@@ -123,8 +123,6 @@ class DistInquiryController extends AdminController
             $form->text('business_model');
             $form->ip('ip_address');
             $form->textarea('content');
-//            $form->display('created_at');
-//            $form->display('updated_at');
         });
     }
 }

app/Libraries/CommonHelper.php

@@ -10,7 +10,7 @@ class CommonHelper
      * $images 格式：['image.jpg','image2.jpg']
      * 返回显示的HTML显示图片
      */
-    public static function displayImage($images,$boxSize=100,$imgSize=300)
+    public static function displayImage($images,$boxSize=100,$imgSize=350)
     {
         if (empty($images) || empty($images[0])) {
             $html = "";
@@ -19,13 +19,12 @@ class CommonHelper
             $process = "?x-oss-process=image/resize,h_{$imgSize},m_lfit";
             $html = '<div style="display: flex; flex-wrap: wrap; gap: 5px;">';
             foreach ($images as $image) {
-                $html .= "<div style='flex: 1 0 {$boxSize}px; width: {$boxSize}px; height: {$boxSize}px; padding: 5px; border: 1px solid #ddd; border-radius: 5px; background-color: #f9f9f9; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); display: flex; align-items: center; justify-content: center;'>
+                $html .= "<div style='width: {$boxSize}px; height: {$boxSize}px; padding: 3px; border: 1px solid #ddd; border-radius: 3px; background-color: #f9f9f9; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1); display: flex; align-items: center; justify-content: center;'>
                     <img  data-action='preview-img'   src='" . self::ossUrl($image).$process . "' style='max-width: 100%; max-height: 100%; object-fit: contain;'>
                   </div>";
             }
             $html .= '</div>';
         }
-
         return $html;
     }
 

config/dictionary.php

@@ -21,8 +21,8 @@ return [
 
     //是否启用
     'enabled' => [
-        '0' => 'No',
         '1' => 'Yes',
+        '0' => 'No',
     ],
     //询价状态
     'inquiryStatus' => [