-
+
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 @@
+
+
创建时间
+
搜 索
+
-
\ 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;
}