diff --git a/app/Admin/Controllers/Article/PatentController.php b/app/Admin/Controllers/Article/PatentController.php index af14be2..59c3aff 100644 --- a/app/Admin/Controllers/Article/PatentController.php +++ b/app/Admin/Controllers/Article/PatentController.php @@ -59,10 +59,12 @@ class PatentController extends AdminController return $model->whereIn('type', [Category::TYPE_PATENT]); }, '专利类别')); $form->text('number', '专利号'); + $form->text('application', '申请日期'); }) ->when('paper', function (Form $form) { $form->text('publication', '刊物名称'); + $form->text('year', '发表年度'); }) ->required(); diff --git a/app/Helpers/function.php b/app/Helpers/function.php index 3e2749e..e1ffea7 100644 --- a/app/Helpers/function.php +++ b/app/Helpers/function.php @@ -28,7 +28,10 @@ function getOneCategory($categoryId, $return = '') */ function getOneArticleBYCate($categoryId, $result = '') { - $info = Article::where('category_id', $categoryId)->latest('sort')->latest()->first(); + $info = Article::where('category_id', $categoryId) + ->latest('sort') + ->latest() + ->first(); if ($info) { if ($result) { diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 6fb1333..eac26ac 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -30,10 +30,23 @@ class CategoryController extends Controller //显示文章列表 public function list(Category $category) { - $articles = Article::where('category_id', $category->id)->where('status', 1)->paginate(); - $parent = getTopCate($category->id); + $take = 15; + $template = 'category.list'; - return view('category.list', compact('category', 'parent', 'articles')); + if (in_array($category->id, [29, 30])) { + $take = 16; + $template = 'category.persons'; + } + + $articles = Article::where('category_id', $category->id) + ->where('status', 1) + ->latest('sort') + ->latest() + ->paginate($take); + + $parent = getTopCate($category->id); + + return view($template, compact('category', 'parent', 'articles')); } } \ No newline at end of file diff --git a/app/Http/Controllers/PatentController.php b/app/Http/Controllers/PatentController.php index 3a993d9..74aa766 100644 --- a/app/Http/Controllers/PatentController.php +++ b/app/Http/Controllers/PatentController.php @@ -20,12 +20,38 @@ class PatentController extends Controller //显示文章列表 public function list(Request $request) { - $type = $request->type; + $type = $request->type; + $title = $request->title; + $number = $request->number; + $category_id = $request->category_id; + $nickname = $request->nickname; + $publication = $request->publication; + $year = $request->year; $patents = Patent::where('status', 1) ->when($type, function ($q) use ($type) { $q->where('type', $type); }) + ->when($title, function ($q) use ($title) { + $q->where('title', 'like', "%{$title}%"); + }) + ->when($number, function ($q) use ($number) { + $q->where('number', $number); + }) + ->when($category_id, function ($q) use ($category_id) { + $q->where('category_id', $category_id); + }) + ->when($nickname, function ($q) use ($nickname) { + $q->where('nickname', 'like', "%{$nickname}%"); + }) + ->when($publication, function ($q) use ($publication) { + $q->where('publication', $publication); + }) + ->when($year, function ($q) use ($year) { + $q->where('year', 'like', "%{$year}%"); + }) + ->latest('sort') + ->latest() ->paginate(); return view('patents.list', compact('patents')); diff --git a/resources/views/articles/show.blade.php b/resources/views/articles/show.blade.php index b382a57..33bf789 100644 --- a/resources/views/articles/show.blade.php +++ b/resources/views/articles/show.blade.php @@ -11,7 +11,7 @@

{{ $article->created_at }}

- + {{-- --}} {!! $article->content !!}
diff --git a/resources/views/category/kxyj.blade.php b/resources/views/category/kxyj.blade.php index 6a6e153..fb1f649 100644 --- a/resources/views/category/kxyj.blade.php +++ b/resources/views/category/kxyj.blade.php @@ -65,7 +65,9 @@