|
|
@@ -3,7 +3,6 @@ declare(strict_types=1);
|
|
|
|
|
|
namespace SixShop\Core;
|
|
|
|
|
|
-use think\Exception;
|
|
|
use think\helper\Macroable;
|
|
|
|
|
|
/**
|
|
|
@@ -24,8 +23,8 @@ class Request extends \think\Request
|
|
|
{
|
|
|
$page = $this->get('page/d', 1);
|
|
|
$limit = $this->get('limit/d', $this->get('per_page/d', 10));
|
|
|
- throw_if($page < 1, Exception::class, '页码不能小于1');
|
|
|
- throw_if($limit < 1 || $limit > 200, Exception::class, '每页数量必须在1-200之间');
|
|
|
+ $page = max($page, 1);
|
|
|
+ $limit = min($limit, 1000);
|
|
|
return ['page' => $page, 'list_rows' => $limit];
|
|
|
}
|
|
|
}
|