diff --git a/app/admin/view/base/index_search.html b/app/admin/view/base/index_search.html
index dea67b6b8..93a681359 100644
--- a/app/admin/view/base/index_search.html
+++ b/app/admin/view/base/index_search.html
@@ -1,45 +1,42 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:sysuri()}" onsubmit="return false" method="get" autocomplete="off">
+<form class="layui-form layui-form-pane form-search" action="{:sysuri()}" onsubmit="return false" method="get" autocomplete="off">
 
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">数据编码</label>
-            <div class="layui-input-inline">
-                <input name="code" value="{$get.code|default=''}" placeholder="请输入数据编码" class="layui-input">
-            </div>
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">数据编码</label>
+        <div class="layui-input-inline">
+            <input name="code" value="{$get.code|default=''}" placeholder="请输入数据编码" class="layui-input">
         </div>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">数据名称</label>
-            <div class="layui-input-inline">
-                <input name="name" value="{$get.name|default=''}" placeholder="请输入数据名称" class="layui-input">
-            </div>
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">数据名称</label>
+        <div class="layui-input-inline">
+            <input name="name" value="{$get.name|default=''}" placeholder="请输入数据名称" class="layui-input">
         </div>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">使用状态</label>
-            <div class="layui-input-inline">
-                <select class="layui-select" name="status">
-                    <option value=''>-- 状态 --</option>
-                    {foreach ['已禁用的权限','已激活的权限'] as $k=>$v}
-                    {if isset($get.status) and $get.status eq $k.""}
-                    <option selected value="{$k}">{$v}</option>
-                    {else}
-                    <option value="{$k}">{$v}</option>
-                    {/if}{/foreach}
-                </select>
-            </div>
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">使用状态</label>
+        <div class="layui-input-inline">
+            <select class="layui-select" name="status">
+                <option value=''>-- 状态 --</option>
+                {foreach ['已禁用的权限','已激活的权限'] as $k=>$v}
+                {if isset($get.status) and $get.status eq $k.""}
+                <option selected value="{$k}">{$v}</option>
+                {else}
+                <option value="{$k}">{$v}</option>
+                {/if}{/foreach}
+            </select>
         </div>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">创建时间</label>
-            <div class="layui-input-inline">
-                <input data-date-range name="create_at" value="{$get.create_at|default=''}" placeholder="请选择创建时间" class="layui-input">
-            </div>
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">创建时间</label>
+        <div class="layui-input-inline">
+            <input data-date-range name="create_at" value="{$get.create_at|default=''}" placeholder="请选择创建时间" class="layui-input">
         </div>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-</fieldset>
\ No newline at end of file
+    <div class="layui-form-item layui-inline">
+        <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/admin/view/oplog/index_search.html b/app/admin/view/oplog/index_search.html
index d16ad970c..4441fd853 100644
--- a/app/admin/view/oplog/index_search.html
+++ b/app/admin/view/oplog/index_search.html
@@ -16,13 +16,6 @@
             </div>
         </div>
 
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">操作节点</label>
-            <label class="layui-input-inline">
-                <input name="node" value="{$get.node|default=''}" placeholder="请输入操作内容" class="layui-input">
-            </label>
-        </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">操作行为</label>
             <div class="layui-input-inline">
@@ -37,6 +30,13 @@
             </div>
         </div>
 
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">操作节点</label>
+            <label class="layui-input-inline">
+                <input name="node" value="{$get.node|default=''}" placeholder="请输入操作内容" class="layui-input">
+            </label>
+        </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">操作描述</label>
             <label class="layui-input-inline">
diff --git a/app/admin/view/queue/index.html b/app/admin/view/queue/index.html
index a54b0e1f7..ceaa35917 100644
--- a/app/admin/view/queue/index.html
+++ b/app/admin/view/queue/index.html
@@ -23,7 +23,7 @@
 <div class="think-box-notify">
     <!--{if isset($super) and $super}-->
     <b>服务状态：</b><b class="margin-right-5" data-queue-message><span class="color-desc">检查中</span></b>
-    <b data-tips-text="点击可复制【任务服务启动指令】" class="layui-icon pointer margin-right-20" data-copy="{$command|default=''}">&#xe60e;</b>
+    <b data-tips-text="点击可复制【服务启动指令】" class="layui-icon pointer margin-right-20" data-copy="{$command|default=''}">&#xe60e;</b>
     <script>$('[data-queue-message]').load('{:sysuri("admin/api.queue/status")}');</script>
     <!--{/if}-->
     <b>任务统计：</b>待处理 <b class="color-text" data-extra="pre">{$total.pre|default=0}</b> 个任务，处理中 <b class="color-blue" data-extra="dos">{$total.dos|default=0}</b> 个任务，已完成 <b class="color-green" data-extra="oks">{$total.oks|default=0}</b> 个任务，已失败 <b class="color-red" data-extra="ers">{$total.ers|default=0}</b> 个任务。
diff --git a/app/admin/view/queue/index_search.html b/app/admin/view/queue/index_search.html
index 60a54064f..6762a175a 100644
--- a/app/admin/view/queue/index_search.html
+++ b/app/admin/view/queue/index_search.html
@@ -1,6 +1,7 @@
 <fieldset>
     <legend>条件搜索</legend>
     <form class="layui-form layui-form-pane form-search" action="{:sysuri()}" 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">
diff --git a/app/admin/view/user/index_search.html b/app/admin/view/user/index_search.html
index 4bcd66dde..60a2a66ec 100644
--- a/app/admin/view/user/index_search.html
+++ b/app/admin/view/user/index_search.html
@@ -1,68 +1,65 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:sysuri()}" onsubmit="return false" method="get" autocomplete="off">
+<form class="layui-form layui-form-pane form-search" action="{:sysuri()}" 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">
-                <input name="username" value="{$get.username|default=''}" placeholder="请输入登录账号" class="layui-input">
-            </label>
-        </div>
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">登录账号</label>
+        <label class="layui-input-inline">
+            <input name="username" value="{$get.username|default=''}" placeholder="请输入登录账号" class="layui-input">
+        </label>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">用户名称</label>
-            <label class="layui-input-inline">
-                <input name="nickname" value="{$get.nickname|default=''}" placeholder="请输入用户名称" class="layui-input">
-            </label>
-        </div>
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">用户名称</label>
+        <label class="layui-input-inline">
+            <input name="nickname" value="{$get.nickname|default=''}" placeholder="请输入用户名称" class="layui-input">
+        </label>
+    </div>
 
-        <!--{notempty name='bases'}-->
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">角色身份</label>
-            <div class="layui-input-inline">
-                <select name="usertype" lay-search class="layui-select">
-                    <option value=''>-- 全部 --</option>
-                    {foreach $bases as $base}{if $base.code eq input('get.usertype')}
-                    <option selected value="{$base.code|default=''}">{$base.name|default=''} ( {$base.code|default=''} )</option>
-                    {else}
-                    <option value="{$base.code|default=''}">{$base.name|default=''} ( {$base.code|default=''} )</option>
-                    {/if}{/foreach}
-                </select>
-            </div>
+    <!--{notempty name='bases'}-->
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">角色身份</label>
+        <div class="layui-input-inline">
+            <select name="usertype" lay-search class="layui-select">
+                <option value=''>-- 全部 --</option>
+                {foreach $bases as $base}{if $base.code eq input('get.usertype')}
+                <option selected value="{$base.code|default=''}">{$base.name|default=''} ( {$base.code|default=''} )</option>
+                {else}
+                <option value="{$base.code|default=''}">{$base.name|default=''} ( {$base.code|default=''} )</option>
+                {/if}{/foreach}
+            </select>
         </div>
-        <!--{/notempty}-->
+    </div>
+    <!--{/notempty}-->
 
-        <div class="layui-form-item layui-inline layui-hide">
-            <label class="layui-form-label">联系手机</label>
-            <label class="layui-input-inline">
-                <input name="phone" value="{$get.phone|default=''}" placeholder="请输入联系手机" class="layui-input">
-            </label>
-        </div>
+    <div class="layui-form-item layui-inline layui-hide">
+        <label class="layui-form-label">联系手机</label>
+        <label class="layui-input-inline">
+            <input name="phone" value="{$get.phone|default=''}" placeholder="请输入联系手机" class="layui-input">
+        </label>
+    </div>
 
-        <div class="layui-form-item layui-inline layui-hide">
-            <label class="layui-form-label">联系邮箱</label>
-            <label class="layui-input-inline">
-                <input name="mail" value="{$get.mail|default=''}" placeholder="请输入联系邮箱" class="layui-input">
-            </label>
-        </div>
+    <div class="layui-form-item layui-inline layui-hide">
+        <label class="layui-form-label">联系邮箱</label>
+        <label class="layui-input-inline">
+            <input name="mail" value="{$get.mail|default=''}" placeholder="请输入联系邮箱" class="layui-input">
+        </label>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">最后登录</label>
-            <div class="layui-input-inline">
-                <input data-date-range name="login_at" value="{$get.login_at|default=''}" placeholder="请选择登录时间" class="layui-input">
-            </div>
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">最后登录</label>
+        <div class="layui-input-inline">
+            <input data-date-range name="login_at" value="{$get.login_at|default=''}" placeholder="请选择登录时间" class="layui-input">
         </div>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">创建时间</label>
-            <div class="layui-input-inline">
-                <input data-date-range name="create_at" value="{$get.create_at|default=''}" placeholder="请选择创建时间" class="layui-input">
-            </div>
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">创建时间</label>
+        <div class="layui-input-inline">
+            <input data-date-range name="create_at" value="{$get.create_at|default=''}" placeholder="请选择创建时间" class="layui-input">
         </div>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <input type="hidden" name="type" value="{$type|default='index'}">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-</fieldset>
\ No newline at end of file
+    <div class="layui-form-item layui-inline">
+        <input type="hidden" name="type" value="{$type|default='index'}">
+        <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/data/controller/shop/Order.php b/app/data/controller/shop/Order.php
index bfde2aa72..514304840 100644
--- a/app/data/controller/shop/Order.php
+++ b/app/data/controller/shop/Order.php
@@ -61,11 +61,11 @@ class Order extends Controller
         if ($db->getOptions('where')) $query->whereRaw("order_no in {$db->field('order_no')->buildSql()}");
 
         // 用户搜索查询
-        $db = DataUser::mQuery()->like('phone#user_phone,nickname#user_nickname')->db();
+        $db = DataUser::mQuery()->like('phone|nickname#user_keys')->db();
         if ($db->getOptions('where')) $query->whereRaw("uuid in {$db->field('id')->buildSql()}");
 
         // 代理搜索查询
-        $db = DataUser::mQuery()->like('phone#from_phone,nickname#from_nickname')->db();
+        $db = DataUser::mQuery()->like('phone|nickname#from_keys')->db();
         if ($db->getOptions('where')) $query->whereRaw("puid1 in {$db->field('id')->buildSql()}");
 
         // 列表选项卡
@@ -89,8 +89,8 @@ class Order extends Controller
         UserAdminService::instance()->buildByUid($data);
         UserAdminService::instance()->buildByUid($data, 'puid1', 'from');
         OrderService::instance()->buildData($data);
-        foreach ($data as &$vo){
-            if (!is_null($vo['payment_type']) and ''!=$vo['payment_type']) {
+        foreach ($data as &$vo) {
+            if (!is_null($vo['payment_type']) and '' != $vo['payment_type']) {
                 $vo['payment_name'] = PaymentService::name($vo['payment_type']);
             }
         }
diff --git a/app/data/controller/shop/Send.php b/app/data/controller/shop/Send.php
index 53ac78c8e..961ca1279 100644
--- a/app/data/controller/shop/Send.php
+++ b/app/data/controller/shop/Send.php
@@ -46,7 +46,7 @@ class Send extends Controller
         $query->like('address_phone,address_name,address_province|address_city|address_area|address_content#address_content');
 
         // 用户搜索查询
-        $db = DataUser::mQuery()->like('phone#user_phone,nickname#user_nickname')->db();
+        $db = DataUser::mQuery()->like('phone|nickname#user_keys')->db();
         if ($db->getOptions('where')) $query->whereRaw("uuid in {$db->field('id')->buildSql()}");
 
         // 订单搜索查询
diff --git a/app/data/controller/user/Balance.php b/app/data/controller/user/Balance.php
index cd6df6271..6bc8be134 100644
--- a/app/data/controller/user/Balance.php
+++ b/app/data/controller/user/Balance.php
@@ -38,7 +38,7 @@ class Balance extends Controller
         // 创建查询对象
         $query = DataUserBalance::mQuery()->equal('name,upgrade');
         // 用户搜索查询
-        $db = DataUser::mQuery()->like('phone#user_phone,nickname#user_nickname')->db();
+        $db = DataUser::mQuery()->like('phone|nickname#user_keys')->db();
         if ($db->getOptions('where')) $query->whereRaw("uuid in {$db->field('id')->buildSql()}");
         // 数据查询分页
         $query->where(['deleted' => 0])->like('code,remark')->dateBetween('create_at')->order('id desc')->page();
diff --git a/app/data/view/base/discount/index.html b/app/data/view/base/discount/index.html
index b69b7c8dd..ec9f7a9a2 100644
--- a/app/data/view/base/discount/index.html
+++ b/app/data/view/base/discount/index.html
@@ -30,8 +30,8 @@
             sort: {field: 'sort desc,id', type: 'desc'},
             where: {type: '{$type|default="index"}'},
             cols: [[
-                {field: 'sort', title: '排序权重', align: 'center', width: 100, sort: true, templet: '#SortInputTpl'},
                 {field: 'id', title: 'ID', align: "center", width: 80},
+                {field: 'sort', title: '排序权重', align: 'center', width: 100, sort: true, templet: '#SortInputTpl'},
                 {field: 'name', title: '折扣名称', align: 'left', minWidth: 140},
                 {
                     field: 'items', title: '折扣方案', align: 'left', width: '33%', templet: function (d) {
diff --git a/app/data/view/base/payment/index_search.html b/app/data/view/base/payment/index_search.html
index a4d345f20..06bd5d50f 100644
--- a/app/data/view/base/payment/index_search.html
+++ b/app/data/view/base/payment/index_search.html
@@ -1,45 +1,42 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form action="{:sysuri()}" autocomplete="off" class="layui-form layui-form-pane form-search" method="get" onsubmit="return false">
+<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="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=''}">
-            </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=''}">
+        </label>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">支付方式</label>
-            <div class="layui-input-inline">
-                <select class="layui-select" name="ptype">
-                    <option value="">-- 全部 --</option>
-                    {foreach $types as $k=>$v}{if !empty($v['bind'])}
-                    {if isset($get.ptype) and $k eq $get.ptype}
-                    <option selected value="{$k}">{$v.name}</option>
-                    {else}
-                    <option value="{$k}">{$v.name}</option>
-                    {/if}{/if}{/foreach}
-                </select>
-            </div>
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">支付方式</label>
+        <div class="layui-input-inline">
+            <select class="layui-select" name="ptype">
+                <option value="">-- 全部 --</option>
+                {foreach $types as $k=>$v}{if !empty($v['bind'])}
+                {if isset($get.ptype) and $k eq $get.ptype}
+                <option selected value="{$k}">{$v.name}</option>
+                {else}
+                <option value="{$k}">{$v.name}</option>
+                {/if}{/if}{/foreach}
+            </select>
         </div>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">创建时间</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" data-date-range name="create_at" placeholder="请选择创建时间" value="{$get.create_at|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" data-date-range name="create_at" placeholder="请选择创建时间" value="{$get.create_at|default=''}">
+        </label>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-</fieldset>
\ No newline at end of file
+    <div class="layui-form-item layui-inline">
+        <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/data/view/base/postage/company/index_search.html b/app/data/view/base/postage/company/index_search.html
index e226ab65d..cf2e892ab 100644
--- a/app/data/view/base/postage/company/index_search.html
+++ b/app/data/view/base/postage/company/index_search.html
@@ -1,30 +1,27 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <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="name" placeholder="请输入快递名称" value="{$get.name|default=''}">
-            </label>
-        </div>
+<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="name" placeholder="请输入快递名称" value="{$get.name|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="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="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" data-date-range name="create_at" placeholder="请选择添加时间" value="{$get.create_at|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" data-date-range name="create_at" placeholder="请选择添加时间" value="{$get.create_at|default=''}">
+        </label>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <input name="type" type="hidden" value="{$type|default='index'}">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-</fieldset>
\ No newline at end of file
+    <div class="layui-form-item layui-inline">
+        <input name="type" type="hidden" value="{$type|default='index'}">
+        <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/data/view/base/postage/template/index_search.html b/app/data/view/base/postage/template/index_search.html
index 1d6294564..1b391ce5b 100644
--- a/app/data/view/base/postage/template/index_search.html
+++ b/app/data/view/base/postage/template/index_search.html
@@ -1,29 +1,26 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form action="{:url('index')}" 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>
+<form action="{:url('index')}" 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=''}">
-            </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=''}">
+        </label>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">添加时间</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" data-date-range name="create_at" placeholder="请选择添加时间" value="{$get.create_at|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" data-date-range name="create_at" placeholder="请选择添加时间" value="{$get.create_at|default=''}">
+        </label>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-</fieldset>
\ No newline at end of file
+    <div class="layui-form-item layui-inline">
+        <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/data/view/news/item/index_search.html b/app/data/view/news/item/index_search.html
index be436199a..0fb6a31b1 100644
--- a/app/data/view/news/item/index_search.html
+++ b/app/data/view/news/item/index_search.html
@@ -1,40 +1,36 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form action="{:sysuri()}" autocomplete="off" class="layui-form layui-form-pane form-search" method="get" onsubmit="return false">
+<form action="{:sysuri()}" autocomplete="off" class="layui-form layui-form-pane form-search" method="get" onsubmit="return false">
 
-        <!-- {notempty name='marks'} -->
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">文章标签</label>
-            <div class="layui-input-inline">
-                <select name="mark" lay-search class="layui-select">
-                    <option value=''>-- 文章标签 --</option>
-                    {foreach $marks as $mark}{if isset($get.mark) and $mark eq $get.mark}
-                    <option selected value="{$mark.name}">{$mark.name}</option>
-                    {else}
-                    <option value="{$mark.name}">{$mark.name}</option>
-                    {/if}{/foreach}
-                </select>
-            </div>
+    <!-- {notempty name='marks'} -->
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">文章标签</label>
+        <div class="layui-input-inline">
+            <select name="mark" lay-search class="layui-select">
+                <option value=''>-- 文章标签 --</option>
+                {foreach $marks as $mark}{if isset($get.mark) and $mark eq $get.mark}
+                <option selected value="{$mark.name}">{$mark.name}</option>
+                {else}
+                <option value="{$mark.name}">{$mark.name}</option>
+                {/if}{/foreach}
+            </select>
         </div>
-        <!-- {/notempty} -->
+    </div>
+    <!-- {/notempty} -->
 
-        <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=''}">
-            </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=''}">
+        </label>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">创建时间</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" data-date-range name="create_at" placeholder="请选择创建时间" value="{$get.create_at|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" data-date-range name="create_at" placeholder="请选择创建时间" value="{$get.create_at|default=''}">
+        </label>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-
-</fieldset>
\ No newline at end of file
+    <div class="layui-form-item layui-inline">
+        <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/data/view/shop/goods/index_search.html b/app/data/view/shop/goods/index_search.html
index 952507114..d34936e22 100644
--- a/app/data/view/shop/goods/index_search.html
+++ b/app/data/view/shop/goods/index_search.html
@@ -1,116 +1,113 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <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>
+<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=''}">
-            </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=''}">
+        </label>
+    </div>
 
-        <!--{notempty name='marks'}-->
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">商品标签</label>
+    <!--{notempty name='marks'}-->
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">商品标签</label>
+        <label class="layui-input-inline">
+            <select class="layui-select" lay-search name="marks">
+                <option value="">-- 全部标签 --</option>
+                {foreach $marks as $mark}{if input('marks','') eq $mark}
+                <option selected value="{$mark}">{$mark}</option>
+                {else}
+                <option value="{$mark}">{$mark}</option>
+                {/if}{/foreach}
+            </select>
+        </label>
+    </div>
+    <!--{/notempty}-->
+
+    <!--{notempty name='cates'}-->
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">商品分类</label>
+        <div class="layui-input-inline">
             <label class="layui-input-inline">
-                <select class="layui-select" lay-search name="marks">
-                    <option value="">-- 全部标签 --</option>
-                    {foreach $marks as $mark}{if input('marks','') eq $mark}
-                    <option selected value="{$mark}">{$mark}</option>
+                <select class="layui-select" lay-search name="cateids">
+                    <option value="">-- 全部分类 --</option>
+                    {foreach $cates as $cate}{if input('cateids') eq $cate.id}
+                    <option selected value="{$cate.id}">{$cate.spl}{$cate.name|default=''}</option>
                     {else}
-                    <option value="{$mark}">{$mark}</option>
+                    <option value="{$cate.id}">{$cate.spl}{$cate.name|default=''}</option>
                     {/if}{/foreach}
                 </select>
             </label>
         </div>
-        <!--{/notempty}-->
+    </div>
+    <!--{/notempty}-->
 
-        <!--{notempty name='cates'}-->
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">商品分类</label>
-            <div class="layui-input-inline">
-                <label class="layui-input-inline">
-                    <select class="layui-select" lay-search name="cateids">
-                        <option value="">-- 全部分类 --</option>
-                        {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>
-                        {/if}{/foreach}
-                    </select>
-                </label>
-            </div>
-        </div>
-        <!--{/notempty}-->
+    <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">
-                <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">
+            <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">
-                <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">
+            <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="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">
-            <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>
-    </form>
-</fieldset>
+    <div class="layui-form-item layui-inline">
+        <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/data/view/shop/order/index_search.html b/app/data/view/shop/order/index_search.html
index 71f59d43c..e9aabdab9 100644
--- a/app/data/view/shop/order/index_search.html
+++ b/app/data/view/shop/order/index_search.html
@@ -1,137 +1,120 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form action="{:sysuri()}" autocomplete="off" class="layui-form layui-form-pane form-search" method="get" onsubmit="return false">
+<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="user_phone" placeholder="请输入用户手机" value="{$get.user_phone|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="user_keys" placeholder="请输入手机或昵称" value="{$get.user_keys|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="user_nickname" placeholder="请输入用户昵称" value="{$get.user_nickname|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="from_keys" placeholder="请输入手机或昵称" value="{$get.from_keys|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="from_phone" placeholder="请输入用户手机" value="{$get.from_phone|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="order_no" placeholder="请输入订单单号" value="{$get.order_no|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="from_nickname" placeholder="请输入用户昵称" value="{$get.from_nickname|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="truck_send_number" placeholder="请输入发货单号" value="{$get.truck_send_number|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="order_no" placeholder="请输入订单单号" value="{$get.order_no|default=''}">
-            </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 ['1'=>'预购订单','2'=>'等待支付','3'=>'等待审核','4'=>'等待发货','5'=>'已经发货','6'=>'已经完成','0'=>'已经取消'] 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">
-                <input class="layui-input" name="truck_send_number" placeholder="请输入发货单号" value="{$get.truck_send_number|default=''}">
-            </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="payment_status">
+                <option value=''>-- 全部 --</option>
+                {foreach ['0'=>'等待支付','1'=>'已经支付'] as $k=>$v}
+                {if input('payment_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">
-                <select class="layui-select" name="status">
-                    <option value=''>- 全部订单 -</option>
-                    {foreach ['1'=>'预购订单','2'=>'等待支付','3'=>'等待审核','4'=>'等待发货','5'=>'已经发货','6'=>'已经完成','0'=>'已经取消'] 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">
+            <select class="layui-select" name="payment_type">
+                <option value=''>-- 全部 --</option>
+                {foreach $payments as $k=>$v}
+                {if input('payment_type') eq $k.''}
+                <option selected value="{$k}">{$v.name}</option>
+                {else}
+                <option value="{$k}">{$v.name}</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="payment_status">
-                    <option value=''>-- 全部 --</option>
-                    {foreach ['0'=>'等待支付','1'=>'已经支付'] as $k=>$v}
-                    {if input('payment_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">
+            <input class="layui-input" data-date-range name="create_at" placeholder="请选择下单时间" value="{$get.create_at|default=''}">
+        </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="payment_type">
-                    <option value=''>-- 全部 --</option>
-                    {foreach $payments as $k=>$v}
-                    {if input('payment_type') eq $k.''}
-                    <option selected value="{$k}">{$v.name}</option>
-                    {else}
-                    <option value="{$k}">{$v.name}</option>
-                    {/if}{/foreach}
-                </select>
-            </label>
-        </div>
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">支付时间</label>
+        <label class="layui-input-inline">
+            <input class="layui-input" data-date-range name="payment_datetime" placeholder="请选择支付时间" value="{$get.payment_datetime|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" data-date-range name="create_at" placeholder="请选择下单时间" value="{$get.create_at|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="truck_address_name" placeholder="请输入收货姓名" value="{$get.truck_address_name|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" data-date-range name="payment_datetime" placeholder="请选择支付时间" value="{$get.payment_datetime|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="truck_address_phone" placeholder="请输入收货手机" value="{$get.truck_address_phone|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="truck_address_name" placeholder="请输入收货姓名" value="{$get.truck_address_name|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="truck_address_content" placeholder="请输入收货省份" value="{$get.truck_address_content|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="truck_address_phone" placeholder="请输入收货手机" value="{$get.truck_address_phone|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="truck_address_content" placeholder="请输入收货省份" value="{$get.truck_address_content|default=''}">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary" type="submit"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-            <button class="layui-btn layui-btn-primary" data-form-export="{:url('index')}?type={$type|default=''}" type="button">
-                <i class="layui-icon layui-icon-export"></i> 导 出
-            </button>
-        </div>
-    </form>
-</fieldset>
+    <div class="layui-form-item layui-inline">
+        <button class="layui-btn layui-btn-primary" type="submit"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+        <button class="layui-btn layui-btn-primary" data-form-export="{:url('index')}?type={$type|default=''}" type="button">
+            <i class="layui-icon layui-icon-export"></i> 导 出
+        </button>
+    </div>
+</form>
 
 <script>
     require(['excel'], function (excel) {
diff --git a/app/data/view/shop/send/index_search.html b/app/data/view/shop/send/index_search.html
index 3032aed92..94d8105a1 100644
--- a/app/data/view/shop/send/index_search.html
+++ b/app/data/view/shop/send/index_search.html
@@ -1,92 +1,83 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <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="user_phone" placeholder="请输入用户手机" value="{$get.user_phone|default=''}">
-            </label>
-        </div>
+<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="user_nickname" placeholder="请输入用户昵称" value="{$get.user_nickname|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="user_keys" placeholder="请输入手机或昵称" value="{$get.user_keys|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="order_no" placeholder="请输入订单单号" value="{$get.order_no|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="order_no" placeholder="请输入订单单号" value="{$get.order_no|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="truck_number" placeholder="请输入发货单号" value="{$get.truck_number|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="truck_number" placeholder="请输入发货单号" value="{$get.truck_number|default=''}">
+        </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">
+            <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">
-                <input class="layui-input" data-date-range name="address_datetime" placeholder="请选择提交时间" value="{$get.address_datetime|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" data-date-range name="address_datetime" placeholder="请选择提交时间" value="{$get.address_datetime|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" data-date-range name="send_datetime" placeholder="请选择发货时间" value="{$get.send_datetime|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" data-date-range name="send_datetime" placeholder="请选择发货时间" value="{$get.send_datetime|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="address_name" placeholder="请输入收货姓名" value="{$get.address_name|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="address_name" placeholder="请输入收货姓名" value="{$get.address_name|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="address_phone" placeholder="请输入收货手机" value="{$get.address_phone|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="address_phone" placeholder="请输入收货手机" value="{$get.address_phone|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="address_content" placeholder="请输入配送地址" value="{$get.address_content|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="address_content" placeholder="请输入配送地址" value="{$get.address_content|default=''}">
+        </label>
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary" type="submit"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-            <button class="layui-btn layui-btn-primary" data-form-export="{:url('index')}?type={$type|default=''}" type="button">
-                <i class="layui-icon layui-icon-export"></i> 导 出
-            </button>
-        </div>
-    </form>
-</fieldset>
+    <div class="layui-form-item layui-inline">
+        <button class="layui-btn layui-btn-primary" type="submit"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+        <button class="layui-btn layui-btn-primary" data-form-export="{:url('index')}?type={$type|default=''}" type="button">
+            <i class="layui-icon layui-icon-export"></i> 导 出
+        </button>
+    </div>
+</form>
 
 <script>
     require(['excel'], function (excel) {
diff --git a/app/data/view/user/admin/index_search.html b/app/data/view/user/admin/index_search.html
index d849f4953..4ba62c42c 100644
--- a/app/data/view/user/admin/index_search.html
+++ b/app/data/view/user/admin/index_search.html
@@ -1,97 +1,93 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <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="phone" placeholder="请输入用户手机" value="{$get.phone|default=''}">
-            </label>
-        </div>
+<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="phone" placeholder="请输入用户手机" value="{$get.phone|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="username" placeholder="请输入用户昵称" value="{$get.username|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="username" placeholder="请输入用户昵称" value="{$get.username|default=''}">
+        </label>
+    </div>
 
-        <!--{notempty name='upgrades'}-->
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">用户等级</label>
-            <div class="layui-input-inline">
-                <select class="layui-select" name="vip_code">
-                    <option value="">-- 全部 --</option>
-                    {foreach $upgrades as $upgrade}{if input('vip_code') eq $upgrade.number.''}
-                    <option selected value="{$upgrade.number|default=0}">[ VIP{$upgrade.number|default='0'} ] {$upgrade.name|default=''}</option>
-                    {else}
-                    <option value="{$upgrade.number|default=0}">[ VIP{$upgrade.number|default='0'} ] {$upgrade.name|default=''}</option>
-                    {/if}{/foreach}
-                </select>
-            </div>
+    <!--{notempty name='upgrades'}-->
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">用户等级</label>
+        <div class="layui-input-inline">
+            <select class="layui-select" name="vip_code">
+                <option value="">-- 全部 --</option>
+                {foreach $upgrades as $upgrade}{if input('vip_code') eq $upgrade.number.''}
+                <option selected value="{$upgrade.number|default=0}">[ VIP{$upgrade.number|default='0'} ] {$upgrade.name|default=''}</option>
+                {else}
+                <option value="{$upgrade.number|default=0}">[ VIP{$upgrade.number|default='0'} ] {$upgrade.name|default=''}</option>
+                {/if}{/foreach}
+            </select>
         </div>
-        <!--{/notempty}-->
+    </div>
+    <!--{/notempty}-->
 
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">代理手机</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" name="from_phone" placeholder="请输入代理手机" value="{$get.from_phone|default=''}">
-            </label>
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">代理手机</label>
+        <label class="layui-input-inline">
+            <input class="layui-input" name="from_phone" placeholder="请输入代理手机" value="{$get.from_phone|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="from_username" placeholder="请输入代理昵称" value="{$get.from_username|default=''}">
+        </label>
+    </div>
+
+    <!--{notempty name='upgrades'}-->
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">代理等级</label>
+        <div class="layui-input-inline">
+            <select class="layui-select" name="from_vipcode">
+                <option value="">-- 全部 --</option>
+                {foreach $upgrades as $upgrade}{if input('from_vipcode') eq $upgrade.number.''}
+                <option selected value="{$upgrade.number|default=0}">[ VIP{$upgrade.number|default='0'} ] {$upgrade.name|default=''}</option>
+                {else}
+                <option value="{$upgrade.number|default=0}">[ VIP{$upgrade.number|default='0'} ] {$upgrade.name|default=''}</option>
+                {/if}{/foreach}
+            </select>
         </div>
+    </div>
+    <!--{/notempty}-->
 
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">代理昵称</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" name="from_username" placeholder="请输入代理昵称" value="{$get.from_username|default=''}">
-            </label>
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">使用状态</label>
+        <div class="layui-input-inline">
+            <select class="layui-select" name="status">
+                <option value="">-- 全部 --</option>
+                {foreach ['已冻结的用户', '已激活的用户'] as $k=>$v}
+                {if $k.'' eq input('status')}
+                <option selected value="{$k}">{$v}</option>
+                {else}
+                <option value="{$k}">{$v}</option>
+                {/if}{/foreach}
+            </select>
         </div>
+    </div>
 
-        <!--{notempty name='upgrades'}-->
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">代理等级</label>
-            <div class="layui-input-inline">
-                <select class="layui-select" name="from_vipcode">
-                    <option value="">-- 全部 --</option>
-                    {foreach $upgrades as $upgrade}{if input('from_vipcode') eq $upgrade.number.''}
-                    <option selected value="{$upgrade.number|default=0}">[ VIP{$upgrade.number|default='0'} ] {$upgrade.name|default=''}</option>
-                    {else}
-                    <option value="{$upgrade.number|default=0}">[ VIP{$upgrade.number|default='0'} ] {$upgrade.name|default=''}</option>
-                    {/if}{/foreach}
-                </select>
-            </div>
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">注册时间</label>
+        <div class="layui-input-inline">
+            <input class="layui-input" data-date-range name="create_at" placeholder="请选择注册时间" value="{$get.create_at|default=''}">
         </div>
-        <!--{/notempty}-->
+    </div>
 
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">使用状态</label>
-            <div class="layui-input-inline">
-                <select class="layui-select" name="status">
-                    <option value="">-- 全部 --</option>
-                    {foreach ['已冻结的用户', '已激活的用户'] as $k=>$v}
-                    {if $k.'' eq input('status')}
-                    <option selected value="{$k}">{$v}</option>
-                    {else}
-                    <option value="{$k}">{$v}</option>
-                    {/if}{/foreach}
-                </select>
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">注册时间</label>
-            <div class="layui-input-inline">
-                <input class="layui-input" data-date-range name="create_at" placeholder="请选择注册时间" value="{$get.create_at|default=''}">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-            <button class="layui-btn layui-btn-primary" data-form-export="{:url('index')}?type={$type}" type="button">
-                <i class="layui-icon layui-icon-export"></i> 导 出
-            </button>
-        </div>
-    </form>
-
-</fieldset>
+    <div class="layui-form-item layui-inline">
+        <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+        <button class="layui-btn layui-btn-primary" data-form-export="{:url('index')}?type={$type}" type="button">
+            <i class="layui-icon layui-icon-export"></i> 导 出
+        </button>
+    </div>
+</form>
 
 <script>
     require(['excel'], function (excel) {
diff --git a/app/data/view/user/balance/index.html b/app/data/view/user/balance/index.html
index 2e61c5fbf..932595c69 100644
--- a/app/data/view/user/balance/index.html
+++ b/app/data/view/user/balance/index.html
@@ -8,11 +8,11 @@
 
 {block name="content"}
 <div class="think-box-notify">
-    余额统计：累计已充值余额 <b>{$balance.0|default=0.00|number_format}</b> 元，已使用 <b>{$balance.1|default=0.00|number_format}</b> 元，剩余可使用 <b>{$balance.0-$balance.1|number_format}</b> 元。
+    <b>余额统计：</b>累计已充值余额 <b>{$balance.0|default=0.00|number_format}</b> 元，已使用 <b>{$balance.1|default=0.00|number_format}</b> 元，剩余可使用 <b>{$balance.0-$balance.1|number_format}</b> 元。
 </div>
-<div class="think-box-shadow margin-top-10">
+<div class="think-box-shadow">
     {include file='user/balance/index_search'}
-    <table class="layui-table margin-top-10" lay-skin="line">
+    <table class="layui-table" lay-skin="line">
         {notempty name='list'}
         <thead>
         <tr>
diff --git a/app/data/view/user/balance/index_search.html b/app/data/view/user/balance/index_search.html
index f3e34523b..1ab81cfbf 100644
--- a/app/data/view/user/balance/index_search.html
+++ b/app/data/view/user/balance/index_search.html
@@ -1,17 +1,11 @@
 <fieldset>
     <legend>条件搜索</legend>
     <form action="{$request->url()}" 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="user_phone" placeholder="请输入用户手机" value="{$get.user_phone|default=''}">
-            </label>
-        </div>
 
         <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">用户昵称</label>
+            <label class="layui-form-label">用户名称</label>
             <label class="layui-input-inline">
-                <input class="layui-input" name="user_nickname" placeholder="请输入用户昵称" value="{$get.user_nickname|default=''}">
+                <input class="layui-input" name="user_keys" placeholder="请输入手机或昵称" value="{$get.user_keys|default=''}">
             </label>
         </div>