diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index c1a10eea9..9487dcdce 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -853,12 +853,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "d24cae2f0ba60e6e2067e232a2baffd8cf67a4ee" + "reference": "8297ed9968f49cbf04ef0912ce4a57e96ac10e69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/d24cae2f0ba60e6e2067e232a2baffd8cf67a4ee", - "reference": "d24cae2f0ba60e6e2067e232a2baffd8cf67a4ee", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8297ed9968f49cbf04ef0912ce4a57e96ac10e69", + "reference": "8297ed9968f49cbf04ef0912ce4a57e96ac10e69", "shasum": "", "mirrors": [ { @@ -875,7 +875,7 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2021-06-25T10:23:11+00:00", + "time": "2021-06-25T10:29:51+00:00", "default-branch": true, "type": "library", "extra": { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 342d3c4e5..d6c49783c 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -5,7 +5,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '9e41e91010789c2b2c3556ff002e9e190202da39', + 'reference' => '7a248e66f6a412da167217d21e73491933955daa', 'name' => 'zoujingli/thinkadmin', 'dev' => false, ), @@ -144,7 +144,7 @@ 'aliases' => array( 0 => '9999999-dev', ), - 'reference' => 'd24cae2f0ba60e6e2067e232a2baffd8cf67a4ee', + 'reference' => '8297ed9968f49cbf04ef0912ce4a57e96ac10e69', 'dev_requirement' => false, ), 'zoujingli/thinkadmin' => array( @@ -153,7 +153,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '9e41e91010789c2b2c3556ff002e9e190202da39', + 'reference' => '7a248e66f6a412da167217d21e73491933955daa', 'dev_requirement' => false, ), 'zoujingli/wechat-developer' => array( diff --git a/vendor/services.php b/vendor/services.php index 5f563f41c..646da7bf2 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/think-library/src/helper/PageHelper.php b/vendor/zoujingli/think-library/src/helper/PageHelper.php index fbe6bb0d6..1f5e32465 100644 --- a/vendor/zoujingli/think-library/src/helper/PageHelper.php +++ b/vendor/zoujingli/think-library/src/helper/PageHelper.php @@ -74,6 +74,7 @@ class PageHelper extends Helper [$data, $opts] = [$pager->toArray(), '']; foreach ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200] as $num) { $url = $this->app->request->baseUrl() . '?' . urldecode(http_build_query(array_merge($query, ['limit' => $num, 'page' => 1]))); + if (stripos($this->app->request->get('spm', '-'), 'm-') === 0) $url = sysuri('admin/index/index') . '#' . $url; $opts .= sprintf('', $num, $url, $limit === $num ? 'selected' : '', $num); } $select = "";