From bb2511a87b0463cc0a323f81a43357f406d1020f Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Tue, 18 Jan 2022 10:49:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/CategoryController.php |  5 ++-
 resources/views/index/index.blade.php       | 34 +++++++++++++++++----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index e62b90e..1b3ab69 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -25,15 +25,18 @@ class CategoryController extends Controller
                 $template = $category->template;
             }
 
+            $pageCount = 15;//每页显示数量
+            //人才
             if ($category->type == Category::TYPE_PERSON) {
                 $directory = 'resume';
+                $pageCount = 100;
             }
 
             $articles = $category->relations(Category::TYPE_ARTICLE)
                 ->where('status', 1)
                 ->latest('sort')
                 ->latest('created_at')
-                ->paginate();
+                ->paginate($pageCount);
 
             $parent = $category;
             if (! $category->getChildrenCount() && $category->parent) {
diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
index 3a24c22..d7a6166 100644
--- a/resources/views/index/index.blade.php
+++ b/resources/views/index/index.blade.php
@@ -252,13 +252,35 @@
                             {{ getOneCategory(17,'title') }}
                         </div>
                         <img src="assets/index/images/partyIcon_00.png"/>
+                        <div class="mediaNew-more" data-href="{{ getOneCategory(17,'link') }}">查看更多</div>
                     </div>
                     <div class="indexMedia-cont">
-                        <div class="ce-img indexMedia-img">
-                            <span style="background-image: url({{ getOneArticleBYCate(17,'cover_path') }});"></span>
-                            <img src="assets/index/images/partyIcon_03.png">
-                        </div>
-                        <div class="indexMedia-essay">
+                        @if (getArticlesBYCate(17,3,'one',true)->isNotEmpty())
+                            <div class="ce-img indexMedia-img">
+                                <span style="background-image: url({{ getArticlesBYCate(17,3,'one',true)->first()->cover_path}});"></span>
+                                <div class="ce-nowrap indexImg-title">
+                                    {{getArticlesBYCate(17,3,'one',true)->first()->title }}
+                                </div>
+                                <!-- <img src="assets/index/images/partyIcon_03.png"> -->
+                            </div>
+                        @endif
+
+                        <ul class="mediaNew">
+                            @if (getArticlesBYCate(17,3)->isNotEmpty())
+                                @foreach (getArticlesBYCate(17,3) as $article)
+                                    <li>
+                                        <a href="{{ $article->link }}" target="_blank" title="{{ $article->title }}">
+                                            <div class="ce-nowrap-multi indexNews-ul-name"
+                                                 style="font-size: 16px; margin-bottom: 10px">
+                                                {{ $article->title }}
+                                            </div>
+                                            <span>[{{ $article->created_at->format('Y-m-d') }}]</span>
+                                        </a>
+                                    </li>
+                                @endforeach
+                            @endif
+                        </ul>
+                    <!-- <div class="indexMedia-essay">
                             <div class="ce-nowrap-multi indexMedia-head">
                                 {{ getOneArticleBYCate(17,'title') }}
                             </div>
@@ -266,7 +288,7 @@
                                 {{ getOneArticleBYCate(17,'description') }}
                             </div>
                             <a class="indexMedia-more" href="{{ getOneCategory(17,'link') }}" target="_blank">MORE</a>
-                        </div>
+                        </div> -->
                     </div>
                 </div>
                 <div class="col-xs-12 col-md-4">