From 1768a7fb7758f6135c10f6f200ae484e1e73b420 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@guangda.work>
Date: Fri, 4 Nov 2022 14:06:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=A7=E5=93=81=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Repositories/ProductRepo.php                 | 3 ++-
 beike/Shop/Http/Controllers/CategoryController.php | 3 ++-
 themes/default/category.blade.php                  | 7 +++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/beike/Repositories/ProductRepo.php b/beike/Repositories/ProductRepo.php
index b5b0278b..b4cab717 100644
--- a/beike/Repositories/ProductRepo.php
+++ b/beike/Repositories/ProductRepo.php
@@ -48,7 +48,7 @@ class ProductRepo
     public static function getProductsByCategory($categoryId): AnonymousResourceCollection
     {
         $builder = self::getBuilder(['category_id' => $categoryId, 'active' => 1]);
-        $products = $builder->with('inCurrentWishlist')->get();
+        $products = $builder->with('inCurrentWishlist')->paginate();
         return ProductSimple::collection($products);
     }
 
@@ -230,6 +230,7 @@ class ProductRepo
             ->get();
         return $products;
     }
+
     public static function DeleteByIds($ids)
     {
         Product::query()->whereIn('id', $ids)->delete();
diff --git a/beike/Shop/Http/Controllers/CategoryController.php b/beike/Shop/Http/Controllers/CategoryController.php
index 9b0e40ec..1d682ae2 100644
--- a/beike/Shop/Http/Controllers/CategoryController.php
+++ b/beike/Shop/Http/Controllers/CategoryController.php
@@ -20,7 +20,8 @@ class CategoryController extends Controller
 
         $data = [
             'category' => $category,
-            'products' => $products->jsonSerialize(),
+            'products_format' => $products->jsonSerialize(),
+            'products' => $products,
         ];
 
         return view('category', $data);
diff --git a/themes/default/category.blade.php b/themes/default/category.blade.php
index 45883052..99dfbb0a 100644
--- a/themes/default/category.blade.php
+++ b/themes/default/category.blade.php
@@ -7,14 +7,17 @@
     <x-shop-breadcrumb type="category" :value="$category" />
 
     <div class="row">
-      @if (count($products))
-        @foreach ($products as $product)
+      @if (count($products_format))
+        @foreach ($products_format as $product)
           <div class="col-6 col-md-3">@include('shared.product')</div>
         @endforeach
       @else
         <x-shop-no-data />
       @endif
     </div>
+
+    {{ $products->links('shared/pagination/bootstrap-4') }}
+
   </div>
 
 @endsection