From 59a7f8f9069d9ca77d52f58b6ce69ad223296a8d Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Mon, 20 Dec 2021 13:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Helpers/function.php                | 22 +++++++++++++-
 resources/views/category/djwh.blade.php | 20 ++++++++-----
 resources/views/category/kxyj.blade.php | 40 +++++++++++++++++--------
 3 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/app/Helpers/function.php b/app/Helpers/function.php
index 99e22cb..0d1e296 100644
--- a/app/Helpers/function.php
+++ b/app/Helpers/function.php
@@ -57,7 +57,7 @@ function getOneArticleBYCate($categoryId, $result = '')
  * @param  int  $recommen
  * @return \App\Models\Article
  */
-function getArticlesBYCate($categoryId, $take = 8, $recommen = 0)
+function getArticlesBYCate($categoryId, int $take = 8, $recommen = 0)
 {
     $cate = Category::find($categoryId);
     $ids  = $cate ? $cate->getAllChildrenId() : [];
@@ -75,6 +75,26 @@ function getArticlesBYCate($categoryId, $take = 8, $recommen = 0)
     return $articles;
 }
 
+/**
+ * Notes: 获取有图片的文章
+ *
+ * @Author: 玄尘
+ * @Date: 2021/12/20 13:22
+ * @param $categoryId
+ * @param $take
+ * @return mixed
+ */
+function getHasCoverArticlesByCate($categoryId, $take = 8)
+{
+    return Article::where('status', 1)
+        ->ByCategory([$categoryId])
+        ->whereNotNull('cover')
+        ->latest('sort')
+        ->latest()
+        ->take($take)
+        ->get();
+}
+
 //获取子分类
 function getCateChild($categoryId, $take = '')
 {
diff --git a/resources/views/category/djwh.blade.php b/resources/views/category/djwh.blade.php
index b1d5944..31913ca 100644
--- a/resources/views/category/djwh.blade.php
+++ b/resources/views/category/djwh.blade.php
@@ -21,11 +21,14 @@
                             <div class="party-title-more" data-href="{{ getOneCategory(60,'link') }}">更多&gt;&gt;</div>
                         </div>
                         <div class="srRrendText">
-                            @if (getArticlesBYCate(60,1)->isNotEmpty())
-                                @foreach (getArticlesBYCate(60,1) as $info)
-                                    <div class="ce-img srRrends-list-img">
+                            @if (getHasCoverArticlesByCate(60,1)->isNotEmpty())
+                                @foreach (getHasCoverArticlesByCate(60,1) as $info)
+                                    <div class="ce-img srRrends-list-img" data-href="{{ $info->link }}">
                                         <!-- 图片为4:3 -->
                                         <span style="background-image: url({{ $info->cover_url }});"></span>
+                                        <div class="ce-nowrap indexImg-title">
+                                            {{ $info->title }}
+                                        </div>
                                     </div>
                                 @endforeach
                             @endif
@@ -33,7 +36,6 @@
                                 @if (getArticlesBYCate(60,3)->isNotEmpty())
                                     @foreach (getArticlesBYCate(60,3) as $info)
                                         <li data-href="{{ $info->link }}" class="publicHover">
-
                                             <div class="srRrends-list-cont">
                                                 <div class="srRrends-list-text">
                                                     <div class="ce-nowrap-multi srRrends-list-name">
@@ -84,11 +86,14 @@
                         </div>
 
                         <div class="srRrendText">
-                            @if (getArticlesBYCate(61,1)->isNotEmpty())
-                                @foreach (getArticlesBYCate(61,1) as $info)
-                                    <div class="ce-img srRrends-list-img">
+                            @if (getHasCoverArticlesByCate(61,1)->isNotEmpty())
+                                @foreach (getHasCoverArticlesByCate(61,1) as $info)
+                                    <div class="ce-img srRrends-list-img" data-href="{{ $info->link }}">
                                         <!-- 图片为4:3 -->
                                         <span style="background-image: url({{ $info->cover_url }});"></span>
+                                        <div class="ce-nowrap indexImg-title">
+                                            {{ $info->title }}
+                                        </div>
                                     </div>
                                 @endforeach
                             @endif
@@ -194,4 +199,3 @@
         </div>
     </div>
 @endsection
-
diff --git a/resources/views/category/kxyj.blade.php b/resources/views/category/kxyj.blade.php
index 14a38a7..a4be72d 100644
--- a/resources/views/category/kxyj.blade.php
+++ b/resources/views/category/kxyj.blade.php
@@ -25,11 +25,14 @@
                             </div>
                         </div>
                         <div class="srRrendText">
-                            @if (getArticlesBYCate(17,1)->isNotEmpty())
-                                @foreach (getArticlesBYCate(17,1) as $info)
-                                    <div class="ce-img srRrends-list-img">
+                            @if (getHasCoverArticlesByCate(17,1)->isNotEmpty())
+                                @foreach (getHasCoverArticlesByCate(17,1) as $info)
+                                    <div class="ce-img srRrends-list-img" data-href="{{ $info->link }}">
                                         <!-- 图片为4:3 -->
                                         <span style="background-image: url({{ $info->cover_url }});"></span>
+                                        <div class="ce-nowrap indexImg-title">
+                                            {{ $info->title }}
+                                        </div>
                                     </div>
                                 @endforeach
                             @endif
@@ -109,19 +112,29 @@
                             <!-- <div class="srCooperationNew-top"><span>动态</span></div> -->
                             <div class="row">
                                 <div class="col-xs-12 col-md-6">
+
                                     <div class="srCooperationNew-left" data-href="{{ getOneCategory(77,'link') }}">
-                                        <div class="ce-img srCooperationNew-img">
-                                            <!-- 图片为2:1 -->
-                                            <span style="background-image: url({{ getOneCategory(77,'cover_url') }});"></span>
-                                        </div>
+                                        @if (getHasCoverArticlesByCate(17,1)->isNotEmpty())
+                                            @foreach (getHasCoverArticlesByCate(17,1) as $info)
+                                                <div class="ce-img srCooperationNew-img" data-href="{{ $info->link }}">
+                                                    <!-- 图片为2:1 -->
+                                                    <span style="background-image: url({{ $info->cover_url }});"></span>
+                                                    <div class="ce-nowrap indexImg-title">
+                                                        {{ $info->title }}
+                                                    </div>
+                                                </div>
+                                            @endforeach
+                                        @endif
                                     </div>
                                 </div>
                                 <div class="col-xs-12 col-md-6">
-                                    <div class="srCooperation-name"> 
-										<span>{{ getOneCategory(77,'title') }}</span>
-										<div class="party-title-more" style="font-weight: normal;color: #7b7b7b; right: 0" data-href="{{ getOneCategory(77,'link') }}">更多&gt;&gt;
-										</div>
-									</div>
+                                    <div class="srCooperation-name">
+                                        <span>{{ getOneCategory(77,'title') }}</span>
+                                        <div class="party-title-more"
+                                             style="font-weight: normal;color: #7b7b7b; right: 0"
+                                             data-href="{{ getOneCategory(77,'link') }}">更多&gt;&gt;
+                                        </div>
+                                    </div>
                                     <ul class="srCooperation-list">
                                         @if (getArticlesBYCate(77,3)->isNotEmpty())
                                             @foreach (getArticlesBYCate(77,3) as $info)
@@ -271,7 +284,8 @@
                                         @endif
                                     </div>
                                     <div class="ce-nowrap-multi srSpread-video-cont-title"
-                                         data-href="{{ getVideoByCate(29,'show_link') }}" style="-webkit-line-clamp: 2;">
+                                         data-href="{{ getVideoByCate(29,'show_link') }}"
+                                         style="-webkit-line-clamp: 2;">
                                         {{ getVideoByCate(29,'title') }}
                                     </div>
                                 </div>