修复前台选择每页数量后翻页问题

beike/Helpers.php

@@ -1,9 +1,9 @@
 <?php
 
 use Beike\Models\AdminUser;
+use Beike\Models\Currency;
 use Beike\Models\Customer;
 use Beike\Models\Language;
-use Beike\Models\Currency;
 use Beike\Repositories\BrandRepo;
 use Beike\Repositories\CategoryRepo;
 use Beike\Repositories\CurrencyRepo;
@@ -341,7 +341,6 @@ function currency_format($price, string $currency = '', string $value = '', bool
     return CurrencyService::getInstance()->format($price, $currency, $value, $format);
 }
 
-
 /**
  * 获取指定货币汇率
  *

beike/Repositories/ProductRepo.php

@@ -20,6 +20,7 @@ use Beike\Models\ProductDescription;
 use Beike\Models\ProductRelation;
 use Beike\Models\ProductSku;
 use Beike\Shop\Http\Resources\ProductSimple;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\HigherOrderBuilderProxy;
@@ -46,14 +47,16 @@ class ProductRepo
      * 通过单个或多个商品分类获取商品列表
      *
      * @param $categoryId
-     * @return
+     * @param $filterData
+     * @return LengthAwarePaginator
      */
     public static function getProductsByCategory($categoryId, $filterData)
     {
         $builder  = self::getBuilder(array_merge(['category_id' => $categoryId, 'active' => 1], $filterData));
-        $products = $builder->with('inCurrentWishlist')->paginate($filterData['per_page'] ?? perPage());
 
-        return $products;
+        return $builder->with('inCurrentWishlist')
+            ->paginate($filterData['per_page'] ?? perPage())
+            ->withQueryString();
     }
 
     /**

beike/Shop/Http/Controllers/Account/RmaController.php

@@ -41,10 +41,10 @@ class RmaController extends Controller
      */
     public function show(int $id)
     {
-        $rma  = RmaRepo::find($id);
+        $rma         = RmaRepo::find($id);
-        $statuses = RmaRepo::getStatuses();
+        $statuses    = RmaRepo::getStatuses();
         $rma->status = $statuses[$rma->status];
-        $data = [
+        $data        = [
             'rma'          => $rma,
             'orderProduct' => OrderProductRepo::find($rma->order_product_id),
             'statuses'     => RmaRepo::getStatuses(),

beike/Shop/Http/Controllers/CategoryController.php

@@ -25,7 +25,10 @@ class CategoryController extends Controller
         $data       = [
             'all_categories'  => CategoryRepo::getTwoLevelCategories(),
             'category'        => $category,
-            'filter_data'     => ['attr' => ProductRepo::getFilterAttribute($filterData), 'price' => ProductRepo::getFilterPrice($filterData)],
+            'filter_data'     => [
+                'attr'  => ProductRepo::getFilterAttribute($filterData),
+                'price' => ProductRepo::getFilterPrice($filterData),
+            ],
             'products_format' => ProductSimple::collection($products)->jsonSerialize(),
             'products'        => $products,
             'per_pages'       => CategoryRepo::getPerPages(),