From d555b925245da05a837b42b952f90c034574a001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Wed, 24 Mar 2021 16:52:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E8=BF=94?=
 =?UTF-8?q?=E5=88=A9?=
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.html        |  3 ++-
 app/data/view/shop_goods/index_search.html | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/data/controller/ShopGoods.php b/app/data/controller/ShopGoods.php
index a08dce82a..dd5929005 100644
--- a/app/data/controller/ShopGoods.php
+++ b/app/data/controller/ShopGoods.php
@@ -54,7 +54,7 @@ class ShopGoods extends Controller
         else $this->error("无法加载 {$this->type} 数据列表！");
         // 列表排序并显示
         $query->like('code,name')->like('marks,cateids', ',');
-        $query->equal('status,vip_entry,truck_type')->order('sort desc,id desc')->page();
+        $query->equal('status,vip_entry,truck_type,rebate_type')->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 82fc1d62b..41dcdc29e 100644
--- a/app/data/view/shop_goods/index.html
+++ b/app/data/view/shop_goods/index.html
@@ -84,7 +84,8 @@
                     <div>
                         {eq name='vo.status' value='0'}<span class="layui-badge">已下架</span>{else}<span class="layui-badge layui-bg-green">销售中</span>{/eq}
                         {eq name='vo.vip_entry' value='0'}<span class="layui-badge layui-bg-blue">非入会礼包</span>{else}<span class="layui-badge layui-bg-green">是入会礼包</span>{/eq}
-                        {eq name='vo.truck_type' value='0'}<span class="layui-badge layui-bg-blue">无需快递配送</span>{else}<span class="layui-badge layui-bg-green">需要快递配送</span>{/eq}
+                        {eq name='vo.truck_type' value='0'}<span class="layui-badge layui-bg-blue">无需发货</span>{else}<span class="layui-badge layui-bg-green">需要发货</span>{/eq}
+                        {eq name='vo.rebate_type' value='0'}<span class="layui-badge layui-bg-blue">非返利商品</span>{else}<span class="layui-badge layui-bg-green">是返利商品</span>{/eq}
                     </div>
                 </td>
                 <td class='nowrap sub-strong-blue'>
diff --git a/app/data/view/shop_goods/index_search.html b/app/data/view/shop_goods/index_search.html
index fe727ae15..6ab6ab150 100644
--- a/app/data/view/shop_goods/index_search.html
+++ b/app/data/view/shop_goods/index_search.html
@@ -64,6 +64,21 @@
             </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="rebate_type">
+                    <option value=''>-- 全部状态 --</option>
+                    {foreach ['非返利的商品','是返利的商品'] as $k=>$v}
+                    {if input('rebate_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">
             <label class="layui-form-label">入会礼包</label>
             <label class="layui-input-inline">