diff --git a/app/Admin/Controllers/Article/IndexController.php b/app/Admin/Controllers/Article/IndexController.php index b301a1c..51ba825 100644 --- a/app/Admin/Controllers/Article/IndexController.php +++ b/app/Admin/Controllers/Article/IndexController.php @@ -32,6 +32,11 @@ class IndexController extends AdminController $grid->column('cover', '封面图片')->image('', 100); $grid->column('category.title', '所属分类'); $grid->column('title', '文章标题'); + $states = [ + 'on' => ['value' => 1, 'text' => '打开', 'color' => 'primary'], + 'off' => ['value' => 2, 'text' => '关闭', 'color' => 'default'], + ]; + $grid->column('status', '状态')->switch($states); $grid->column('sort', '序号'); $grid->column('created_at', '创建时间'); @@ -44,20 +49,26 @@ class IndexController extends AdminController $form->text('title', '文章标题')->rules('min:2'); $form->select('category_id', '所属分类') - ->options(Category::selectOptions(function ($model) { - return $model->where('status', 1)->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]); - }, '选择分类')) - ->rules('required|min:1', [ - 'required' => '必须选择所属分类', - 'min' => '必须选择所属分类', - ]); + ->options(Category::selectOptions(function ($model) { + return $model->where('status', 1)->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]); + }, '选择分类')) + ->rules('required|min:1', [ + 'required' => '必须选择所属分类', + 'min' => '必须选择所属分类', + ]); $form->textarea('description', '内容简介'); $form->image('cover', '封面') - ->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 = [ + 'on' => ['value' => 1, 'text' => '打开', 'color' => 'success'], + 'off' => ['value' => 0, 'text' => '关闭', 'color' => 'danger'], + ]; + + $form->switch('status', '状态')->states($states)->default(1); return $form; } diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index bb1e088..1c0d695 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -18,7 +18,7 @@ class CategoryController extends Controller if ($category->type == Category::TYPE_SHOW && $category->article_id) { return redirect("articles/" . $category->article_id); } else { - $articles = $category->relations(Category::TYPE_ARTICLE)->paginate(2); + $articles = $category->relations(Category::TYPE_ARTICLE)->paginate(); $parent = $category; if ($parent->childrens->isEmpty()) { $parent = $category->parent; diff --git a/public/assets/index/images/logo.png b/public/assets/index/images/logo.png index 24f8b65..24c672e 100644 Binary files a/public/assets/index/images/logo.png and b/public/assets/index/images/logo.png differ diff --git a/public/assets/index/images/topbj.png b/public/assets/index/images/topbj.png index 57b0ff0..6c6ddff 100644 Binary files a/public/assets/index/images/topbj.png and b/public/assets/index/images/topbj.png differ diff --git a/resources/views/article/show.blade.php b/resources/views/article/show.blade.php index bf34b89..e1dc8cf 100644 --- a/resources/views/article/show.blade.php +++ b/resources/views/article/show.blade.php @@ -43,9 +43,9 @@
{{ $article->title }}
发布时间:{{ $article->created_at->format('Y-m-d') }}
- @if ($article->cover) - - @endif +{{-- @if ($article->cover)--}} + {{-- --}} + {{-- @endif--}} {!! $article->content !!}
diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php index 145519d..b83fd16 100644 --- a/resources/views/index/index.blade.php +++ b/resources/views/index/index.blade.php @@ -94,7 +94,7 @@
{{ $info->title }}
-
{{ $info->descrition }}
+
{{ $info->description }}
查看更多
@@ -104,7 +104,7 @@
{{ $info->title }}
-
{{ $info->descrition }}
+
{{ $info->description }}
查看更多
@@ -126,32 +126,33 @@ 更多 >>
- @if (getArticlesBYCate(43,10,'all')->isNotEmpty()) - + @if (getArticlesBYCate(43,6,'all')->isNotEmpty())
- @foreach (getArticlesBYCate(43,8,'all') as $article) + @foreach (getArticlesBYCate(43,6,'all') as $article) @if ($loop->iteration<=2) - + @endif @endforeach
    - @foreach (getArticlesBYCate(43,8,'all') as $article) - @if ($loop->iteration>2&&$loop->iteration<6) + @foreach (getArticlesBYCate(43,6,'all') as $article) + @if ($loop->iteration<=3)
  • - {{ $article->title }} + + {{ $article->title }}
  • @endif @endforeach