调整上传图片

app/Admin/Controllers/Advert/IndexController.php

@@ -43,6 +43,7 @@ class IndexController extends AdminController
 
     /**
      * Make a form builder.
+     *
      * @return Form
      */
     protected function form()
@@ -59,14 +60,8 @@ class IndexController extends AdminController
                 'min'      => '必须选择所属分类',
             ]);
         $form->image('cover', '封面图片')
-            ->rules(function ($form) {
+            ->rules('image|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/ArticleController.php

@@ -49,19 +49,20 @@ class ArticleController extends AdminController
 
         $form->text('title', '文章标题')->rules('min:2');
         $form->select('category_id', '所属分类')
-             ->options(Category::selectOptions(function ($model) {
+            ->options(Category::selectOptions(function ($model) {
-                 return $model->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
+                return $model->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
-             }, '选择分类'))
+            }, '选择分类'))
-             ->rules('required|min:1', [
+            ->rules('required|min:1', [
-                 'required' => '必须选择所属分类',
+                'required' => '必须选择所属分类',
-                 'min'      => '必须选择所属分类',
+                'min'      => '必须选择所属分类',
-             ]);
+            ]);
         $form->text('keywords', '关键词')->rules('nullable');
         $form->textarea('description', '内容简介')->rules('max:350');
         $form->image('cover', '封面')
-             ->move('images/' . date('Y/m/d'))
+            ->rules('image|mimes:jpeg,jpg,png')
-             ->removable()
+            ->move('images/'.date('Y/m/d'))
-             ->uniqueName();
+            ->removable()
+            ->uniqueName();
         $form->ueditor('content', '文章内容')->rules('required', ['required' => '详情不能为空']);
         $form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先');
         $states = [

app/Admin/Controllers/Article/PictureController.php

@@ -23,10 +23,10 @@ class PictureController extends AdminController
             });
             $filter->column(1 / 2, function ($filter) {
                 $filter->like('category.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_PICTURE]);
+                            ->whereIn('type', [Category::TYPE_PICTURE]);
-                       }, '所有分类'));
+                    }, '所有分类'));
             });
 
             $filter->disableIdFilter();
@@ -50,17 +50,18 @@ class PictureController extends AdminController
 
         $form->text('title', '文章标题')->rules('min:2');
         $form->select('category_id', '所属分类')
-             ->options(Category::selectOptions(function ($model) {
+            ->options(Category::selectOptions(function ($model) {
-                 return $model->whereIn('type', [Category::TYPE_PICTURE]);
+                return $model->whereIn('type', [Category::TYPE_PICTURE]);
-             }, '选择分类'))
+            }, '选择分类'))
-             ->rules('required|min:1', [
+            ->rules('required|min:1', [
-                 'required' => '必须选择所属分类',
+                'required' => '必须选择所属分类',
-                 'min'      => '必须选择所属分类',
+                'min'      => '必须选择所属分类',
-             ]);
+            ]);
         $form->multipleImage('pictures', '封面')
-             ->move('images/' . date('Y/m/d'))
+            ->rules('image|mimes:jpeg,jpg,png')
-             ->removable()
+            ->move('images/'.date('Y/m/d'))
-             ->uniqueName();
+            ->removable()
+            ->uniqueName();
 
         $form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先');
 

app/Admin/Controllers/Category/IndexController.php

@@ -20,6 +20,7 @@ class IndexController extends AdminController
 
     /**
      * Index interface.
+     *
      * @return \Closure
      */
     public function grid()
@@ -33,8 +34,7 @@ class IndexController extends AdminController
                 $form->select('parent_id', '上级分类')
                     ->options(Category::selectOptions(function ($model) {
                         return $model->where('status', 1);
-                    }, '一级分类'))
+                    }, '一级分类'));
-                ;
                 $form->text('title', '分类名称')->rules('required');
                 $form->select('type', '分类类型')
                     ->options(Category::TYPES)
@@ -52,7 +52,8 @@ class IndexController extends AdminController
                 $form->text('keywords', '关键词')->rules('nullable');
 
                 $form->image('cover', 'Logo')
-                    ->move('images/' . date('Y/m/d'))
+                    ->rules('image|mimes:jpeg,jpg,png')
+                    ->move('images/'.date('Y/m/d'))
                     ->removable()
                     ->uniqueName();
                 $form->number('order', '排序')->default(0);
@@ -91,6 +92,7 @@ class IndexController extends AdminController
 
     /**
      * Make a form builder.
+     *
      * @return Form
      */
     protected function form()
@@ -115,7 +117,8 @@ class IndexController extends AdminController
         $form->textarea('description', '分类简介')->rows(4)->rules('nullable');
         $form->text('keywords', '关键词')->rules('nullable');
         $form->image('cover', 'Logo')
-            ->move('images/' . date('Y/m/d'))
+            ->rules('image|mimes:jpeg,jpg,png')
+            ->move('images/'.date('Y/m/d'))
             ->removable()
             ->uniqueName();
         $form->number('order', '排序')->default(0)->help('正序优先');