调整页面

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'));
     }
 
 }

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'));