修改模板文件

app/admin/view/base/index_search.html

@@ -1,5 +1,3 @@
-<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">
@@ -42,4 +40,3 @@
         <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
     </div>
 </form>
-</fieldset>

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">

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> 个任务。

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">

app/admin/view/user/index_search.html

@@ -1,5 +1,3 @@
-<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">
@@ -65,4 +63,3 @@
         <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
     </div>
 </form>
-</fieldset>

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()}");
 
         // 列表选项卡

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()}");
 
         // 订单搜索查询

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();

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) {

app/data/view/base/payment/index_search.html

@@ -1,5 +1,3 @@
-<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">
@@ -42,4 +40,3 @@
         <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
     </div>
 </form>
-</fieldset>

app/data/view/base/postage/company/index_search.html

@@ -1,5 +1,3 @@
-<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>
@@ -27,4 +25,3 @@
         <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
     </div>
 </form>
-</fieldset>

app/data/view/base/postage/template/index_search.html

@@ -1,5 +1,3 @@
-<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>
@@ -26,4 +24,3 @@
         <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
     </div>
 </form>
-</fieldset>

app/data/view/news/item/index_search.html

@@ -1,5 +1,3 @@
-<fieldset>
-    <legend>条件搜索</legend>
 <form action="{:sysuri()}" autocomplete="off" class="layui-form layui-form-pane form-search" method="get" onsubmit="return false">
 
     <!-- {notempty name='marks'} -->
@@ -36,5 +34,3 @@
         <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
     </div>
 </form>
-
-</fieldset>

app/data/view/shop/goods/index_search.html

@@ -1,5 +1,3 @@
-<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>
@@ -113,4 +111,3 @@
         <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
     </div>
 </form>
-</fieldset>

app/data/view/shop/order/index_search.html

@@ -1,32 +1,16 @@
-<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-form-label">订单用户</label>
         <label class="layui-input-inline">
-                <input class="layui-input" name="user_phone" placeholder="请输入用户手机" value="{$get.user_phone|default=''}">
+            <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-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="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="from_nickname" placeholder="请输入用户昵称" value="{$get.from_nickname|default=''}">
         </label>
     </div>
 
@@ -131,7 +115,6 @@
         </button>
     </div>
 </form>
-</fieldset>
 
 <script>
     require(['excel'], function (excel) {

app/data/view/shop/send/index_search.html

@@ -1,17 +1,9 @@
-<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>
 
     <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>
 
@@ -86,7 +78,6 @@
         </button>
     </div>
 </form>
-</fieldset>
 
 <script>
     require(['excel'], function (excel) {

app/data/view/user/admin/index_search.html

@@ -1,5 +1,3 @@
-<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>
@@ -91,8 +89,6 @@
     </div>
 </form>
 
-</fieldset>
-
 <script>
     require(['excel'], function (excel) {
         excel.bind(function (data) {

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>

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>