From 4c31c22ddc0de286cddfc09f8a743d65b954543d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Sat, 16 Apr 2022 23:07:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E9=97=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/model/DataNewsItem.php     | 12 ++++++++++--
 app/data/view/news/item/select.html | 22 ++++++++++++++++------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/app/data/model/DataNewsItem.php b/app/data/model/DataNewsItem.php
index 4210d941a..7a3fe2347 100644
--- a/app/data/model/DataNewsItem.php
+++ b/app/data/model/DataNewsItem.php
@@ -5,11 +5,19 @@ namespace app\data\model;
 use think\admin\Model;
 
 /**
- *
+ * 新闻内容模型
  * Class DataNewsItem
  * @package app\data\model
  */
 class DataNewsItem extends Model
 {
-
+    /**
+     * 格式化创建时间
+     * @param string $value
+     * @return string
+     */
+    public function getCreateAtAttr(string $value): string
+    {
+        return format_datetime($value);
+    }
 }
\ No newline at end of file
diff --git a/app/data/view/news/item/select.html b/app/data/view/news/item/select.html
index c3a9e9ed4..a463a3cc4 100644
--- a/app/data/view/news/item/select.html
+++ b/app/data/view/news/item/select.html
@@ -4,19 +4,21 @@
         <legend>条件搜索</legend>
         <form action="{:sysuri()}" id="NewsTableSearch" autocomplete="off" class="layui-form layui-form-pane form-search" method="get" onsubmit="return false">
 
+            <!-- {notempty name='marks'} -->
             <div class="layui-form-item layui-inline">
                 <label class="layui-form-label">文章标签</label>
                 <div class="layui-input-inline">
-                    <select name="mark" class="layui-select" lay-search>
+                    <select name="mark" lay-search class="layui-select">
                         <option value=''>-- 文章标签 --</option>
-                        {foreach $marks as $mark}{if isset($get.mark) and $mark.code eq $get.mark}
-                        <option selected value="{$mark.code}">{$mark.name} ( {$mark.code} )</option>
+                        {foreach $marks as $mark}{if isset($get.mark) and $mark eq $get.mark}
+                        <option selected value="{$mark.name}">{$mark.name}</option>
                         {else}
-                        <option value="{$mark.code}">{$mark.name} ( {$mark.code} )</option>
+                        <option value="{$mark.name}">{$mark.name}</option>
                         {/if}{/foreach}
                     </select>
                 </div>
             </div>
+            <!-- {/notempty} -->
 
             <div class="layui-form-item layui-inline">
                 <label class="layui-form-label">文章标题</label>
@@ -50,9 +52,17 @@
             sort: {field: 'sort desc,id', type: 'desc'},
             cols: [[
                 {field: 'id', title: 'ID', align: 'center', width: 60, sort: true},
-                {field: 'mark', title: '文章标签', align: 'center', width: 100},
+                /* {notempty name='marks'} */
+                {
+                    field: 'mark', title: '文章标签', align: 'left', minWidth: 100, templet: function (d) {
+                        return (d.html = ''), d.mark.forEach(function (val) {
+                            d.html += '<span class="layui-badge layui-bg-blue">' + val + '</span>';
+                        }), d.html;
+                    }
+                },
+                /* {/marks} */
                 {field: 'name', title: '文章标题', align: 'left', minWidth: 140},
-                {field: 'num_read', title: '阅读数', align: 'center', width: 80, sort: true, style: 'color:blue;font-size:16px'},
+                {field: 'num_read', title: '阅读数', align: 'center', width: 85, sort: true, style: 'color:blue;font-size:16px'},
                 {field: 'status', title: '状态', align: 'center', width: 80, templet: '#StatusSwitchTpl'},
                 {field: 'create_at', title: '创建时间', align: 'center', width: 170, sort: true},
                 {toolbar: '#toolbar', title: '操作', align: 'center', width: 100}