From 4aca36f2851c14d9ed7eab0f54cade36e76ba5bf 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, 20 Mar 2021 18:16:46 +0800
Subject: [PATCH] =?UTF-8?q?CompoerUpdate=20&=20=E4=BF=AE=E6=94=B9like?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/ShopGoods.php                         | 2 +-
 app/data/view/shop_goods/index_search.html                | 8 ++++----
 vendor/composer/installed.json                            | 8 ++++----
 vendor/services.php                                       | 2 +-
 vendor/zoujingli/think-library/src/helper/QueryHelper.php | 5 +++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/data/controller/ShopGoods.php b/app/data/controller/ShopGoods.php
index a6a882fb8..d69e60fe0 100644
--- a/app/data/controller/ShopGoods.php
+++ b/app/data/controller/ShopGoods.php
@@ -51,7 +51,7 @@ class ShopGoods extends Controller
         elseif ($this->type === 'recycle') $query->where(['deleted' => 1]);
         else $this->error("无法加载 {$this->type} 数据列表！");
         // 列表排序并显示
-        $query->like('code,name')->like('cate,mark', ',');
+        $query->like('code,name')->like('marks,cateids', ',');
         $query->equal('status,vip_entry,truck_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 6089d0395..fe727ae15 100644
--- a/app/data/view/shop_goods/index_search.html
+++ b/app/data/view/shop_goods/index_search.html
@@ -19,9 +19,9 @@
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">商品标签</label>
             <label class="layui-input-inline">
-                <select class="layui-select" name="mark" lay-search>
+                <select class="layui-select" name="marks" lay-search>
                     <option value="">-- 全部标签 --</option>
-                    {foreach $marks as $mark}{if input('mark','') eq $mark}
+                    {foreach $marks as $mark}{if input('marks','') eq $mark}
                     <option selected value="{$mark}">{$mark}</option>
                     {else}
                     <option value="{$mark}">{$mark}</option>
@@ -36,9 +36,9 @@
             <label class="layui-form-label">商品分类</label>
             <div class="layui-input-inline">
                 <label class="layui-input-inline">
-                    <select class="layui-select" name="cate" lay-search>
+                    <select class="layui-select" name="cateids" lay-search>
                         <option value="">-- 全部分类 --</option>
-                        {foreach $cates as $cate}{if input('cate') eq $cate.id}
+                        {foreach $cates as $cate}{if input('cateids') eq $cate.id}
                         <option selected value="{$cate.id}">{$cate.spl}{$cate.name|default=''}</option>
                         {else}
                         <option value="{$cate.id}">{$cate.spl}{$cate.name|default=''}</option>
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 57e76e2b6..f09a9d646 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -834,12 +834,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "efcabe5c0e1f0d87f92a4b67dfdd024a632b4578"
+            "reference": "111780326730bce8f7103d09a97de741d23a8fc7"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/efcabe5c0e1f0d87f92a4b67dfdd024a632b4578",
-            "reference": "efcabe5c0e1f0d87f92a4b67dfdd024a632b4578",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/111780326730bce8f7103d09a97de741d23a8fc7",
+            "reference": "111780326730bce8f7103d09a97de741d23a8fc7",
             "shasum": "",
             "mirrors": [
                 {
@@ -856,7 +856,7 @@
             "ext-mbstring": "*",
             "topthink/framework": "^6.0"
         },
-        "time": "2021-03-20T06:18:37+00:00",
+        "time": "2021-03-20T09:21:53+00:00",
         "type": "library",
         "extra": {
             "think": {
diff --git a/vendor/services.php b/vendor/services.php
index 250cc4137..d97a9f836 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2021-03-20 17:50:03
+// This file is automatically generated at:2021-03-20 18:14:47
 declare (strict_types = 1);
 return array (
   0 => 'think\\admin\\Library',
diff --git a/vendor/zoujingli/think-library/src/helper/QueryHelper.php b/vendor/zoujingli/think-library/src/helper/QueryHelper.php
index 8a52e981b..0e9934aed 100644
--- a/vendor/zoujingli/think-library/src/helper/QueryHelper.php
+++ b/vendor/zoujingli/think-library/src/helper/QueryHelper.php
@@ -60,11 +60,12 @@ class QueryHelper extends Helper
     /**
      * 设置 Like 查询条件
      * @param string|array $fields 查询字段
+     * @param string $split 前后分割符
      * @param array|string|null $input 输入数据
      * @param string $alias 别名分割符
      * @return $this
      */
-    public function like($fields, $input = null, string $alias = '#'): QueryHelper
+    public function like($fields, string $split = '', $input = null, string $alias = '#'): QueryHelper
     {
         $data = $this->_getInputData($input ?: $this->input);
         foreach (is_array($fields) ? $fields : explode(',', $fields) as $field) {
@@ -73,7 +74,7 @@ class QueryHelper extends Helper
                 [$dk, $qk] = explode($alias, $field);
             }
             if (isset($data[$qk]) && $data[$qk] !== '') {
-                $this->query->whereLike($dk, "%{$data[$qk]}%");
+                $this->query->whereLike($dk, "%{$split}{$data[$qk]}{$split}%");
             }
         }
         return $this;