调整图片校验

app/Admin/Controllers/Advert/IndexController.php

@@ -43,6 +43,7 @@ class IndexController extends AdminController
 
     /**
      * Make a form builder.
+     *
      * @return Form
      */
     protected function form()
@@ -58,15 +59,10 @@ class IndexController extends AdminController
                 'required' => '必须选择所属分类',
                 'min'      => '必须选择所属分类',
             ]);
+
         $form->image('cover', '封面图片')
-            ->rules(function ($form) {
+            ->rules('mimes:jpeg,jpg,png')
-                if ($form->model()->cover != []) {
+            ->move('images/'.date('Y/m/d'))
-                    return 'nullable|image';
-                } else {
-                    return 'required';
-                }
-            })
-            ->move('images/' . date('Y/m/d'))
             ->removable()
             ->uniqueName();
         $form->text('url', '链接地址');

app/Admin/Controllers/Article/IndexController.php

@@ -67,6 +67,7 @@ class IndexController extends AdminController
         $form->text('rank', '职称')->help('领导班子需要添加此数据');
 
         $form->image('cover', '封面')
+            ->rules('mimes:jpeg,jpg,png')
             ->move('images/'.date('Y/m/d'))
             ->removable()
             ->uniqueName();

app/Admin/Controllers/Category/IndexController.php

@@ -20,6 +20,7 @@ class IndexController extends AdminController
 
     /**
      * Index interface.
+     *
      * @return \Closure
      */
     public function grid()
@@ -35,24 +36,25 @@ class IndexController extends AdminController
                 }, '一级分类'));
                 $form->text('title', '分类名称')->rules('required');
                 $form->select('type', '分类类型')
-                     ->options(Category::TYPES)
+                    ->options(Category::TYPES)
-                     ->when('show', function (WidgetsForm $form) {
+                    ->when('show', function (WidgetsForm $form) {
-                         //                         $form->text('article_id', '关联文章');
+                        //                         $form->text('article_id', '关联文章');
 
-                         $form->select('article_id', '关联文章')
+                        $form->select('article_id', '关联文章')
-                              ->options(function ($option, $info) {
+                            ->options(function ($option, $info) {
-                                  return Article::whereHas('categories', function ($q) {
+                                return Article::whereHas('categories', function ($q) {
-                                      $q->where('type', 'show');
+                                    $q->where('type', 'show');
-                                  })->pluck('title', 'id');
+                                })->pluck('title', 'id');
-                              })->help('当分类类型是文章详情的时候需要选择关联文章');
+                            })->help('当分类类型是文章详情的时候需要选择关联文章');
-                     })
+                    })
-                     ->required();
+                    ->required();
                 $form->textarea('description', '分类简介')
-                     ->rules('nullable');
+                    ->rules('nullable');
                 $form->image('cover', '封面')
-                     ->move('images/' . date('Y/m/d'))
+                    ->rules('mimes:jpeg,jpg,png')
-                     ->removable()
+                    ->move('images/'.date('Y/m/d'))
-                     ->uniqueName();
+                    ->removable()
+                    ->uniqueName();
                 $form->text('template', '模板');
                 $form->number('order', '排序')->default(0);
                 $form->switch('top_show', '顶部导航显示')->states()->default(0);
@@ -90,6 +92,7 @@ class IndexController extends AdminController
 
     /**
      * Make a form builder.
+     *
      * @return Form
      */
     protected function form()
@@ -101,22 +104,23 @@ class IndexController extends AdminController
         }, '一级分类'));
         $form->text('title', '分类名称')->rules('required');
         $form->select('type', '分类类型')
-             ->options(Category::TYPES)
+            ->options(Category::TYPES)
-             ->when('show', function (Form $form) {
+            ->when('show', function (Form $form) {
-                 $form->select('article_id', '关联文章')
+                $form->select('article_id', '关联文章')
-                      ->options(function ($option, $info) {
+                    ->options(function ($option, $info) {
-                          return Article::whereHas('categories', function ($q) {
+                        return Article::whereHas('categories', function ($q) {
-                              $q->where('type', 'show');
+                            $q->where('type', 'show');
-                          })->pluck('title', 'id');
+                        })->pluck('title', 'id');
-                      })->help('当分类类型是文章详情的时候需要选择关联文章');
+                    })->help('当分类类型是文章详情的时候需要选择关联文章');
-             })
+            })
-             ->required();
+            ->required();
 
         $form->textarea('description', '分类简介')->rows(4)->rules('nullable');
         $form->image('cover', '封面')
-             ->move('images/' . date('Y/m/d'))
+            ->rules('mimes:jpeg,jpg,png')
-             ->removable()
+            ->move('images/'.date('Y/m/d'))
-             ->uniqueName();
+            ->removable()
+            ->uniqueName();
         $form->text('template', '模板');
         $form->number('order', '排序')->default(0);
         $form->switch('top_show', '顶部导航显示')->states()->default(0);

app/Admin/Controllers/Resume/IndexController.php

@@ -12,7 +12,7 @@ use Encore\Admin\Grid;
 class IndexController extends AdminController
 {
 
-    protected $title = '简历管理';
+    protected $title = '梯队人才';
 
     public function grid(): Grid
     {
@@ -46,6 +46,7 @@ class IndexController extends AdminController
         $form->text('name', '姓名')->rules('min:2')->required();
         $form->textarea('description', '简介');
         $form->image('cover', '封面')
+            ->rules('image|mimes:jpeg,jpg,png')
             ->move('person/'.date('Y/m/d'))
             ->removable()
             ->uniqueName();

app/Admin/Selectable/CategorySelectAble.php

@@ -33,10 +33,13 @@ class CategorySelectAble extends Selectable
         $this->filter(function (Filter $filter) {
             $filter->like('title', '分类名称');
             $filter->equal('parent.id', '所属分类')
-                   ->select(Category::selectOptions(function ($model) {
+                ->select(Category::selectOptions(function ($model) {
-                       return $model->where('status', 1)
+                    return $model->where('status', 1)
-                                    ->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
+                        ->whereIn('type', [
-                   }, '所有分类'));
+                            Category::TYPE_ARTICLE,
+                            Category::TYPE_SHOW
+                        ]);
+                }, '所有分类'));
             $filter->equal('type', '类型')->select(Category::TYPES);
         });
     }