diff --git a/app/data/controller/user/Admin.php b/app/data/controller/user/Admin.php
index d8fa0194d..65b5acd1a 100644
--- a/app/data/controller/user/Admin.php
+++ b/app/data/controller/user/Admin.php
@@ -50,11 +50,11 @@ class Admin extends Controller
         elseif ($this->type === 'o') $query->whereNotIn('vip_code', array_keys($ls));
 
         // 用户搜索查询
-        $db = DataUser::mQuery()->equal('vip_code#from_vipcode')->like('phone#from_phone,username|nickname#from_username')->db();
+        $db = DataUser::mQuery()->equal('vip_code#from_vipcode')->like('phone|username|nickname#from_keys')->db();
         if ($db->getOptions('where')) $query->whereRaw("pid1 in {$db->field('id')->buildSql()}");
 
         // 数据查询分页
-        $query->like('phone,username|nickname#username')->equal('status,vip_code')->dateBetween('create_at')->page();
+        $query->like('phone|username|nickname#username')->equal('status,vip_code')->dateBetween('create_at')->page();
     }
 
     /**
diff --git a/app/data/view/user/admin/index.html b/app/data/view/user/admin/index.html
index 39a85bfba..e22110eff 100644
--- a/app/data/view/user/admin/index.html
+++ b/app/data/view/user/admin/index.html
@@ -34,8 +34,8 @@
                 <th class='list-table-check-td think-checkbox'>
                     <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
                 </th>
-                <th class='nowrap'>用户信息</th>
-                <th class='nowrap'>代理信息</th>
+                <th class='nowrap'>会员用户</th>
+                <th class='nowrap'>代理用户</th>
                 <th class='nowrap'>余额统计</th>
                 <th class='nowrap'>返利统计</th>
                 <th class='nowrap'>团队统计</th>
diff --git a/app/data/view/user/admin/index_search.html b/app/data/view/user/admin/index_search.html
index 4ba62c42c..13e2fe1a1 100644
--- a/app/data/view/user/admin/index_search.html
+++ b/app/data/view/user/admin/index_search.html
@@ -1,15 +1,9 @@
 <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-form-label">会员用户</label>
         <label class="layui-input-inline">
-            <input class="layui-input" name="username" placeholder="请输入用户昵称" value="{$get.username|default=''}">
+            <input class="layui-input" name="username" placeholder="请输入手机或昵称" value="{$get.username|default=''}">
         </label>
     </div>
 
@@ -30,16 +24,9 @@
     <!--{/notempty}-->
 
     <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="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=''}">
+            <input class="layui-input" name="from_keys" placeholder="请输入手机或昵称" value="{$get.from_keys|default=''}">
         </label>
     </div>
 
@@ -92,24 +79,68 @@
 <script>
     require(['excel'], function (excel) {
         excel.bind(function (data) {
-            var items = [];
-            items.push(['用户编号', '小程序OPENID', '公众号OPNID', '用户姓名', '用户等级', '累计充值余额', '已使用余额', '累计返利金额', '锁定返利金额', '已提现金额', '注册时间']);
-            data.forEach(function (item) {
-                items.push([
+
+            // 设置表格内容
+            data.forEach(function (item, index) {
+                data[index] = [
                     {v: item.id, t: 'n'},
-                    item.openid1,
-                    item.openid2,
+                    item.openid1 || '-',
+                    item.openid2 || '-',
                     item.username || item.nickname || '',
-                    item.vip_name,
-                    {v: item.balance_total, t: 'n'},
-                    {v: item.balance_used, t: 'n'},
-                    {v: item.rebate_total, t: 'n'},
-                    {v: item.rebate_lock, t: 'n'},
-                    {v: item.rebate_used, t: 'n'},
+                    item.vip_name || '-',
+                    {v: item.balance_total || '0.00', t: 'n'},
+                    {v: item.balance_used || '0.00', t: 'n'},
+                    {v: item.rebate_total || '0.00', t: 'n'},
+                    {v: item.rebate_lock || '0.00', t: 'n'},
+                    {v: item.rebate_used || '0.00', t: 'n'},
                     item.create_at || '',
-                ]);
+                ];
             });
-            return items;
+
+            // 设置表头内容
+            data.unshift(['ID', '小程序', '公众号', '用户姓名', '用户等级', '累计充值余额', '已使用余额', '累计返利金额', '锁定返利金额', '已提现金额', '注册时间']);
+
+            // 自动计算列序号
+            var lastCol = layui.excel.numToTitle((function (count, idx) {
+                for (idx in data[0]) count++;
+                return count;
+            })(0));
+
+            // 设置表头样式
+            layui.excel.setExportCellStyle(data, 'A1:' + lastCol + '1', {
+                s: {
+                    font: {sz: 12, bold: true, color: {rgb: "FFFFFF"}, name: '微软雅黑', shadow: true},
+                    fill: {bgColor: {indexed: 64}, fgColor: {rgb: "5FB878"}},
+                    alignment: {vertical: 'center', horizontal: 'center'}
+                }
+            });
+
+            // 设置内容样式
+            var style1 = {
+                font: {sz: 10, shadow: true, name: '微软雅黑'},
+                fill: {bgColor: {indexed: 64}, fgColor: {rgb: "EAEAEA"}},
+                alignment: {vertical: 'center', horizontal: 'center'}
+            }, style2 = {
+                font: {sz: 10, shadow: true, name: '微软雅黑'},
+                fill: {bgColor: {indexed: 64}, fgColor: {rgb: "FFFFFF"}},
+                alignment: {vertical: 'center', horizontal: 'center'}
+            };
+            layui.excel.setExportCellStyle(data, 'A2:' + lastCol + data.length, {s: style1}, function (rawCell, newCell, row, config, curRow) {
+                /* 判断并转换单元格数据为对象，以便初始化样式 */
+                typeof rawCell !== 'object' && (rawCell = {v: rawCell});
+                rawCell.s = Object.assign({}, style2, rawCell.s || {});
+                return (curRow % 2 === 0) ? newCell : rawCell;
+            });
+
+            // 设置表格行宽高，需要设置最后的行或列宽高，否则部分不生效 ？？？
+            var rowsC = {1: 33}, colsC = {A: 60, B: 80, C: 80, E: 80};
+            rowsC[data.length] = 28, colsC[lastCol] = 160;
+            this.options.extend = {
+                '!rows': layui.excel.makeRowConfig(rowsC, 28), // 设置每行高度，默认 33
+                '!cols': layui.excel.makeColConfig(colsC, 99), // 设置每行宽度，默认 99
+            };
+
+            return data;
         }, '会员用户数据');
     });
 </script>