阶段更新

app/Admin/Controllers/Article/IndexController.php

@@ -34,13 +34,13 @@ class IndexController extends AdminController
         $grid->column('id', '#ID#');
         $grid->column('cover', '封面图片')->image('', 100);
         $grid->column('category.title', '所属分类');
-        $grid->column('category_old.title', '所属老分类');
         $grid->column('title', '文章标题');
         $states = [
             'on'  => ['value' => 1, 'text' => '打开', 'color' => 'primary'],
             'off' => ['value' => 2, 'text' => '关闭', 'color' => 'default'],
         ];
         $grid->column('status', '状态')->switch($states);
+        $grid->column('recommen', '推荐')->switch();
         $grid->column('sort', '序号');
         $grid->column('created_at', '创建时间');
 
@@ -63,6 +63,10 @@ class IndexController extends AdminController
              ->move('images/' . date('Y/m/d'))
              ->removable()
              ->uniqueName();
+        $form->image('logo', 'logo')
+             ->move('images/' . date('Y/m/d'))
+             ->removable()
+             ->uniqueName();
         $form->ueditor('content', '文章内容')->rules('required', ['required' => '详情不能为空']);
         $form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先');
         $states = [
@@ -71,6 +75,7 @@ class IndexController extends AdminController
         ];
         $form->datetime('created_at', '发布时间');
         $form->switch('status', '状态')->states($states)->default(1);
+        $form->switch('recommen', '推荐')->default(0);
 
         return $form;
     }

app/Admin/Controllers/Category/IndexController.php

@@ -44,6 +44,9 @@ class IndexController extends AdminController
                                   })->pluck('title', 'id');
                               })->help('当分类类型是文章详情的时候需要选择关联文章');
                      })
+                     ->when(Category::TYPE_LINK, function (WidgetsForm $form) {
+                         $form->text('url', '跳转地址');
+                     })
                      ->required();
                 $form->textarea('description', '分类简介')
                      ->rules('nullable');
@@ -114,6 +117,9 @@ class IndexController extends AdminController
                           })->pluck('title', 'id');
                       })->help('当分类类型是文章详情的时候需要选择关联文章');
              })
+             ->when(Category::TYPE_LINK, function (Form $form) {
+                 $form->text('url', '跳转地址');
+             })
              ->required()
              ->rules('required');
         $form->textarea('description', '分类简介')->rows(4)->rules('nullable');

app/Admin/Controllers/Video/IndexController.php

@@ -31,9 +31,9 @@ class IndexController extends AdminController
 
         $grid->column('id');
         $grid->column('title', '视频名称');
-        $grid->column('cover', '视频地址')->downloadable();
+        $grid->column('cover', '封面')->image();
+        $grid->column('link', '视频地址')->downloadable();
         $grid->column('category.title', '分类名称');
-        $grid->column('url', '地址');
         $grid->column('sort', '排序');
 
         return $grid;
@@ -60,7 +60,20 @@ class IndexController extends AdminController
                  'required' => '必须选择所属分类',
                  'min'      => '必须选择所属分类',
              ]);
-        $form->file('cover', '视频')
+
+        $form->file('cover', '封面')
+             ->rules(function ($form) {
+                 if ($form->model()->cover != []) {
+                     return 'nullable|image';
+                 } else {
+                     return 'required';
+                 }
+             })
+             ->move('images/' . date('Y/m/d'))
+             ->removable()
+             ->uniqueName();
+
+        $form->file('link', '视频')
              ->rules(function ($form) {
                  if ($form->model()->cover != []) {
                      return 'nullable|image';
@@ -71,7 +84,7 @@ class IndexController extends AdminController
              ->move('videos/' . date('Y/m/d'))
              ->removable()
              ->uniqueName();
-        $form->text('url', '链接地址');
+
         $form->number('sort', '排序')
              ->default(1)
              ->required()