|
@@ -1438,6 +1438,7 @@ class Query
|
|
|
//模仿上一个page,但是从paginate拿到page与list_rows
|
|
|
public function autopage(){
|
|
|
$config = Config::get('paginate');
|
|
|
+ $params = request()->param();
|
|
|
|
|
|
/** @var Paginator $class */
|
|
|
$class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\paginator\\driver\\' . ucwords($config['type']);
|
|
@@ -1449,7 +1450,7 @@ class Query
|
|
|
$page = $page < 1 ? 1 : $page;
|
|
|
|
|
|
//list_rows
|
|
|
- $listRows = isset($_REQUEST['list_rows']) ? (int)$_REQUEST['list_rows'] : $config['list_rows'];
|
|
|
+ $listRows = isset($params['list_rows']) ? (int)$params['list_rows'] : $config['list_rows'];
|
|
|
|
|
|
|
|
|
$this->options['page'] = [intval($page), intval($listRows)];
|