From 831a852b4cf203a6ce8ee04c450b132f57a1e8cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Sun, 15 May 2022 13:47:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/shop/Goods.php         | 2 +-
 app/data/view/shop/goods/index_search.html | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/data/controller/shop/Goods.php b/app/data/controller/shop/Goods.php
index 3435160e3..c4e226db3 100644
--- a/app/data/controller/shop/Goods.php
+++ b/app/data/controller/shop/Goods.php
@@ -43,7 +43,7 @@ class Goods extends Controller
         else $this->error("无法加载 {$this->type} 数据列表！");
 
         // 列表排序并显示
-        $query->like('code,name')->like('marks,cateids', ',');
+        $query->like('code|name#name')->like('marks,cateids', ',');
         $query->equal('status,vip_entry,truck_type,rebate_type')->order('sort desc,id desc')->page();
     }
 
diff --git a/app/data/view/shop/goods/index_search.html b/app/data/view/shop/goods/index_search.html
index d34936e22..46691cffb 100644
--- a/app/data/view/shop/goods/index_search.html
+++ b/app/data/view/shop/goods/index_search.html
@@ -1,15 +1,9 @@
 <form action="{:sysuri()}" autocomplete="off" class="layui-form layui-form-pane form-search" method="get" onsubmit="return false">
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">商品编号</label>
-        <label class="layui-input-inline">
-            <input class="layui-input" name="code" placeholder="请输入商品编号" value="{$get.code|default=''}">
-        </label>
-    </div>
 
     <div class="layui-form-item layui-inline">
         <label class="layui-form-label">商品名称</label>
         <label class="layui-input-inline">
-            <input class="layui-input" name="name" placeholder="请输入商品名称" value="{$get.name|default=''}">
+            <input class="layui-input" name="name" placeholder="请输入编号或名称" value="{$get.name|default=''}">
         </label>
     </div>