diff --git a/app/Http/Controllers/PatentController.php b/app/Http/Controllers/PatentController.php index 74aa766..884932b 100644 --- a/app/Http/Controllers/PatentController.php +++ b/app/Http/Controllers/PatentController.php @@ -52,7 +52,7 @@ class PatentController extends Controller }) ->latest('sort') ->latest() - ->paginate(); + ->paginate(2); return view('patents.list', compact('patents')); } diff --git a/public/assets/index/css/style.css b/public/assets/index/css/style.css index 3097710..7d7ff90 100644 --- a/public/assets/index/css/style.css +++ b/public/assets/index/css/style.css @@ -1128,6 +1128,7 @@ img { .paper-table td { text-align: center; height: 40px; + padding: 10px; } /* 组织机构-研究所简介 */ diff --git a/resources/views/category/cgzh.blade.php b/resources/views/category/cgzh.blade.php index 1f0d43f..008332b 100644 --- a/resources/views/category/cgzh.blade.php +++ b/resources/views/category/cgzh.blade.php @@ -37,7 +37,7 @@ {{ $article->title }} - {{ $article->created_at }} + {{ $article->created_at->format('Y-m-d') }} @endif @@ -66,7 +66,7 @@ {{ $article->title }} - {{ $article->created_at }} + {{ $article->created_at->format('Y-m-d') }} @endif diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php index e91cf70..e065c86 100644 --- a/resources/views/index/index.blade.php +++ b/resources/views/index/index.blade.php @@ -188,7 +188,7 @@ style="background-image: url({{ $advert->cover_path }});" href="{{ $advert->url }}" > - {{ $advert->title }} + {{-- {{ $advert->title }}--}} @endforeach @endif diff --git a/resources/views/patents/list.blade.php b/resources/views/patents/list.blade.php index 8ea57c2..d898d4c 100644 --- a/resources/views/patents/list.blade.php +++ b/resources/views/patents/list.blade.php @@ -23,14 +23,15 @@ {{ request()->type=='patent'?'专利':'论文' }} - @include('patents.'.request()->type, ['patents' => $patents]) - + @include('patents.'.request()->type, ['patents' => $patents]) - {{--
--}} - {{-- @if ($patents->isNotEmpty())--}} - {{-- {{ $patents->links('layouts.pagination') }}--}} - {{-- @endif--}} - {{--
--}} +
+ @if ($patents->isNotEmpty()) + {{ $patents->appends(request()->all())->links('layouts.pagination') }} + @endif +
+ + @endsection diff --git a/resources/views/patents/paper.blade.php b/resources/views/patents/paper.blade.php index f529ec5..0b63915 100644 --- a/resources/views/patents/paper.blade.php +++ b/resources/views/patents/paper.blade.php @@ -19,7 +19,7 @@