From 789635dc9be241b50b045f078c807a6242ed8ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Thu, 28 Jan 2021 11:22:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/ShopTruckTemplate.php       |  2 +-
 app/data/view/shop_goods/index_search.html      |  1 +
 .../view/shop_truck_template/index_search.html  | 17 ++++++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/data/controller/ShopTruckTemplate.php b/app/data/controller/ShopTruckTemplate.php
index c4251e4b5..a70a1b3bc 100644
--- a/app/data/controller/ShopTruckTemplate.php
+++ b/app/data/controller/ShopTruckTemplate.php
@@ -31,7 +31,7 @@ class ShopTruckTemplate extends Controller
     {
         $this->title = '快递邮费模板';
         $query = $this->_query($this->table);
-        $query->like('code,name')->dateBetween('create_at');
+        $query->like('code,name')->equal('status')->dateBetween('create_at');
         $query->where(['deleted' => 0])->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 f05517e84..e2e93bb40 100644
--- a/app/data/view/shop_goods/index_search.html
+++ b/app/data/view/shop_goods/index_search.html
@@ -61,6 +61,7 @@
                 </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>
diff --git a/app/data/view/shop_truck_template/index_search.html b/app/data/view/shop_truck_template/index_search.html
index 334f0de6a..62726fa01 100644
--- a/app/data/view/shop_truck_template/index_search.html
+++ b/app/data/view/shop_truck_template/index_search.html
@@ -1,6 +1,6 @@
 <fieldset>
     <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:url('')}" onsubmit="return false" method="get" autocomplete="off">
+    <form class="layui-form layui-form-pane form-search" action="{:url('index')}" onsubmit="return false" method="get" autocomplete="off">
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">模板编号</label>
             <label class="layui-input-inline">
@@ -15,6 +15,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="status">
+                    <option value=''>-- 全部状态 --</option>
+                    {foreach ['已禁用的模板','已激活的模板'] as $k=>$v}
+                    {if input('status','-') 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">