From e7a7b9b6908a74ff368ca0ad1f0064a9414aa26e Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Tue, 30 Mar 2021 09:44:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Article/IndexController.php     |  3 ++-
 app/Helpers/function.php                        | 17 +++++++++++++++++
 resources/views/index/index.blade.php           | 10 +++++-----
 3 files changed, 24 insertions(+), 6 deletions(-)

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 @@
                 <div class="col-xs-12 col-md-5">
                     <div class="swiper-container indexNews-banner">
                         <div class="swiper-wrapper">
-                            @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)
                                     <div class="swiper-slide">
                                         <div class="ce-img indexImg-img">
                                             <span style="background-image: url({{ $article->cover_path }});"></span>
@@ -55,7 +55,7 @@
                     <div class="indexNews-title">
                         <div class="indexNews-title-name">
                             <img src="assets/index/images/titleIcon_00.png"/>
-                            <p>{{ getOneCategory(2,'title') }}</p>
+                            <p>分院动态</p>
                             <span>News Information</span>
                         </div>
                         <div class="indexNews-title-more">
@@ -63,8 +63,8 @@
                         </div>
                     </div>
                     <ul class="indexNews-ul">
-                        @if (getArticlesBYCate(7,6)->isNotEmpty())
-                            @foreach (getArticlesBYCate(7,6) as $article)
+                        @if (getArticlesByCateIds(3,true)->isNotEmpty())
+                            @foreach (getArticlesByCateIds(3,true) as $article)
                                 <li>
                                     <a href="{{ $article->link }}" title="{{ $article->title }}">
                                         <div class="ce-nowrap indexNews-ul-name">