diff --git a/app/Admin/Controllers/Article/IndexController.php b/app/Admin/Controllers/Article/IndexController.php index 33665dd..e0808fc 100644 --- a/app/Admin/Controllers/Article/IndexController.php +++ b/app/Admin/Controllers/Article/IndexController.php @@ -46,7 +46,7 @@ class IndexController extends AdminController return $grid; } - public function form() + public function form(): Form { $form = new Form(new Article); @@ -71,6 +71,7 @@ class IndexController extends AdminController 'on' => ['value' => 1, 'text' => '打开', 'color' => 'success'], 'off' => ['value' => 0, 'text' => '关闭', 'color' => 'danger'], ]; + $form->datetime('created_at', '发布时间'); $form->switch('status', '状态')->states($states)->default(1); diff --git a/app/Helpers/function.php b/app/Helpers/function.php index 8cac5e9..2843fbc 100644 --- a/app/Helpers/function.php +++ b/app/Helpers/function.php @@ -153,3 +153,20 @@ function getAdvertsByCate($categoryId, $take = 8) ->get(); } +function getArticlesByCateIds($take = 8, $hasCover = false) +{ + $ids = [7, 17, 8, 5, 12, 30]; + + $articles = Article::whereIn('category_id', $ids) + ->where('status', 1) + ->latest() + ->when($hasCover, function ($q) { + $q->whereNotNull('cover'); + }) + ->take($take) + ->get(); + + return $articles; + +} + diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php index 51a0e81..37c356d 100644 --- a/resources/views/index/index.blade.php +++ b/resources/views/index/index.blade.php @@ -34,8 +34,8 @@
- @if (getArticlesBYCate(2,3,'all',true)->isNotEmpty()) - @foreach (getArticlesBYCate(2,3,'all',true) as $article) + @if (getArticlesByCateIds(3,true)->isNotEmpty()) + @foreach (getArticlesByCateIds(3,true) as $article)
@@ -55,7 +55,7 @@
-

{{ getOneCategory(2,'title') }}

+

分院动态

News Information
@@ -63,8 +63,8 @@
    - @if (getArticlesBYCate(7,6)->isNotEmpty()) - @foreach (getArticlesBYCate(7,6) as $article) + @if (getArticlesByCateIds(3,true)->isNotEmpty()) + @foreach (getArticlesByCateIds(3,true) as $article)