From 627c17122f4b28bb5525bf5a51246d5833234088 Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Tue, 20 Jul 2021 16:44:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/CategoryController.php |  5 ++-
 config/setting.php                          |  5 +++
 resources/views/category/dzjs.blade.php     |  6 +--
 resources/views/category/fygk.blade.php     | 20 +--------
 resources/views/category/ldbz.blade.php     | 20 +--------
 resources/views/category/left.blade.php     |  7 +++-
 resources/views/category/nsjg.blade.php     | 31 ++++----------
 resources/views/category/rcdw.blade.php     |  2 +-
 resources/views/category/xwdt.blade.php     | 46 +++++++++++++++++++--
 9 files changed, 72 insertions(+), 70 deletions(-)
 create mode 100644 config/setting.php

diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index 87ed193..59d343a 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -11,7 +11,7 @@ class CategoryController extends Controller
     /**
      * 显示分类
      * @param  Category  $category  [description]
-     * @return [type]             [description]
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View [type]             [description]
      */
     public function index(Category $category)
     {
@@ -24,7 +24,8 @@ class CategoryController extends Controller
             }
             $articles = $category->relations(Category::TYPE_ARTICLE)
                                  ->where('status', 1)
-                                 ->latest()
+                                 ->latest('sort')
+                                 ->latest('created_at')
                                  ->paginate(8);
 
             $parent = $category;
diff --git a/config/setting.php b/config/setting.php
new file mode 100644
index 0000000..24b8f9f
--- /dev/null
+++ b/config/setting.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'no_href' => [13],
+];
\ No newline at end of file
diff --git a/resources/views/category/dzjs.blade.php b/resources/views/category/dzjs.blade.php
index 82b56aa..5b6aa04 100644
--- a/resources/views/category/dzjs.blade.php
+++ b/resources/views/category/dzjs.blade.php
@@ -53,8 +53,8 @@
                             </a>
                         </div>
                         <ul class="indexExtend-ul studyExtend">
-                            @if (getArticlesBYCate(30,2)->isNotEmpty())
-                                @foreach (getArticlesBYCate(30,2) as $article)
+                            @if (getArticlesBYCate(30,4)->isNotEmpty())
+                                @foreach (getArticlesBYCate(30,4) as $article)
                                     <li>
                                         <a href="  {{ $article->link }}">
                                             <div class="ce-nowrap indexExtend-ul-name">
@@ -70,7 +70,7 @@
                         </ul>
                     </div>
 
-                
+
                 </div>
             </div>
         </div>
diff --git a/resources/views/category/fygk.blade.php b/resources/views/category/fygk.blade.php
index 993ee6a..2c64255 100644
--- a/resources/views/category/fygk.blade.php
+++ b/resources/views/category/fygk.blade.php
@@ -6,24 +6,8 @@
     <div class="survey" style="background-image: url(/assets/index/images/flowBack.png);">
         <div class="container">
             <div class="row">
-                <div class="col-xs-12 col-md-3 secondLeft">
-                    <div class="secondLeft-title">
-                        <span>{{ $parent->title  }}</span>
-                        <img src="/assets/index/images/secondLeft_logo.png"/>
-                    </div>
-                    <ul class="secondLeft-list">
-                        @if ($parent->childrens->isNotEmpty())
-                            @foreach ($parent->childrens()->orderBy('order','asc')->get() as $child)
-                                <li @if($category->id==$child->id) class="active" @endif>
-                                    <a href="{{ route('category.show',$child) }}"><span>{{ $child->title }}</span></a>
-                                </li>
-                            @endforeach
-                        @endif
-                    </ul>
-                    <div class="secondLeft-img">
-                        <img src="/assets/index/images/secondLeft_back.png"/>
-                    </div>
-                </div>
+                @include('category.left')
+
                 <div class="col-xs-12 col-md-9 secondRight">
                     <!-- 分院简介 -->
                     <div class="surveyCont">
diff --git a/resources/views/category/ldbz.blade.php b/resources/views/category/ldbz.blade.php
index 479a822..f36a1c2 100644
--- a/resources/views/category/ldbz.blade.php
+++ b/resources/views/category/ldbz.blade.php
@@ -6,24 +6,8 @@
     <div class="survey" style="background-image: url(/assets/index/images/flowBack.png);">
         <div class="container">
             <div class="row">
-                <div class="col-xs-12 col-md-3 secondLeft">
-                    <div class="secondLeft-title">
-                        <span>{{ $parent->title  }}</span>
-                        <img src="/assets/index/images/secondLeft_logo.png"/>
-                    </div>
-                    <ul class="secondLeft-list">
-                        @if ($parent->childrens->isNotEmpty())
-                            @foreach ($parent->childrens()->orderBy('order','asc')->get() as $child)
-                                <li @if($category->id==$child->id) class="active" @endif>
-                                    <a href="{{ route('category.show',$child) }}"><span>{{ $child->title }}</span></a>
-                                </li>
-                            @endforeach
-                        @endif
-                    </ul>
-                    <div class="secondLeft-img">
-                        <img src="/assets/index/images/secondLeft_back.png"/>
-                    </div>
-                </div>
+                @include('category.left')
+
                 <div class="col-xs-12 col-md-9 secondRight">
                     <!-- 领导班子 -->
                     <div class="surveyCont">
diff --git a/resources/views/category/left.blade.php b/resources/views/category/left.blade.php
index beffea9..2b09fa3 100644
--- a/resources/views/category/left.blade.php
+++ b/resources/views/category/left.blade.php
@@ -8,7 +8,11 @@
             @if ($parent->childrens->isNotEmpty())
                 @foreach ($parent->childrens()->orderBy('order','asc')->get() as $child)
                     <li @if($category->id==$child->id) class="active" @endif>
-                        <a href="{{ $child->link }}"><span>{{ $child->title }}</span></a>
+                        @if(in_array($parent->id,config('setting.no_href')))
+                            <a><span>{{ $child->title }}</span></a>
+                        @else
+                            <a href="{{ $child->link }}"><span>{{ $child->title }}</span></a>
+                        @endif
                     </li>
                 @endforeach
             @endif
@@ -18,3 +22,4 @@
         </div>
     </div>
 @endif
+
diff --git a/resources/views/category/nsjg.blade.php b/resources/views/category/nsjg.blade.php
index f1f3dfc..9cbb99b 100644
--- a/resources/views/category/nsjg.blade.php
+++ b/resources/views/category/nsjg.blade.php
@@ -6,24 +6,7 @@
     <div class="survey" style="background-image: url(/assets/index/images/flowBack.png);">
         <div class="container">
             <div class="row">
-                <div class="col-xs-12 col-md-3 secondLeft">
-                    <div class="secondLeft-title">
-                        <span>{{ $parent->title  }}</span>
-                        <img src="/assets/index/images/secondLeft_logo.png"/>
-                    </div>
-                    <ul class="secondLeft-list">
-                        @if ($parent->childrens->isNotEmpty())
-                            @foreach ($parent->childrens()->orderBy('order','asc')->get() as $child)
-                                <li @if($category->id==$child->id) class="active" @endif>
-                                    <a href="{{ route('category.show',$child) }}"><span>{{ $child->title }}</span></a>
-                                </li>
-                            @endforeach
-                        @endif
-                    </ul>
-                    <div class="secondLeft-img">
-                        <img src="/assets/index/images/secondLeft_back.png"/>
-                    </div>
-                </div>
+                @include('category.left')
                 <div class="col-xs-12 col-md-9 secondRight">
                     <!-- 内设机构 -->
                     <div class="surveyCont">
@@ -33,22 +16,22 @@
                                 {{ getOneCategory(13,'title') }}
 
                             </div>
-                            <a href="{{ getOneCategory(13,'link') }}" class="secondTop-more">
-                                查看更多&gt;&gt;
-                            </a>
+{{--                            <a href="{{ getOneCategory(13,'link') }}" class="secondTop-more">--}}
+                            {{--                                查看更多&gt;&gt;--}}
+                            {{--                            </a>--}}
                         </div>
                         <div class="organCont">
                             @if (getCateChild(13)->isNotEmpty())
                                 @foreach (getCateChild(13) as $cate)
                                     <div class="organLabel">
-                                        <!-- <div class="organLabel-name">
+                                    <!-- <div class="organLabel-name">
                                             {{ $cate->title }}
-                                        </div> -->
+                                            </div> -->
                                         <ul class="organLabel-list">
                                             @if($cate->childrens)
                                                 @foreach ($cate->childrens as $child)
                                                     <li>
-                                                        <a href="{{ $child->link }}">{{ $child->title }}</a>
+                                                        <a>{{ $child->title }}</a>
                                                     </li>
                                                 @endforeach
                                             @endif
diff --git a/resources/views/category/rcdw.blade.php b/resources/views/category/rcdw.blade.php
index 94c5cf0..1f98b00 100644
--- a/resources/views/category/rcdw.blade.php
+++ b/resources/views/category/rcdw.blade.php
@@ -88,7 +88,7 @@
                                                     <span class="IndexExpertNew-tips">客座教授</span>
                                                     <div class="IndexExpertNew-title">{{ $article->title }}</div>
                                                 </div>
-                                                <!-- <div class="ce-img IndexExpert-img">
+                                            <!-- <div class="ce-img IndexExpert-img">
                                                     <span style="background-image: url({{ $article->cover_path }});"></span>
                                                 </div>
                                                 <div class="IndexExpert-name">
diff --git a/resources/views/category/xwdt.blade.php b/resources/views/category/xwdt.blade.php
index 3e8c2cd..a7d702e 100644
--- a/resources/views/category/xwdt.blade.php
+++ b/resources/views/category/xwdt.blade.php
@@ -18,12 +18,12 @@
                             </div>
                         </div>
                         <ul class="newBranch">
-                            @if (getArticlesBYCate(7,2)->isNotEmpty())
-                                @foreach (getArticlesBYCate(7,2) as $article)
+                            @if (getArticlesBYCate(7,4)->isNotEmpty())
+                                @foreach (getArticlesBYCate(7,4) as $article)
                                     <li>
                                         <a href="{{ $article->link }}">
                                             <div class="ce-img newBranch-img">
-                                                <span style="background-image: url({{ $article->cover_path }});"></span>
+                                                {{--                                                <span style="background-image: url({{ $article->cover_path }});"></span>--}}
                                             </div>
                                             <div class="newBranch-cont" style="padding-left: 0">
                                                 <div class="newBranch-time">
@@ -49,6 +49,46 @@
                         </div>
                     </div>
 
+                    <!-- 媒体报道 -->
+                    <div class="surveyCont">
+                        <div class="secondTop">
+                            <div class="secondTop-name">
+                                <img src="/assets/index/images/newsIcon_00.png"/>
+                                {{ getOneCategory(17,'title') }}
+                            </div>
+                        </div>
+                        <ul class="newBranch">
+                            @if (getArticlesBYCate(17,4)->isNotEmpty())
+                                @foreach (getArticlesBYCate(17,4) as $article)
+                                    <li>
+                                        <a href="{{ $article->link }}">
+                                            <div class="ce-img newBranch-img">
+                                                {{--                                                <span style="background-image: url({{ $article->cover_path }});"></span>--}}
+                                            </div>
+                                            <div class="newBranch-cont" style="padding-left: 0">
+                                                <div class="newBranch-time">
+                                                    <span>{{ $article->created_at->format('d') }}</span>
+                                                    {{ $article->created_at->format('Y/m') }}
+                                                </div>
+                                                <div class="newBranch-text">
+                                                    <div class="ce-nowrap newBranch-name">
+                                                        {{ $article->title }}
+                                                    </div>
+                                                    <div class="ce-nowrap-multi newBranch-tips">
+                                                        {{ $article->description }}
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </a>
+                                    </li>
+                                @endforeach
+                            @endif
+                        </ul>
+                        <div class="secondMore">
+                            <a href="{{ getOneCategory(17,'link') }}">查看更多&gt;</a>
+                        </div>
+                    </div>
+
                     <!-- 获得奖项 -->
                     <div class="surveyCont">
                         <div class="secondTop">