From 6d3237bf894b9e85f7ed7182f38e712bab789338 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 9 Sep 2020 14:19:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/NewsItem.php    | 2 +-
 app/data/view/shop_goods/index.html | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/data/controller/NewsItem.php b/app/data/controller/NewsItem.php
index 1d2871a30..c70d1ebc6 100644
--- a/app/data/controller/NewsItem.php
+++ b/app/data/controller/NewsItem.php
@@ -29,7 +29,7 @@ class NewsItem extends Controller
     {
         $this->title = '文章内容管理';
         $query = $this->_query($this->table);
-        $query->like('title,mark')->dateBetween('create_at');
+        $query->like('mark,title')->dateBetween('create_at');
         $query->where(['deleted' => 0])->order('sort desc,id desc')->page();
     }
 
diff --git a/app/data/view/shop_goods/index.html b/app/data/view/shop_goods/index.html
index 44cf444d3..cf4703d5b 100644
--- a/app/data/view/shop_goods/index.html
+++ b/app/data/view/shop_goods/index.html
@@ -39,7 +39,6 @@
                 </th>
                 <th class='text-left nowrap' style="width:400px">商品信息</th>
                 <th class='text-left nowrap' style="width:150px"></th>
-                <th class='text-left nowrap' style="width:200px">商品状态</th>
                 <th></th>
             </tr>
             </thead>
@@ -63,14 +62,11 @@
                     </div>
                 </td>
                 <td class='nowrap'>
-                    入会礼包：{if empty($vo.vip_mod)}<span class=" color-red">否</span>{else}<span class="color-blue">是</span> [ <span class="color-blue">{$vo.vip_level|default='0'}</span> ]{/if}<br>
+                    销售状态：{eq name='vo.status' value='0'}<span class="layui-badge">已下架</span>{else}<span class="layui-badge layui-bg-green">销售中</span>{/eq}<br>
                     所属分类：{$vo.cate.name|default='-'}<br>
                 </td>
                 <td class='nowrap'>
-                    销售状态：{eq name='vo.status' value='0'}<span class="layui-badge">已下架</span>{else}<span class="layui-badge layui-bg-green">销售中</span>{/eq}<br>
-                    剩余库存：<span class="color-blue">{$vo.stock_total-$vo.stock_sales} 件 ( 已售 {$vo.stock_sales} 件 )</span><br>
-                </td>
-                <td class='nowrap'>
+                    剩余库存 <span class="color-blue">{$vo.stock_total-$vo.stock_sales} 件 ( 已售 {$vo.stock_sales} 件 )</span><br>
                     <!--{if auth("edit")}-->
                     <a data-dbclick class="layui-btn layui-btn-xs" data-open='{:url("edit")}?code={$vo.code}'>编 辑</a>
                     <!--{else}-->