From cb3f8fc0421445fd0d458a4213e69821363be71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Sat, 27 Mar 2021 15:03:10 +0800 Subject: [PATCH] ComposerUpdate --- app/data/view/news/item/index.html | 4 ++-- app/data/view/news/mark/index.html | 19 +++++++++++-------- app/data/view/shop/goods/form.html | 2 +- app/data/view/shop/goods/index.html | 4 ++-- vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- .../think-library/src/multiple/BuildUrl.php | 10 +++++++--- .../think-library/src/service/NodeService.php | 2 +- .../src/service/SystemService.php | 1 - 9 files changed, 29 insertions(+), 23 deletions(-) diff --git a/app/data/view/news/item/index.html b/app/data/view/news/item/index.html index 482095450..79238b03e 100644 --- a/app/data/view/news/item/index.html +++ b/app/data/view/news/item/index.html @@ -9,8 +9,8 @@ - - + + {/block} diff --git a/app/data/view/news/mark/index.html b/app/data/view/news/mark/index.html index c1e4717f9..c3abef155 100644 --- a/app/data/view/news/mark/index.html +++ b/app/data/view/news/mark/index.html @@ -33,18 +33,21 @@ {if $vo.status eq 0}已禁用{elseif $vo.status eq 1}已激活{/if} {$vo.create_at|format_datetime} - {if auth("edit")} + 编 辑 - {/if} - {if auth("state") and $vo.status eq 1} + + + 禁 用 - {/if} - {if auth("state") and $vo.status eq 0} + + + 激 活 - {/if} - {if auth("remove")} + + + 删 除 - {/if} + {/foreach} diff --git a/app/data/view/shop/goods/form.html b/app/data/view/shop/goods/form.html index 757133f6b..516b07a9f 100644 --- a/app/data/view/shop/goods/form.html +++ b/app/data/view/shop/goods/form.html @@ -1,7 +1,7 @@ {extend name="../../admin/view/main"} {block name="content"} -{include file='shop_goods/formstyle'} +{include file='shop/goods/formstyle'}
diff --git a/app/data/view/shop/goods/index.html b/app/data/view/shop/goods/index.html index 2341d925b..3a9d6214e 100644 --- a/app/data/view/shop/goods/index.html +++ b/app/data/view/shop/goods/index.html @@ -15,8 +15,8 @@ {/if} - - + + {/block} diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index af06a114b..312745eae 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -834,12 +834,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "385e86100c264130347432a65e765b67bcabbc10" + "reference": "bf9ef59bb4f9a6e470c1792b229646148b9b7476" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/385e86100c264130347432a65e765b67bcabbc10", - "reference": "385e86100c264130347432a65e765b67bcabbc10", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/bf9ef59bb4f9a6e470c1792b229646148b9b7476", + "reference": "bf9ef59bb4f9a6e470c1792b229646148b9b7476", "shasum": "", "mirrors": [ { @@ -856,7 +856,7 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2021-03-24T02:12:51+00:00", + "time": "2021-03-27T06:55:32+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 522e47427..3a30d43e0 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/think-library/src/multiple/BuildUrl.php b/vendor/zoujingli/think-library/src/multiple/BuildUrl.php index 14ab9ad32..6687bff6c 100644 --- a/vendor/zoujingli/think-library/src/multiple/BuildUrl.php +++ b/vendor/zoujingli/think-library/src/multiple/BuildUrl.php @@ -16,7 +16,7 @@ declare (strict_types=1); namespace think\admin\multiple; -use think\helper\Str; +use think\admin\service\NodeService; use think\route\Url; /** @@ -48,7 +48,7 @@ class BuildUrl extends Url $action = empty($path) ? $request->action() : array_pop($path); $controller = empty($path) ? $request->controller() : array_pop($path); $app = empty($path) ? $this->app->http->getName() : array_pop($path); - $url = Str::snake($controller) . '/' . $action; + $url = NodeService::nameTolower($controller) . '/' . $action; $bind = $this->app->config->get('app.domain_bind', []); if ($key = array_search($app, $bind)) { isset($bind[$_SERVER['SERVER_NAME']]) && $domain = $_SERVER['SERVER_NAME']; @@ -62,7 +62,11 @@ class BuildUrl extends Url return $url; } - public function build() + /** + * Build URL + * @return string + */ + public function build(): string { $url = $this->url; $vars = $this->vars; diff --git a/vendor/zoujingli/think-library/src/service/NodeService.php b/vendor/zoujingli/think-library/src/service/NodeService.php index 08bb608aa..2ac6cab9f 100644 --- a/vendor/zoujingli/think-library/src/service/NodeService.php +++ b/vendor/zoujingli/think-library/src/service/NodeService.php @@ -31,7 +31,7 @@ class NodeService extends Service * @param string $name * @return string */ - public function nameTolower(string $name): string + public static function nameTolower(string $name): string { $dots = []; foreach (explode('.', strtr($name, '/', '.')) as $dot) { diff --git a/vendor/zoujingli/think-library/src/service/SystemService.php b/vendor/zoujingli/think-library/src/service/SystemService.php index 92377023e..e088f6b3e 100644 --- a/vendor/zoujingli/think-library/src/service/SystemService.php +++ b/vendor/zoujingli/think-library/src/service/SystemService.php @@ -18,7 +18,6 @@ declare (strict_types=1); namespace think\admin\service; use think\admin\Service; -use think\App; use think\db\Query; use think\helper\Str;