From 0e70658aeb991a2a971f28ab4a97110fb6f5661a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=84=E5=B0=98?= <122383162@qq.com>
Date: Thu, 4 Feb 2021 10:50:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BD=86=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Article/IndexController.php   |  4 +-
 .../Controllers/Category/IndexController.php  |  4 +-
 app/Helpers/function.php                      |  4 +-
 resources/views/category/kxyj.blade.php       |  1 -
 resources/views/category/left.blade.php       | 47 +++++++++++++++----
 resources/views/category/sjljrc.blade.php     |  4 +-
 resources/views/category/yjzdxk.blade.php     |  8 ++--
 resources/views/index/index.blade.php         | 15 ++++--
 8 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/app/Admin/Controllers/Article/IndexController.php b/app/Admin/Controllers/Article/IndexController.php
index 5be6ee6..b69dff5 100644
--- a/app/Admin/Controllers/Article/IndexController.php
+++ b/app/Admin/Controllers/Article/IndexController.php
@@ -26,7 +26,7 @@ class IndexController extends AdminController
                 }, '所有分类'));
             });
             $filter->column(1 / 2, function ($filter) {
-                $filter->equal('position', '定位')
+                $filter->equal('position', '首页推荐位')
                        ->select(Article::POSITIONS);
             });
 
@@ -76,7 +76,7 @@ class IndexController extends AdminController
         $form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先');
         $form->switch('status', '状态')->default(1);
         $form->text('url', '外链地址');
-        $form->select('position', '定位')
+        $form->select('position', '首页推荐位')
              ->options(Article::POSITIONS);
         $form->datetime('created_at', '发布时间');
         $form->saved(function ($form) {
diff --git a/app/Admin/Controllers/Category/IndexController.php b/app/Admin/Controllers/Category/IndexController.php
index 013b6f0..156dd5b 100644
--- a/app/Admin/Controllers/Category/IndexController.php
+++ b/app/Admin/Controllers/Category/IndexController.php
@@ -55,7 +55,7 @@ class IndexController extends AdminController
                      ->removable()
                      ->uniqueName();
                 $form->number('order', '排序')->default(0);
-                $form->switch('top_show', '顶部导航显示')->states()->default(0);
+                //                $form->switch('top_show', '顶部导航显示')->states()->default(0);
                 $form->switch('status', '显示')->states()->default(1);
                 $form->text('url', '跳转地址')->help('设置后直接跳转到设置的url');
 
@@ -122,7 +122,7 @@ class IndexController extends AdminController
         $form->number('order', '排序')->default(0)->help('正序优先');
 
         $form->switch('status', '显示')->states()->default(1);
-        $form->switch('top_show', '顶部导航显示')->states();
+        //        $form->switch('top_show', '顶部导航显示')->states();
         $form->text('url', '跳转地址')->help('设置后直接跳转到设置的url');
 
         $form->saving(function (Form $form) {
diff --git a/app/Helpers/function.php b/app/Helpers/function.php
index daf3c0e..e3d2368 100644
--- a/app/Helpers/function.php
+++ b/app/Helpers/function.php
@@ -182,10 +182,12 @@ function getArtilesByCates($cate_id, $take = 8)
     $cate_ids = Category::where('parent_id', $cate_id)
                         ->orWhere('id', $cate_id)
                         ->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW])
-                        ->get();
+                        ->pluck('id')
+                        ->toArray();
 
     return Article::whereIn('category_id', $cate_ids)
                   ->latest()
+                  ->take($take)
                   ->get();
 }
 
diff --git a/resources/views/category/kxyj.blade.php b/resources/views/category/kxyj.blade.php
index 28036c4..2867de7 100644
--- a/resources/views/category/kxyj.blade.php
+++ b/resources/views/category/kxyj.blade.php
@@ -15,7 +15,6 @@
         <!-- 科研领域 -->
             <div class="sub-title">
                 <b><i class="fa fa-flag"></i>{{ getOneCategory(14,'title') }}</b>
-                <a href="{{ getOneCategory(14,'link') }}">更多</a>
             </div>
             <ul class="research-award-ul">
                 @foreach (getArticlesBYCate(14,6) as $article)
diff --git a/resources/views/category/left.blade.php b/resources/views/category/left.blade.php
index 07c541b..eabe293 100644
--- a/resources/views/category/left.blade.php
+++ b/resources/views/category/left.blade.php
@@ -1,15 +1,46 @@
 <!-- <img class="mian-nav-cover" src="{{ $parent->cover_path }}" alt="导航封面"> -->
-<div class="mian-nav-title">
+@if (getCateChild($category->id)->isNotEmpty())
+    <div class="mian-nav-title">
+        {{  $category->title }}
+    </div>
+    <ul class="mian-nav-ul">
 
-    {{  $category->title }}
-
-</div>
-<ul class="mian-nav-ul">
-    @if (getCateChild($category->id)->isNotEmpty())
         @foreach (getCateChild($category->id) as $children)
             <li class="show">
                 <a href="{{ $children->link }}">{{ $children->title }}</a>
             </li>
         @endforeach
-    @endif
-</ul>
+    </ul>
+
+@else
+    <div class="mian-nav-title">
+        {{  $category->parent->title }}
+    </div>
+    <ul class="mian-nav-ul">
+        @foreach (getCateChild($category->parent->id) as $children)
+            <li class="show">
+                <a href="{{ $children->link }}">{{ $children->title }}</a>
+            </li>
+        @endforeach
+    </ul>
+
+@endif
+
+{{--<div class="mian-nav-title">--}}
+{{--    {{  $category->title }}--}}
+{{--</div>--}}
+{{--<ul class="mian-nav-ul">--}}
+{{--    @if (getCateChild($category->id)->isNotEmpty())--}}
+{{--        @foreach (getCateChild($category->id) as $children)--}}
+{{--            <li class="show">--}}
+{{--                <a href="{{ $children->link }}">{{ $children->title }}</a>--}}
+{{--            </li>--}}
+{{--        @endforeach--}}
+{{--    @else--}}
+{{--        @foreach (getCateChild($category->parent->id) as $children)--}}
+{{--            <li class="show">--}}
+{{--                <a href="{{ $children->link }}">{{ $children->title }}</a>--}}
+{{--            </li>--}}
+{{--        @endforeach--}}
+{{--    @endif--}}
+{{--</ul>--}}
diff --git a/resources/views/category/sjljrc.blade.php b/resources/views/category/sjljrc.blade.php
index 5eafb81..b91046e 100644
--- a/resources/views/category/sjljrc.blade.php
+++ b/resources/views/category/sjljrc.blade.php
@@ -7,7 +7,7 @@
     <div class="container mian">
         <!-- content-nav -->
         <nav class="mian-nav">
-            @include('layouts.left',$parent)
+            @include('category.left',$parent)
         </nav>
         <!-- content-content -->
         <div class="mian-content">
@@ -15,7 +15,7 @@
 
         <!-- 省级领军人才梯队 -->
             @if(getAllTalent(69)->isNotEmpty())
-{{--                <div class="sub-title">--}}
+                {{--                <div class="sub-title">--}}
                 {{--                    <b><i class="fa fa-line-chart"></i>{{ getOneCategory(69,'title') }}</b>--}}
                 {{--                </div>--}}
                 @foreach(getAllTalent(69) as $talent)
diff --git a/resources/views/category/yjzdxk.blade.php b/resources/views/category/yjzdxk.blade.php
index effb7db..1421313 100644
--- a/resources/views/category/yjzdxk.blade.php
+++ b/resources/views/category/yjzdxk.blade.php
@@ -7,7 +7,7 @@
     <div class="container mian">
         <!-- content-nav -->
         <nav class="mian-nav">
-            @include('layouts.left',$parent)
+            @include('category.left',$parent)
         </nav>
         <!-- content-content -->
         <div class="mian-content">
@@ -15,7 +15,7 @@
 
         <!-- 省级领军人才梯队 -->
             @if(getAllTalent(68)->isNotEmpty())
-{{--                <div class="sub-title">--}}
+                {{--                <div class="sub-title">--}}
                 {{--                    <b><i class="fa fa-line-chart"></i>{{ getOneCategory(68,'title') }}</b>--}}
                 {{--                </div>--}}
                 @foreach(getAllTalent(68) as $talent)
@@ -37,8 +37,8 @@
                         <p class="rctd3-p">
                             <span>梯队介绍：</span>
                             <span>
-                        {{ $talent->description }}
-                    </span>
+                                {{ $talent->description }}
+                            </span>
                         </p>
                     </div>
                 @endforeach
diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
index ed74987..4005fe4 100644
--- a/resources/views/index/index.blade.php
+++ b/resources/views/index/index.blade.php
@@ -78,7 +78,9 @@
 
                         <a href="{{ $pos_b->link }}" class="index-mian-news-href">
                             <p class="nowrap-multi">{{ $pos_b->title }}</p>
-                            <p class="nowrap">{{ $pos_b->created_at->format('Y-m-d') }}</p>
+                            <p class="nowrap">
+                                {{--                                {{ $pos_b->created_at->format('Y-m-d') }}--}}
+                            </p>
                         </a>
                     @endif
                 </div>
@@ -89,7 +91,7 @@
                                 <a href="{{ $info->link }}" class="nowrap">
                                     <i class="fa fa-chevron-circle-right"></i>
                                     {{ $info->title }}
-                                    <span>{{ $info->created_at->format('Y-m-d') }}</span>
+                                    {{--                                    <span>{{ $info->created_at->format('Y-m-d') }}</span>--}}
                                 </a>
                             </li>
                         @endforeach
@@ -99,7 +101,7 @@
 
             <!-- 科技成果 -->
             <div class="index-mian-title">
-                <span><i class="fa fa-flask"></i>{{ getOneCategory(10,'title') }}</span>
+                <span><i class="fa fa-flask"></i>{{ getOneCategory(19,'title') }}</span>
                 <a href="{{ getOneCategory(19,'link') }}">更多<i class="fa fa-plus"></i></a>
             </div>
             <div class="index-mian-news">
@@ -111,7 +113,10 @@
 
                         <a href="{{ $pos_c->link }}" class="index-mian-news-href">
                             <p class="nowrap-multi">{{ $pos_c->title }}</p>
-                            <p class="nowrap">{{ $pos_c->created_at->format('Y-m-d') }}</p>
+
+                            <p class="nowrap">
+                                {{--                                {{ $pos_c->created_at->format('Y-m-d') }}--}}
+                            </p>
                         </a>
                     @endif
                 </div>
@@ -122,7 +127,7 @@
                                 <a href="{{ $info->link }}" class="nowrap">
                                     <i class="fa fa-chevron-circle-right"></i>
                                     {{ $info->title }}
-                                    <span>{{ $info->created_at->format('Y-m-d') }}</span>
+                                    {{--                                    <span>{{ $info->created_at->format('Y-m-d') }}</span>--}}
                                 </a>
                             </li>
                         @endforeach