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 @@