From d4e9c0ed21bb71fb6f32de8e1945f570fa5c2e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Tue, 16 Mar 2021 16:23:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
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 | 30 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/app/data/controller/ShopGoods.php b/app/data/controller/ShopGoods.php
index 961396a17..e6ef36298 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,marks,cateids')->equal('status');
+        $query->like('code,name,marks,cateids')->equal('status,vip_entry,truck_type');
         $query->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 c8877b50c..b1b91eecc 100644
--- a/app/data/view/shop_goods/index_search.html
+++ b/app/data/view/shop_goods/index_search.html
@@ -62,6 +62,36 @@
             </label>
         </div>
 
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">入会礼包</label>
+            <label class="layui-input-inline">
+                <select class="layui-select" name="vip_entry">
+                    <option value=''>-- 全部状态 --</option>
+                    {foreach ['非入会礼包','是入会礼包'] as $k=>$v}
+                    {if input('vip_entry','-') eq $k.''}
+                    <option selected value="{$k}">{$v}</option>
+                    {else}
+                    <option value="{$k}">{$v}</option>
+                    {/if}{/foreach}
+                </select>
+            </label>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">物流发货</label>
+            <label class="layui-input-inline">
+                <select class="layui-select" name="truck_type">
+                    <option value=''>-- 全部状态 --</option>
+                    {foreach ['无需物流发货','需要物流发货'] as $k=>$v}
+                    {if input('truck_type','-') eq $k.''}
+                    <option selected value="{$k}">{$v}</option>
+                    {else}
+                    <option value="{$k}">{$v}</option>
+                    {/if}{/foreach}
+                </select>
+            </label>
+        </div>
+
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>