diff --git a/app/admin/view/full.html b/app/admin/view/full.html index 9a59fd71d..a5a7ccb12 100644 --- a/app/admin/view/full.html +++ b/app/admin/view/full.html @@ -19,11 +19,11 @@ - + {block name='body'} - -{block name='content'}{/block} - +
+
{block name='content'}{/block}
+
{/block} @@ -31,4 +31,4 @@ {block name='script'}{/block} - + \ No newline at end of file diff --git a/composer.lock b/composer.lock index 33070b2c9..b10b6edbe 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "bb619fa1955cc2a8ce8ae7dea4d6787149a9ac2a" + "reference": "7d1a3dfdeab8aa4868dea3c1407170680127c412" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/bb619fa1955cc2a8ce8ae7dea4d6787149a9ac2a", - "reference": "bb619fa1955cc2a8ce8ae7dea4d6787149a9ac2a", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/7d1a3dfdeab8aa4868dea3c1407170680127c412", + "reference": "7d1a3dfdeab8aa4868dea3c1407170680127c412", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2020-01-10T04:14:42+00:00" + "time": "2020-01-10T04:15:10+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/public/static/admin.js b/public/static/admin.js index 99b2d36a7..540670d26 100644 --- a/public/static/admin.js +++ b/public/static/admin.js @@ -581,7 +581,11 @@ $(function () { $body.on('submit', 'form.form-search', function () { var url = $(this).attr('action').replace(/&?page=\d+/g, ''), split = url.indexOf('?') === -1 ? '?' : '&'; if ((this.method || 'get').toLowerCase() === 'get') { - return window.location.href = '#' + $.menu.parseUri(url + split + $(this).serialize()); + if (location.href.indexOf('spm=') > -1) { + return window.location.href = '#' + $.menu.parseUri(url + split + $(this).serialize()); + } else { + return window.location.href = $.menu.parseUri(url + split + $(this).serialize()); + } } $.form.load(url, this, 'post'); }); diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index c9bf5f2a1..27a3c19d0 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -935,12 +935,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "bb619fa1955cc2a8ce8ae7dea4d6787149a9ac2a" + "reference": "7d1a3dfdeab8aa4868dea3c1407170680127c412" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/bb619fa1955cc2a8ce8ae7dea4d6787149a9ac2a", - "reference": "bb619fa1955cc2a8ce8ae7dea4d6787149a9ac2a", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/7d1a3dfdeab8aa4868dea3c1407170680127c412", + "reference": "7d1a3dfdeab8aa4868dea3c1407170680127c412", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-01-10T04:14:42+00:00", + "time": "2020-01-10T04:15:10+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index a7c2fd756..289d8337e 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/service/QueueService.php b/vendor/zoujingli/think-library/src/service/QueueService.php index 4a54ebeed..b6aea5792 100644 --- a/vendor/zoujingli/think-library/src/service/QueueService.php +++ b/vendor/zoujingli/think-library/src/service/QueueService.php @@ -115,7 +115,7 @@ class QueueService extends Service */ public function addCleanQueue() { - $this->register('清理7天前的记录及执行超时任务', "xtask:clean", 0, [], 0, 3600); + $this->register('清理7天前记录及执行超时的任务', "xtask:clean", 0, [], 0, 3600); } /**