diff --git a/app/Admin/Controllers/Category/IndexController.php b/app/Admin/Controllers/Category/IndexController.php index 4b68002..013b6f0 100644 --- a/app/Admin/Controllers/Category/IndexController.php +++ b/app/Admin/Controllers/Category/IndexController.php @@ -57,6 +57,8 @@ class IndexController extends AdminController $form->number('order', '排序')->default(0); $form->switch('top_show', '顶部导航显示')->states()->default(0); $form->switch('status', '显示')->states()->default(1); + $form->text('url', '跳转地址')->help('设置后直接跳转到设置的url'); + $form->action(admin_url('categories')); $column->append((new Box('新增分类', $form))->style('success')); @@ -121,6 +123,7 @@ class IndexController extends AdminController $form->switch('status', '显示')->states()->default(1); $form->switch('top_show', '顶部导航显示')->states(); + $form->text('url', '跳转地址')->help('设置后直接跳转到设置的url'); $form->saving(function (Form $form) { diff --git a/app/Http/Controllers/PatentController.php b/app/Http/Controllers/PatentController.php index 8c5fd8c..3c00983 100644 --- a/app/Http/Controllers/PatentController.php +++ b/app/Http/Controllers/PatentController.php @@ -20,7 +20,7 @@ class PatentController extends Controller //显示文章列表 public function list(Request $request) { - $type = $request->type; + $type = $request->type ?? 'paper'; $title = $request->title; $number = $request->number; $category_id = $request->category_id; @@ -54,7 +54,7 @@ class PatentController extends Controller ->latest() ->paginate(); - return view('patents.list', compact('patents')); + return view('patents.list', compact('patents', 'type')); } } diff --git a/app/Models/Category.php b/app/Models/Category.php index f3c00b3..09ddbf5 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -26,6 +26,10 @@ class Category extends Model public function getLinkAttribute() { + if ($this->url) { + return $this->url; + } + return route('category.show', $this); } diff --git a/resources/views/patents/list.blade.php b/resources/views/patents/list.blade.php index d898d4c..7cb43dd 100644 --- a/resources/views/patents/list.blade.php +++ b/resources/views/patents/list.blade.php @@ -1,37 +1,37 @@ -@extends('layouts.app') - -@section('title', '论文/专利') - -@section('content') - -
- - - -
- - @include('patents.'.request()->type, ['patents' => $patents]) - -
- @if ($patents->isNotEmpty()) - {{ $patents->appends(request()->all())->links('layouts.pagination') }} - @endif -
-
- -
- -@endsection +@extends('layouts.app') + +@section('title', '论文/专利') + +@section('content') + +
+ + + +
+ + @include('patents.'.$type, ['patents' => $patents]) + +
+ @if ($patents->isNotEmpty()) + {{ $patents->appends(request()->all())->links('layouts.pagination') }} + @endif +
+
+ +
+ +@endsection