From d2643c8f7cdfeb6f2604b90012fc0a6a0162fab5 Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Mon, 29 Nov 2021 16:39:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AD=9B=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Advert/IndexController.php    |  3 ++
 .../Controllers/Article/IndexController.php   | 38 ++++++++++++-------
 .../Controllers/Video/IndexController.php     | 12 ++++--
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/app/Admin/Controllers/Advert/IndexController.php b/app/Admin/Controllers/Advert/IndexController.php
index 8c1cf66..5570d22 100644
--- a/app/Admin/Controllers/Advert/IndexController.php
+++ b/app/Admin/Controllers/Advert/IndexController.php
@@ -24,6 +24,9 @@ class IndexController extends AdminController
         $grid->filter(function ($filter) {
             $filter->column(1 / 2, function ($filter) {
                 $filter->like('title', '广告名称');
+
+            });
+            $filter->column(1 / 2, function ($filter) {
                 $filter->like('category.id', '分类名称')->select(Category::selectOptions(function ($model) {
                     return $model->where('status', 1)->where('type', Category::TYPE_ADVERT);
                 }, '所有分类'));
diff --git a/app/Admin/Controllers/Article/IndexController.php b/app/Admin/Controllers/Article/IndexController.php
index f0dd54b..20dcba8 100644
--- a/app/Admin/Controllers/Article/IndexController.php
+++ b/app/Admin/Controllers/Article/IndexController.php
@@ -22,10 +22,20 @@ class IndexController extends AdminController
         $grid->filter(function ($filter) {
             $filter->column(1 / 2, function ($filter) {
                 $filter->like('title', '文章标题');
+                $filter->equal('status', '状态')->select([
+                    1 => '开启',
+                    0 => '关闭',
+                ]);
+            });
+
+            $filter->column(1 / 2, function ($filter) {
                 $filter->equal('category_id', '所属分类')->select(Category::selectOptions(function ($model) {
                     return $model->where('status', 1)->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
                 }, '所有分类'));
-
+                $filter->equal('recommen', '推荐')->select([
+                    1 => '是',
+                    0 => '否',
+                ]);
             });
 
             $filter->disableIdFilter();
@@ -36,10 +46,10 @@ class IndexController extends AdminController
         $grid->column('category.title', '所属分类');
         $grid->column('title', '文章标题');
         $grid->column('文章前台地址')
-             ->display(function () {
-                 return $this->link;
-             })
-             ->hide();
+            ->display(function () {
+                return $this->link;
+            })
+            ->hide();
         $states = [
             'on'  => ['value' => 1, 'text' => '打开', 'color' => 'primary'],
             'off' => ['value' => 2, 'text' => '关闭', 'color' => 'default'],
@@ -59,19 +69,19 @@ class IndexController extends AdminController
         $form->text('title', '文章标题')->rules('min:2');
         $form->text('remark', '子标题');
         $form->select('category_id', '所属分类')
-             ->options(Category::selectOptions(function ($model) {
-                 return $model->where('status', 1)->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
-             }, '一级分类'));
+            ->options(Category::selectOptions(function ($model) {
+                return $model->where('status', 1)->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
+            }, '一级分类'));
 
         $form->textarea('description', '内容简介');
         $form->image('cover', '封面')
-             ->move('images/' . date('Y/m/d'))
-             ->removable()
-             ->uniqueName();
+            ->move('images/'.date('Y/m/d'))
+            ->removable()
+            ->uniqueName();
         $form->image('logo', 'logo')
-             ->move('images/' . date('Y/m/d'))
-             ->removable()
-             ->uniqueName();
+            ->move('images/'.date('Y/m/d'))
+            ->removable()
+            ->uniqueName();
         $form->ueditor('content', '文章内容')->rules('required', ['required' => '详情不能为空']);
         $form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先');
         $states = [
diff --git a/app/Admin/Controllers/Video/IndexController.php b/app/Admin/Controllers/Video/IndexController.php
index 66e1d24..87c6641 100644
--- a/app/Admin/Controllers/Video/IndexController.php
+++ b/app/Admin/Controllers/Video/IndexController.php
@@ -21,16 +21,20 @@ class IndexController extends AdminController
         $grid->filter(function ($filter) {
             $filter->column(1 / 2, function ($filter) {
                 $filter->like('title', '视频名称');
+
+            });
+            $filter->column(1 / 2, function ($filter) {
                 $filter->like('category.id', '分类名称')
-                    ->select(Category::selectOptions(function ($model) {
-                        return $model->where('status', 1)->where('type', Category::TYPE_ADVERT);
-                    }, '所有分类'));
+                    ->select(Category::where([
+                        'status' => 1,
+                        'type'   => Category::TYPE_VIDEO,
+                    ])->pluck('title', 'id'));
             });
             $filter->disableIdFilter();
         });
 
         $grid->column('id');
-        $grid->column('title', '视频名称');
+        $grid->column('title', '视频名称')->width('500');
         $grid->column('cover', '封面')->image();
         $grid->column('link', '视频地址')->downloadable();
         $grid->column('category.title', '分类名称');