diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php
index c033d8990..0f1f2e9e7 100644
--- a/application/admin/controller/User.php
+++ b/application/admin/controller/User.php
@@ -39,6 +39,10 @@ class User extends BasicAdmin {
     public function index() {
         $this->title = '系统用户管理';
         $db = Db::name($this->table)->where('is_deleted', '0');
+
+        if ($this->request->get('username')) {
+            $db->where('username', 'like', '%' . $this->request->get('username') . '%');
+        }
         parent::_list($db);
     }
 
diff --git a/application/admin/view/user.index.html b/application/admin/view/user.index.html
index c98ca24d0..8fa243101 100644
--- a/application/admin/view/user.index.html
+++ b/application/admin/view/user.index.html
@@ -2,74 +2,103 @@
 
 {block name="button"}
 <div class="nowrap pull-right" style="margin-top:10px">
-    <button data-modal='{:url("$classuri/add")}' data-title="添加用户" class='layui-btn layui-btn-small'><i class='fa fa-plus'></i> 添加用户</button>
-    <button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-small layui-btn-danger'><i class='fa fa-remove'></i> 删除用户</button>
+    <button data-modal='{:url("$classuri/add")}' data-title="添加用户" class='layui-btn layui-btn-small'><i
+            class='fa fa-plus'></i> 添加用户
+    </button>
+    <button data-update data-field='delete' data-action='{:url("$classuri/del")}'
+            class='layui-btn layui-btn-small layui-btn-danger'><i class='fa fa-remove'></i> 删除用户
+    </button>
 </div>
 {/block}
 
 {block name="content"}
+
+<!-- 表单搜索 开始 -->
+<form class="animated form-search" action="{:request()->url(true)}" onsubmit="return false" method="get" data-search>
+
+    <div class="row">
+        <div class="col-xs-3">
+            <div class="form-group">
+                <input type="text" name="username" value="{$Think.get.username|default=''}" placeholder="用户名"
+                       class="input-sm form-control">
+            </div>
+        </div>
+
+        <div class="col-xs-1">
+            <div class="form-group">
+                <button type="submit" class="btn btn-sm btn-white"><i class="fa fa-search"></i> 搜索</button>
+            </div>
+        </div>
+    </div>
+</form>
+
+<!-- 表单搜索 结束 -->
+
 <form onsubmit="return false;" data-auto="" method="POST">
     <input type="hidden" value="resort" name="action"/>
     <table class="table table-hover">
         <thead>
-            <tr>
-                <th class='list-table-check-td'>
-                    <input data-none-auto="" data-check-target='.list-check-box' type='checkbox'/>
-                </th>
-                <th class='text-center'>用户账号</th>
-                <th class='text-center'>手机号</th>
-                <th class='text-center'>电子邮箱</th>
-                <th class='text-center'>登录次数</th>
-                <th class='text-center'>最后登录</th>
-                <th class='text-center'>状态</th>
-                <th class='text-center'>操作</th>
-            </tr>
+        <tr>
+            <th class='list-table-check-td'>
+                <input data-none-auto="" data-check-target='.list-check-box' type='checkbox'/>
+            </th>
+            <th class='text-center'>用户账号</th>
+            <th class='text-center'>手机号</th>
+            <th class='text-center'>电子邮箱</th>
+            <th class='text-center'>登录次数</th>
+            <th class='text-center'>最后登录</th>
+            <th class='text-center'>状态</th>
+            <th class='text-center'>操作</th>
+        </tr>
         </thead>
         <tbody>
-            {foreach $list as $key=>$vo}
-            <tr>
-                <td class='list-table-check-td'>
-                    <input class="list-check-box" value='{$vo.id}' type='checkbox'/>
-                </td>
-                <td class='text-center'>{$vo.username}</td>
-                <td class='text-center'>{$vo.phone|default="<span style='color:#ccc'>还没有设置手机号</span>"}</td>
-                <td class='text-center'>{$vo.mail|default="<span style='color:#ccc'>还没有设置邮箱</span>"}</td>
-                <td class='text-center'>{$vo.login_num|default="<span style='color:#ccc'>从未登录</span>"}</td>
-                <td class='text-center'>{$vo.login_at|default="<span style='color:#ccc'>从未登录</span>"}</td>
-                <td class='text-center'>
-                    {if $vo.status eq 0}
-                    <span>已禁用</span>
-                    {elseif $vo.status eq 1}
-                    <span style="color:#090">使用中</span>
-                    {/if}
-                </td>
-                <td class='text-center nowrap'>
-                    {if auth("$classuri/edit")}
-                    <span class="text-explode">|</span>
-                    <a data-modal='{:url("$classuri/edit")}?id={$vo.id}' href="javascript:void(0)">编辑</a>
-                    {/if}
-                    {if auth("$classuri/auth")}
-                    <span class="text-explode">|</span>
-                    <a data-modal='{:url("$classuri/auth")}?id={$vo.id}' href="javascript:void(0)">授权</a>
-                    {/if}
-                    {if auth("$classuri/pass")}
-                    <span class="text-explode">|</span>
-                    <a data-modal='{:url("$classuri/pass")}?id={$vo.id}' href="javascript:void(0)">密码</a>
-                    {/if}
-                    {if $vo.status eq 1 and auth("$classuri/forbid")}
-                    <span class="text-explode">|</span>
-                    <a data-update="{$vo.id}" data-field='status' data-value='0'data-action='{:url("$classuri/forbid")}' href="javascript:void(0)">禁用</a>
-                    {elseif auth("$classuri/resume")}
-                    <span class="text-explode">|</span>
-                    <a data-update="{$vo.id}" data-field='status' data-value='1' data-action='{:url("$classuri/resume")}' href="javascript:void(0)">启用</a>
-                    {/if}
-                    {if auth("$classuri/del")}
-                    <span class="text-explode">|</span>
-                    <a data-update="{$vo.id}" data-field='delete' data-action='{:url("$classuri/del")}' href="javascript:void(0)">删除</a>
-                    {/if}
-                </td>
-            </tr>
-            {/foreach}
+        {foreach $list as $key=>$vo}
+        <tr>
+            <td class='list-table-check-td'>
+                <input class="list-check-box" value='{$vo.id}' type='checkbox'/>
+            </td>
+            <td class='text-center'>{$vo.username}</td>
+            <td class='text-center'>{$vo.phone|default="<span style='color:#ccc'>还没有设置手机号</span>"}</td>
+            <td class='text-center'>{$vo.mail|default="<span style='color:#ccc'>还没有设置邮箱</span>"}</td>
+            <td class='text-center'>{$vo.login_num|default="<span style='color:#ccc'>从未登录</span>"}</td>
+            <td class='text-center'>{$vo.login_at|default="<span style='color:#ccc'>从未登录</span>"}</td>
+            <td class='text-center'>
+                {if $vo.status eq 0}
+                <span>已禁用</span>
+                {elseif $vo.status eq 1}
+                <span style="color:#090">使用中</span>
+                {/if}
+            </td>
+            <td class='text-center nowrap'>
+                {if auth("$classuri/edit")}
+                <span class="text-explode">|</span>
+                <a data-modal='{:url("$classuri/edit")}?id={$vo.id}' href="javascript:void(0)">编辑</a>
+                {/if}
+                {if auth("$classuri/auth")}
+                <span class="text-explode">|</span>
+                <a data-modal='{:url("$classuri/auth")}?id={$vo.id}' href="javascript:void(0)">授权</a>
+                {/if}
+                {if auth("$classuri/pass")}
+                <span class="text-explode">|</span>
+                <a data-modal='{:url("$classuri/pass")}?id={$vo.id}' href="javascript:void(0)">密码</a>
+                {/if}
+                {if $vo.status eq 1 and auth("$classuri/forbid")}
+                <span class="text-explode">|</span>
+                <a data-update="{$vo.id}" data-field='status' data-value='0' data-action='{:url("$classuri/forbid")}'
+                   href="javascript:void(0)">禁用</a>
+                {elseif auth("$classuri/resume")}
+                <span class="text-explode">|</span>
+                <a data-update="{$vo.id}" data-field='status' data-value='1' data-action='{:url("$classuri/resume")}'
+                   href="javascript:void(0)">启用</a>
+                {/if}
+                {if auth("$classuri/del")}
+                <span class="text-explode">|</span>
+                <a data-update="{$vo.id}" data-field='delete' data-action='{:url("$classuri/del")}'
+                   href="javascript:void(0)">删除</a>
+                {/if}
+            </td>
+        </tr>
+        {/foreach}
         </tbody>
     </table>
     {if isset($page)}<p>{$page}</p>{/if}
diff --git a/public/static/admin/listen.js b/public/static/admin/listen.js
index 2e79aef73..7101874e9 100644
--- a/public/static/admin/listen.js
+++ b/public/static/admin/listen.js
@@ -31,7 +31,7 @@ define(['jquery', 'admin.plugs'], function () {
     });
 
     /*! 注册 data-serach 表单搜索行为 */
-    this.$body.on('submit', 'form[data-serach]', function () {
+    this.$body.on('submit', 'form[data-search]', function () {
         var split = this.action.indexOf('?') === -1 ? '?' : '&';
         if ((this.method || 'get').toLowerCase() === 'get') {
             window.location.href = '#' + parseUri(this.action + split + $(this).serialize());