修改模板文件

app/data/view/news_item/form.html

@@ -14,6 +14,7 @@
                 {/if}{/foreach}
             </div>
         </div>
+
         <div class="layui-form-item relative block">
             <span class="color-green font-w7 label-required-prev">文章封面</span>
             <span class="color-desc margin-left-5">Conver Image</span>
@@ -23,16 +24,19 @@
                 <script>$('[name="cover"]').uploadOneImage()</script>
             </label>
         </div>
+
         <label class="layui-form-item relative block">
             <span class="color-green font-w7">文章标题</span>
             <span class="color-desc margin-left-5">Article Name</span>
             <input required name="name" value='{$vo.name|default=""}' placeholder="请输入文章标题" class="layui-input">
         </label>
+
         <label class="layui-form-item relative block">
             <span class="color-green font-w7">简介描述</span>
             <span class="color-desc margin-left-5">Article Remark</span>
             <textarea required class="layui-textarea" placeholder="请输入简介描述" name="remark">{$vo.remark|default=''}</textarea>
         </label>
+
         <div class="layui-form-item relative block">
             <span class="color-green font-w7 label-required-prev">富文本内容</span>
             <span class="color-desc margin-left-5">Article Content</span>
@@ -50,10 +54,12 @@
             <button type='button' class="layui-btn layui-btn-danger" data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
         </div>
     </div>
-    <script>
+
-        require(['ckeditor'], function () {
-            window.createEditor('[name=content]', {height: 300});
-        });
-    </script>
 </form>
+
+<script>
+    require(['ckeditor'], function () {
+        window.createEditor('[name=content]', {height: 300});
+    });
+</script>
 {/block}

app/data/view/news_item/index.html

@@ -4,6 +4,7 @@
 <!--{if auth("add")}-->
 <button data-open='{:url("add")}' data-title="添加文章内容" class='layui-btn layui-btn-sm layui-btn-primary'>添加文章</button>
 <!--{/if}-->
+
 <!--{if auth("remove")}-->
 <button data-action='{:url("remove")}' data-rule="id#{key}" data-confirm="确定要删除这些文章吗？" class='layui-btn layui-btn-sm layui-btn-primary'>删除文章</button>
 <!--{/if}-->
@@ -20,7 +21,7 @@
         <thead>
         <tr>
             <th class='list-table-check-td think-checkbox'>
-                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'/></label>
+                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
             </th>
             <th class='list-table-sort-td'>
                 <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
@@ -38,7 +39,7 @@
         {foreach $list as $key=>$vo}
         <tr>
             <td class='list-table-check-td think-checkbox'>
-                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'/></label>
+                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
             </td>
             <td class='list-table-sort-td'>
                 <label><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></label>
@@ -50,21 +51,21 @@
             <td class="text-left nowrap">{$vo.create_at|format_datetime}</td>
             <td class='text-left nowrap'>
 
-                {if auth("edit")}
+                <!--{if auth("edit")}-->
                 <a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑文章文章" data-open="{:url('edit')}?id={$vo.id}">编 辑</a>
-                {/if}
+                <!--{/if}-->
 
-                {if auth("state") and $vo.status eq 1}
+                <!--{if auth("state") and $vo.status eq 1}-->
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0">禁 用</a>
-                {/if}
+                <!--{/if}-->
 
-                {if auth("state") and $vo.status eq 0}
+                <!--{if auth("state") and $vo.status eq 0}-->
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1">激 活</a>
-                {/if}
+                <!--{/if}-->
 
-                {if auth("remove")}
+                <!--{if auth("remove")}-->
                 <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该文章吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}">删 除</a>
-                {/if}
+                <!--{/if}-->
 
             </td>
         </tr>

app/data/view/news_item/index_search.html

@@ -7,17 +7,20 @@
                 <input name="name" value="{:input('name','')}" placeholder="请输入文章标题" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">搜索标签</label>
             <label class="layui-input-inline">
                 <input name="mark" value="{:input('mark','')}" placeholder="请输入搜索标签" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">使用状态</label>
             <div class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    {foreach [''=>'-- 全部 --','0'=>'显示禁止的文章','1'=>'显示正常的文章'] as $k=>$v}
+                    <option value=''>-- 全部 --</option>
+                    {foreach ['显示禁止的文章', '显示正常的文章'] as $k=>$v}
                     {if $k.'' eq input('status')}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -26,16 +29,18 @@
                 </select>
             </div>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">创建时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择创建时间" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>
     </form>
-</fieldset>
 
+</fieldset>
 <script>window.form.render()</script>

app/data/view/news_item/select_search.html

@@ -7,6 +7,7 @@
                 <input name="name" value="{:input('name','')}" placeholder="请输入文章标题" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">使用状态</label>
             <div class="layui-input-inline">
@@ -20,12 +21,14 @@
                 </select>
             </div>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">创建时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择创建时间" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>

app/data/view/news_mark/form.html

@@ -6,6 +6,7 @@
             <input class="layui-input" required placeholder="请输入标签名称" name="name" value="{$vo.name|default=''}"/>
             <span class="help-block"><b>必填，</b>请填写分类名称（如：系统管理），建议字符不要太长，一般4-6个汉字</span>
         </label>
+
         <div class="layui-form-item relative block">
             <span class="color-green font-w7">标签描述</span>
             <span class="color-desc margin-left-5">Mark Remark</span>
@@ -14,8 +15,10 @@
             </label>
         </div>
     </div>
+
     <div class="hr-line-dashed"></div>
     {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
+
     <div class="layui-form-item text-center">
         <button class="layui-btn" type='submit'>保存数据</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>

app/data/view/news_mark/index.html

@@ -4,6 +4,7 @@
 <!--{if auth("add")}-->
 <button data-modal='{:url("add")}' data-title="添加标签" class='layui-btn layui-btn-sm layui-btn-primary'>添加标签</button>
 <!--{/if}-->
+
 <!--{if auth("remove")}-->
 <button data-action='{:url("remove")}' data-rule="id#{key}" data-confirm="确定要删除这些标签吗？" class='layui-btn layui-btn-sm layui-btn-primary'>删除标签</button>
 <!--{/if}-->
@@ -20,7 +21,7 @@
         <thead>
         <tr>
             <th class='list-table-check-td think-checkbox'>
-                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'/></label>
+                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
             </th>
             <th class='list-table-sort-td'>
                 <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
@@ -36,7 +37,7 @@
         {foreach $list as $key=>$vo}
         <tr data-dbclick>
             <td class='list-table-check-td think-checkbox'>
-                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'/></label>
+                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
             </td>
             <td class='list-table-sort-td'>
                 <label><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></label>

app/data/view/news_mark/index_search.html

@@ -7,6 +7,7 @@
                 <input name="name" value="{:input('name','')}" placeholder="请输入标签名称" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">使用状态</label>
             <div class="layui-input-inline">
@@ -20,16 +21,18 @@
                 </select>
             </div>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">创建时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择创建时间" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>
     </form>
 </fieldset>
+<script>window.form.render()</script>
 
-<script>window.form.render()</script>

app/data/view/payment/index.html

@@ -21,7 +21,7 @@
         <thead>
         <tr>
             <th class='list-table-check-td think-checkbox'>
-                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'/></label>
+                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
             </th>
             <th class='list-table-sort-td'>
                 <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
@@ -39,7 +39,7 @@
         {foreach $list as $key=>$vo}
         <tr data-dbclick>
             <td class='list-table-check-td think-checkbox'>
-                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'/></label>
+                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
             </td>
             <td class='list-table-sort-td'>
                 <label><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></label>

app/data/view/shop_goods_mark/index.html

@@ -16,7 +16,7 @@
         <thead>
         <tr>
             <th class='list-table-check-td think-checkbox'>
-                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'/></label>
+                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
             </th>
             <th class='list-table-sort-td'>
                 <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
@@ -32,7 +32,7 @@
         {foreach $list as $key=>$vo}
         <tr data-dbclick>
             <td class='list-table-check-td think-checkbox'>
-                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'/></label>
+                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
             </td>
             <td class='list-table-sort-td'>
                 <label><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></label>

app/data/view/store_item/index.html

@@ -18,7 +18,7 @@
         <thead>
         <tr>
             <th class='list-table-check-td think-checkbox'>
-                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'/></label>
+                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
             </th>
             <th class='list-table-sort-td'>
                 <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
@@ -34,7 +34,7 @@
         {foreach $list as $key=>$vo}
         <tr data-dbclick>
             <td class='list-table-check-td think-checkbox'>
-                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'/></label>
+                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
             </td>
             <td class='list-table-sort-td'>
                 <label><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></label>

app/data/view/store_used/index.html

@@ -18,7 +18,7 @@
         <thead>
         <tr>
             <th class='list-table-check-td think-checkbox'>
-                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'/></label>
+                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
             </th>
             <th class='list-table-sort-td'>
                 <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
@@ -34,7 +34,7 @@
         {foreach $list as $key=>$vo}
         <tr data-dbclick>
             <td class='list-table-check-td think-checkbox'>
-                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'/></label>
+                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
             </td>
             <td class='list-table-sort-td'>
                 <label><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></label>

app/data/view/store_user/index.html

@@ -18,7 +18,7 @@
         <thead>
         <tr>
             <th class='list-table-check-td think-checkbox'>
-                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'/></label>
+                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
             </th>
             <th class='list-table-sort-td'>
                 <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
@@ -34,7 +34,7 @@
         {foreach $list as $key=>$vo}
         <tr data-dbclick>
             <td class='list-table-check-td think-checkbox'>
-                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'/></label>
+                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
             </td>
             <td class='list-table-sort-td'>
                 <label><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></label>

app/wechat/view/keys/index.html

@@ -17,7 +17,7 @@
         <thead>
         <tr>
             <th class='list-table-check-td think-checkbox'>
-                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'/></label>
+                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
             </th>
             <th class='list-table-sort-td'>
                 <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
@@ -35,7 +35,7 @@
         {foreach $list as $key=>$vo}
         <tr>
             <td class='list-table-check-td think-checkbox'>
-                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'/></label>
+                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
             </td>
             <td class='list-table-sort-td'>
                 <label><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></label>

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",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ae31a4bd263b73a818552a73a4ae4404c93d722a",
-            "reference": "975974b2bd11ba8f6a866f9f8ee76692a69b7f3b",
+            "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": {

vendor/services.php

@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-12-29 14:10:02
+// This file is automatically generated at:2020-12-31 14:17:27
 declare (strict_types = 1);
 return array (
   0 => 'think\\admin\\Library',

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
     {

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'));

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)
     {

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)
     {

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)
     {

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;
     }