Merge branch 'master' of https://git.yuzhankeji.cn/xuanchen/new_dqb_new

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) {
-                if ($form->model()->cover != []) {
-                    return 'nullable|image';
-                } else {
-                    return 'required';
-                }
-            })
-            ->move('images/' . date('Y/m/d'))
+            ->rules('mimes:jpeg,jpg,png')
+            ->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('image|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()
@@ -50,7 +51,8 @@ class IndexController extends AdminController
                 $form->textarea('description', '分类简介')
                     ->rules('nullable');
                 $form->image('cover', '封面')
-                     ->move('images/' . date('Y/m/d'))
+                    ->rules('mimes:jpeg,jpg,png')
+                    ->move('images/'.date('Y/m/d'))
                     ->removable()
                     ->uniqueName();
                 $form->text('template', '模板');
@@ -90,6 +92,7 @@ class IndexController extends AdminController
 
     /**
      * Make a form builder.
+     *
      * @return Form
      */
     protected function form()
@@ -114,7 +117,8 @@ class IndexController extends AdminController
 
         $form->textarea('description', '分类简介')->rows(4)->rules('nullable');
         $form->image('cover', '封面')
-             ->move('images/' . date('Y/m/d'))
+            ->rules('mimes:jpeg,jpg,png')
+            ->move('images/'.date('Y/m/d'))
             ->removable()
             ->uniqueName();
         $form->text('template', '模板');

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

@@ -35,7 +35,10 @@ class CategorySelectAble extends Selectable
             $filter->equal('parent.id', '所属分类')
                 ->select(Category::selectOptions(function ($model) {
                     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);
         });