From d8b6ad3b82bc9ccad5887fbeec568762c632e13d Mon Sep 17 00:00:00 2001
From: liyukun <1099438829@qq.com>
Date: Mon, 11 Apr 2022 19:02:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5=E7=9A=84bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index/common.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/index/common.php b/app/index/common.php
index be5566d..b17ceab 100644
--- a/app/index/common.php
+++ b/app/index/common.php
@@ -383,7 +383,11 @@ function tpl_get_list($orderBy, $pageSize, $cid, $type, $table = 'article', $whe
     //获取当前请求的请求参数，以确定分页是否要带上这些请求参数
     $query = request()->query();
     if ($query) {
-        $documentListModel = $documentListModel->paginate($pageSize, false, ['query' => get_route_query()]);
+        $documentListModel = $documentListModel->paginate([
+            'list_rows'=> $pageSize,
+            'var_page' => 'page',
+            'query' => get_route_query()
+        ]);
     } else {
         $documentListModel = $documentListModel->paginate($pageSize);
     }
@@ -408,7 +412,7 @@ function get_route_query()
 {
     $request = request();
     $queryArr = $request->param();
-    $queryArr['s'] = $request->pathinfo();
+    //$queryArr['s'] = $request->pathinfo();
     return $queryArr;
 }