This commit is contained in:
2020-12-02 15:54:44 +08:00
parent ff3b942268
commit 6e43fe13eb
4 changed files with 46 additions and 39 deletions

View File

@@ -57,6 +57,8 @@ class IndexController extends AdminController
$form->number('order', '排序')->default(0); $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->switch('status', '显示')->states()->default(1);
$form->text('url', '跳转地址')->help('设置后直接跳转到设置的url');
$form->action(admin_url('categories')); $form->action(admin_url('categories'));
$column->append((new Box('新增分类', $form))->style('success')); $column->append((new Box('新增分类', $form))->style('success'));
@@ -121,6 +123,7 @@ class IndexController extends AdminController
$form->switch('status', '显示')->states()->default(1); $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) { $form->saving(function (Form $form) {

View File

@@ -20,7 +20,7 @@ class PatentController extends Controller
//显示文章列表 //显示文章列表
public function list(Request $request) public function list(Request $request)
{ {
$type = $request->type; $type = $request->type ?? 'paper';
$title = $request->title; $title = $request->title;
$number = $request->number; $number = $request->number;
$category_id = $request->category_id; $category_id = $request->category_id;
@@ -54,7 +54,7 @@ class PatentController extends Controller
->latest() ->latest()
->paginate(); ->paginate();
return view('patents.list', compact('patents')); return view('patents.list', compact('patents', 'type'));
} }
} }

View File

@@ -26,6 +26,10 @@ class Category extends Model
public function getLinkAttribute() public function getLinkAttribute()
{ {
if ($this->url) {
return $this->url;
}
return route('category.show', $this); return route('category.show', $this);
} }

View File

@@ -23,7 +23,7 @@
<i class="fa fa-caret-right"></i> <i class="fa fa-caret-right"></i>
<a href="{{ url()->current() }}">{{ request()->type=='patent'?'专利':'论文' }}</a> <a href="{{ url()->current() }}">{{ request()->type=='patent'?'专利':'论文' }}</a>
</div> </div>
@include('patents.'.request()->type, ['patents' => $patents]) @include('patents.'.$type, ['patents' => $patents])
<!-- 分页 --> <!-- 分页 -->
<div class="pages"> <div class="pages">
@if ($patents->isNotEmpty()) @if ($patents->isNotEmpty())