diff --git a/app/data/controller/news/Item.php b/app/data/controller/news/Item.php index 5882665e4..92af063f7 100644 --- a/app/data/controller/news/Item.php +++ b/app/data/controller/news/Item.php @@ -32,8 +32,8 @@ class Item extends Controller $this->title = '文章内容管理'; $this->marks = DataNewsMark::items(); }, function (QueryHelper $query) { + $query->like('code,name')->like('mark', ',')->dateBetween('create_at'); $query->where(['status' => intval($this->type === 'index'), 'deleted' => 0]); - $query->like('name')->like('mark', ',')->dateBetween('create_at'); }); } diff --git a/app/data/view/news/item/form.html b/app/data/view/news/item/form.html index 5318546da..c73057bac 100644 --- a/app/data/view/news/item/form.html +++ b/app/data/view/news/item/form.html @@ -6,7 +6,7 @@
- 资讯标签News Mark + 文章标签News Mark
{foreach $marks as $tag}{if isset($vo.mark) && is_array($vo.mark) && in_array($tag.name, $vo.mark)} @@ -18,22 +18,22 @@
- 资讯封面News Conver + 文章封面News Conver
- +
- 资讯内容News Content + 文章内容News Content
diff --git a/app/data/view/news/item/index.html b/app/data/view/news/item/index.html index 926e5f1a2..6d8e78b64 100644 --- a/app/data/view/news/item/index.html +++ b/app/data/view/news/item/index.html @@ -2,18 +2,18 @@ {block name="button"} - + - + {/block} {block name="content"}
    - {foreach ['index'=>'资讯管理','recycle'=>'回 收 站'] as $k=>$v}{if isset($type) and $type eq $k} + {foreach ['index'=>'文章管理','recycle'=>'回 收 站'] as $k=>$v}{if isset($type) and $type eq $k}
  • {$v}
  • {else}
  • {$v}
  • @@ -40,14 +40,14 @@ {field: 'id', title: 'ID', align: "left", width: 80}, /* {notempty name='marks'} */ { - field: 'mark', title: '资讯标签', align: 'left', minWidth: 100, templet: function (d) { + field: 'mark', title: '文章标签', align: 'left', minWidth: 100, templet: function (d) { return (d.html = ''), d.mark.forEach(function (val) { d.html += '' + val + ''; }), d.html; } }, /* {/marks} */ - {field: 'name', title: '资讯标题', align: 'left', minWidth: 140}, + {field: 'name', title: '文章标题', align: 'left', minWidth: 140}, {field: 'num_read', title: '阅读数', align: 'center', minWidth: 80, sort: true, style: 'color:blue;font-size:16px'}, {field: 'status', title: '状态', align: 'center', minWidth: 110, templet: '#StatusSwitchTpl'}, {field: 'create_at', title: '创建时间', align: 'center', minWidth: 170, sort: true}, @@ -92,7 +92,7 @@ - 删 除 + 删 除 {/block} \ No newline at end of file diff --git a/app/data/view/news/item/index_search.html b/app/data/view/news/item/index_search.html index 91284e5b6..0ac0aeb4a 100644 --- a/app/data/view/news/item/index_search.html +++ b/app/data/view/news/item/index_search.html @@ -4,10 +4,10 @@
    - +
    +
    - -
    - -
    + +
    diff --git a/app/data/view/news/item/select.html b/app/data/view/news/item/select.html index 059968d13..c3a9e9ed4 100644 --- a/app/data/view/news/item/select.html +++ b/app/data/view/news/item/select.html @@ -5,10 +5,10 @@