From 737a66b0c665c406fa1de6b28227d6baed89bb21 Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Fri, 25 Sep 2020 13:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/CategoryController.php |  2 +-
 app/Models/Category.php                     | 11 +++
 resources/views/article/search.blade.php    | 90 ++++++++++-----------
 resources/views/index/index.blade.php       |  2 +-
 resources/views/layouts/app.blade.php       |  2 +-
 5 files changed, 59 insertions(+), 48 deletions(-)

diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index f5d197e..8a8ea13 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -20,7 +20,7 @@ class CategoryController extends Controller
         } else {
             $articles = $category->relations(Category::TYPE_ARTICLE)->paginate(8);
             $parent   = $category;
-            if ($category->childrens->isEmpty() && $category->patent) {
+            if ($category->childrens->isEmpty() && $category->parent) {
                 $parent = $category->parent;
             }
 
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 506fa80..d79d62f 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -74,4 +74,15 @@ class Category extends Model
         return $ids;
     }
 
+    public function getTop()
+    {
+        $parent = $this;
+
+        while ($parent->parent_id) {
+            $parent->parent;
+        }
+        
+        return $parent;
+    }
+
 }
diff --git a/resources/views/article/search.blade.php b/resources/views/article/search.blade.php
index 85eee58..763957c 100644
--- a/resources/views/article/search.blade.php
+++ b/resources/views/article/search.blade.php
@@ -1,45 +1,45 @@
-@extends('layouts.app')
-
-@section('title', '搜索结果')
-
-
-@section('content')
-
-    <!-- mian -->
-    <div class="container child">
-        <!-- content -->
-        <div class="child-content sslb">
-            <ul class="spiritual-ul jlhz-border">
-                @if ($articles->isNotEmpty())
-                    @foreach ($articles as $article)
-                        <li>
-                            <a class="nowrap" href="{{ $article->link }}">
-                                <i class="fa fa-angle-double-right"></i>
-                                {{ $article->title }}
-                                <span>{{ $article->created_at->format('Y-m-d') }}</span>
-                            </a>
-                        </li>
-                        <li class="spiritual-ul-li">
-                            <a href="{{ $article->link }}">
-                                <h3 class="spiritual-title nowrap">{{ $article->title }}</h3>
-                                <p class="spiritual-info nowrap-multi">
-                                    {{ $article->descriiption }}
-                                </p>
-                            </a>
-                        </li>
-                    @endforeach
-                @endif
-
-
-            </ul>
-            <!-- 分页 -->
-            <div class="pages">
-                @if ($articles->isNotEmpty())
-                    {{ $articles->appends(['title'=>request()->title])->links('layouts.pagination') }}
-                @endif
-            </div>
-        </div>
-    </div>
-    <!-- end mian -->
-
-@endsection
+@extends('layouts.app')
+
+@section('title', '搜索结果')
+
+
+@section('content')
+
+    <!-- mian -->
+    <div class="container child">
+        <!-- content -->
+        <div class="child-content sslb">
+            <ul class="spiritual-ul jlhz-border">
+                @if ($articles->isNotEmpty())
+                    @foreach ($articles as $article)
+                        <li>
+                            <a class="nowrap" href="{{ $article->link }}">
+                                <i class="fa fa-angle-double-right"></i>
+                                {{ $article->title }}
+                                <span>{{ $article->created_at->format('Y-m-d') }}</span>
+                            </a>
+                        </li>
+                        <li class="spiritual-ul-li">
+                            <a href="{{ $article->link }}">
+                                <h3 class="spiritual-title nowrap">{{ $article->title }}</h3>
+                                <p class="spiritual-info nowrap-multi">
+                                    {{ $article->descriiption }}
+                                </p>
+                            </a>
+                        </li>
+                    @endforeach
+                @endif
+
+
+            </ul>
+            <!-- 分页 -->
+            <div class="pages">
+                @if ($articles->isNotEmpty())
+                    {{ $articles->appends(request()->all())->links('layouts.pagination') }}
+                @endif
+            </div>
+        </div>
+    </div>
+    <!-- end mian -->
+
+@endsection
diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
index ded7c6d..f1f0b66 100644
--- a/resources/views/index/index.blade.php
+++ b/resources/views/index/index.blade.php
@@ -253,7 +253,7 @@
                 <div class="mian-title">
                     <b>{{ getOneCategory(18,'title') }}</b>
                     <span>/&nbsp;&nbsp;{{ getOneCategory(18,'description') }}</span>
-                    <a class="mian-title-more" href="">更多<i class="fa fa-angle-right"></i></a>
+                    <a class="mian-title-more" href="{{ getOneCategory(18,'link') }}">更多<i class="fa fa-angle-right"></i></a>
                 </div>
                 <ul class="spiritual-ul">
                     @if (getArticlesBYCate(18,4)->isNotEmpty())
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 659decb..2aadd61 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -43,7 +43,7 @@
 <!-- 欢迎语 -->
 <div class="hello">
     <div class="container hello-text">
-        今天是 {{ now()->isoFormat('Y年m月d日 a h:mm:ss') }}  {{ now()->isoFormat('dddd') }}
+        今天是 {{ now()->isoFormat('Y年M月D日 a h:mm:ss') }}  {{ now()->get('dayName') }}
     </div>
 </div>
 <!-- end 欢迎语 -->