From bc7b48748c814879487d7ce4279f0ed17625f460 Mon Sep 17 00:00:00 2001 From: Anyon Date: Thu, 31 Dec 2020 16:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/data/view/news_item/form.html | 16 +++++++++----- app/data/view/news_item/index.html | 21 ++++++++++--------- app/data/view/news_item/index_search.html | 9 ++++++-- app/data/view/news_item/select_search.html | 3 +++ app/data/view/news_mark/form.html | 3 +++ app/data/view/news_mark/index.html | 5 +++-- app/data/view/news_mark/index_search.html | 5 ++++- app/data/view/payment/index.html | 4 ++-- app/data/view/shop_goods_mark/index.html | 4 ++-- app/data/view/store_item/index.html | 4 ++-- app/data/view/store_used/index.html | 4 ++-- app/data/view/store_user/index.html | 4 ++-- app/wechat/view/keys/index.html | 4 ++-- vendor/composer/installed.json | 8 +++---- vendor/services.php | 2 +- .../think-library/src/command/Database.php | 2 +- .../think-library/src/command/Install.php | 5 +++++ .../think-library/src/command/Queue.php | 2 +- .../think-library/src/command/Replace.php | 3 ++- .../think-library/src/command/Version.php | 1 + vendor/zoujingli/think-library/src/common.php | 14 ++++++------- 21 files changed, 76 insertions(+), 47 deletions(-) diff --git a/app/data/view/news_item/form.html b/app/data/view/news_item/form.html index aca9dab91..59ad92f54 100644 --- a/app/data/view/news_item/form.html +++ b/app/data/view/news_item/form.html @@ -14,6 +14,7 @@ {/if}{/foreach} +
文章封面 Conver Image @@ -23,16 +24,19 @@
+ + +
富文本内容 Article Content @@ -50,10 +54,12 @@
- + + + {/block} \ No newline at end of file diff --git a/app/data/view/news_item/index.html b/app/data/view/news_item/index.html index b696e0b65..48499fd56 100644 --- a/app/data/view/news_item/index.html +++ b/app/data/view/news_item/index.html @@ -4,6 +4,7 @@ + @@ -20,7 +21,7 @@ - + @@ -38,7 +39,7 @@ {foreach $list as $key=>$vo} - + @@ -50,21 +51,21 @@ {$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} + diff --git a/app/data/view/news_item/index_search.html b/app/data/view/news_item/index_search.html index 1cc46e5aa..de8bb342e 100644 --- a/app/data/view/news_item/index_search.html +++ b/app/data/view/news_item/index_search.html @@ -7,17 +7,20 @@ +
+
+
+
- + \ No newline at end of file diff --git a/app/data/view/news_item/select_search.html b/app/data/view/news_item/select_search.html index eee714492..7643216e9 100644 --- a/app/data/view/news_item/select_search.html +++ b/app/data/view/news_item/select_search.html @@ -7,6 +7,7 @@ +
@@ -20,12 +21,14 @@
+
+
diff --git a/app/data/view/news_mark/form.html b/app/data/view/news_mark/form.html index e75eac2c2..43af590bf 100644 --- a/app/data/view/news_mark/form.html +++ b/app/data/view/news_mark/form.html @@ -6,6 +6,7 @@ 必填，请填写分类名称（如：系统管理），建议字符不要太长，一般4-6个汉字 +
标签描述 Mark Remark @@ -14,8 +15,10 @@
+
{notempty name='vo.id'}{/notempty} +
diff --git a/app/data/view/news_mark/index.html b/app/data/view/news_mark/index.html index 48c25d7ed..ef279db96 100644 --- a/app/data/view/news_mark/index.html +++ b/app/data/view/news_mark/index.html @@ -4,6 +4,7 @@ + @@ -20,7 +21,7 @@ - + @@ -36,7 +37,7 @@ {foreach $list as $key=>$vo} - + diff --git a/app/data/view/news_mark/index_search.html b/app/data/view/news_mark/index_search.html index a764e0445..6624355a3 100644 --- a/app/data/view/news_mark/index_search.html +++ b/app/data/view/news_mark/index_search.html @@ -7,6 +7,7 @@
+
@@ -20,16 +21,18 @@
+
+
+ - \ No newline at end of file diff --git a/app/data/view/payment/index.html b/app/data/view/payment/index.html index 1548d458a..3bafb06c6 100644 --- a/app/data/view/payment/index.html +++ b/app/data/view/payment/index.html @@ -21,7 +21,7 @@ - + @@ -39,7 +39,7 @@ {foreach $list as $key=>$vo} - + diff --git a/app/data/view/shop_goods_mark/index.html b/app/data/view/shop_goods_mark/index.html index 02f7ffb09..f92a414cc 100644 --- a/app/data/view/shop_goods_mark/index.html +++ b/app/data/view/shop_goods_mark/index.html @@ -16,7 +16,7 @@ - + @@ -32,7 +32,7 @@ {foreach $list as $key=>$vo} - + diff --git a/app/data/view/store_item/index.html b/app/data/view/store_item/index.html index b5f487988..c1c53e437 100644 --- a/app/data/view/store_item/index.html +++ b/app/data/view/store_item/index.html @@ -18,7 +18,7 @@ - + @@ -34,7 +34,7 @@ {foreach $list as $key=>$vo} - + diff --git a/app/data/view/store_used/index.html b/app/data/view/store_used/index.html index 316919b6c..822053083 100644 --- a/app/data/view/store_used/index.html +++ b/app/data/view/store_used/index.html @@ -18,7 +18,7 @@ - + @@ -34,7 +34,7 @@ {foreach $list as $key=>$vo} - + diff --git a/app/data/view/store_user/index.html b/app/data/view/store_user/index.html index 564f1fae7..40b13b28e 100644 --- a/app/data/view/store_user/index.html +++ b/app/data/view/store_user/index.html @@ -18,7 +18,7 @@ - + @@ -34,7 +34,7 @@ {foreach $list as $key=>$vo} - + diff --git a/app/wechat/view/keys/index.html b/app/wechat/view/keys/index.html index 6014441cb..0a1ed1eda 100644 --- a/app/wechat/view/keys/index.html +++ b/app/wechat/view/keys/index.html @@ -17,7 +17,7 @@ - + @@ -35,7 +35,7 @@ {foreach $list as $key=>$vo} - + diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 917f2dc76..038799909 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -869,12 +869,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "975974b2bd11ba8f6a866f9f8ee76692a69b7f3b" + "reference": "ae31a4bd263b73a818552a73a4ae4404c93d722a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/975974b2bd11ba8f6a866f9f8ee76692a69b7f3b", - "reference": "975974b2bd11ba8f6a866f9f8ee76692a69b7f3b", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ae31a4bd263b73a818552a73a4ae4404c93d722a", + "reference": "ae31a4bd263b73a818552a73a4ae4404c93d722a", "shasum": "", "mirrors": [ { @@ -891,7 +891,7 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2020-12-29T03:20:12+00:00", + "time": "2020-12-29T08:25:34+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 513685850..bb1052212 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/think-library/src/command/Database.php b/vendor/zoujingli/think-library/src/command/Database.php index 24e30568c..60e671736 100644 --- a/vendor/zoujingli/think-library/src/command/Database.php +++ b/vendor/zoujingli/think-library/src/command/Database.php @@ -39,7 +39,7 @@ class Database extends Command /** * @param Input $input * @param Output $output - * @return mixed + * @return void */ public function execute(Input $input, Output $output): void { diff --git a/vendor/zoujingli/think-library/src/command/Install.php b/vendor/zoujingli/think-library/src/command/Install.php index ac1df3f1c..0e86fc233 100644 --- a/vendor/zoujingli/think-library/src/command/Install.php +++ b/vendor/zoujingli/think-library/src/command/Install.php @@ -92,6 +92,11 @@ class Install extends Command $this->setDescription("Source code Install and Update for ThinkAdmin"); } + /** + * @param Input $input + * @param Output $output + * @return void + */ protected function execute(Input $input, Output $output) { $this->name = trim($input->getArgument('name')); diff --git a/vendor/zoujingli/think-library/src/command/Queue.php b/vendor/zoujingli/think-library/src/command/Queue.php index 0a82e2386..333063726 100644 --- a/vendor/zoujingli/think-library/src/command/Queue.php +++ b/vendor/zoujingli/think-library/src/command/Queue.php @@ -64,7 +64,7 @@ class Queue extends Command * 执行指令内容 * @param Input $input * @param Output $output - * @return mixed + * @return void */ public function execute(Input $input, Output $output) { diff --git a/vendor/zoujingli/think-library/src/command/Replace.php b/vendor/zoujingli/think-library/src/command/Replace.php index 82ff478c4..955109fdf 100644 --- a/vendor/zoujingli/think-library/src/command/Replace.php +++ b/vendor/zoujingli/think-library/src/command/Replace.php @@ -42,8 +42,9 @@ class Replace extends Command * 执行指令 * @param Input $input * @param Output $output - * @throws \think\admin\Exception + * @return void * @throws \think\db\exception\DbException + * @throws \think\admin\Exception */ protected function execute(Input $input, Output $output) { diff --git a/vendor/zoujingli/think-library/src/command/Version.php b/vendor/zoujingli/think-library/src/command/Version.php index b1174daa9..d5fb7028f 100644 --- a/vendor/zoujingli/think-library/src/command/Version.php +++ b/vendor/zoujingli/think-library/src/command/Version.php @@ -37,6 +37,7 @@ class Version extends Command /** * @param Input $input * @param Output $output + * @return void */ protected function execute(Input $input, Output $output) { diff --git a/vendor/zoujingli/think-library/src/common.php b/vendor/zoujingli/think-library/src/common.php index d5e401891..b483f4fb7 100644 --- a/vendor/zoujingli/think-library/src/common.php +++ b/vendor/zoujingli/think-library/src/common.php @@ -54,7 +54,7 @@ if (!function_exists('sysuri')) { * @param boolean|string $domain 域名 * @return string */ - function sysuri(string $url = '', array $vars = [], $suffix = true, $domain = false) + function sysuri(string $url = '', array $vars = [], $suffix = true, $domain = false): string { return SystemService::instance()->sysuri($url, $vars, $suffix, $domain); } @@ -136,7 +136,7 @@ if (!function_exists('sysoplog')) { * @param string $content 日志内容 * @return boolean */ - function sysoplog(string $action, string $content) + function sysoplog(string $action, string $content): bool { return SystemService::instance()->setOplog($action, $content); } @@ -167,7 +167,7 @@ if (!function_exists('arr2str')) { * @param null|array $allow 限定规则 * @return string */ - function arr2str(array $data, string $separ = ',', ?array $allow = null) + function arr2str(array $data, string $separ = ',', ?array $allow = null): string { if (is_array($allow)) foreach ($data as $key => $item) { if (!in_array($item, $allow)) unset($data[$key]); @@ -258,7 +258,7 @@ if (!function_exists('data_save')) { * @param array $data 需要保存或更新的数据 * @param string $key 条件主键限制 * @param array $where 其它的where条件 - * @return boolean + * @return boolean|integer * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException @@ -290,9 +290,9 @@ if (!function_exists('format_datetime')) { * 日期格式标准输出 * @param int|string $datetime 输入日期 * @param string $format 输出格式 - * @return false|string + * @return string */ - function format_datetime($datetime, $format = 'Y年m月d日 H:i:s') + function format_datetime($datetime, $format = 'Y年m月d日 H:i:s'): string { if (empty($datetime)) return '-'; if (is_numeric($datetime)) { @@ -310,7 +310,7 @@ if (!function_exists('down_file')) { * @param integer $expire 强制本地存储时间 * @return string */ - function down_file(string $source, bool $force = false, int $expire = 0) + function down_file(string $source, bool $force = false, int $expire = 0): string { return Storage::down($source, $force, $expire)['url'] ?? $source; }