diff --git a/app/admin/controller/Admin.php b/app/admin/controller/Admin.php
index 2aac474..f60e53b 100644
--- a/app/admin/controller/Admin.php
+++ b/app/admin/controller/Admin.php
@@ -24,23 +24,30 @@ class Admin extends AdminController
 	public function index()
 	{
 		if(Request::isAjax()){
+		$data = Request::only(['id','username','mobile','email','auth_group_id']);
+		$map = array_filter($data);
 			$admins = Db::name('admin')
 			->alias('a')
 			->join('auth_group u','a.auth_group_id = u.id')
-			->field('a.id as aid,username,mobile,email,title,last_login_ip,a.status as astatus,last_login_time')
+			->field('a.id as aid,username,mobile,email,auth_group_id,title,last_login_ip,a.status as astatus,last_login_time')
 			->where('a.delete_time',0)
+			->where($map)
 			->select();
 			
 			$count = $admins->count();
-			if($admins){
+			if($count){
 				$res = ['code'=>0,'msg'=>'','count'=>$count];
 				foreach($admins as $k => $v){
 					$data = ['id'=>$v['aid'],'loginname'=>$v['username'],'telphone'=>$v['mobile'],'email'=>$v['email'],'role'=>$v['title'],'ip'=>$v['last_login_ip'],'check'=>$v['astatus'],'logintime'=>date("Y-m-d",$v['last_login_time'])];
 					$res['data'][] = $data;
 				}
+			} else {
+				$res = ['code'=>-1,'msg'=>'没有查询结果！'];
 			}
 			return json($res);
 			}
+			$authGroup = Db::name('auth_group')->field('id,title')->select();
+			View::assign('authGroup',$authGroup);
 		return View::fetch();
 	}
 
diff --git a/app/admin/controller/AuthGroup.php b/app/admin/controller/AuthGroup.php
index 1767c21..86282fd 100644
--- a/app/admin/controller/AuthGroup.php
+++ b/app/admin/controller/AuthGroup.php
@@ -23,19 +23,26 @@ class AuthGroup extends AdminController
 	//角色
 	public function list()
 	{
+		
 		if(Request::isAjax()){
-			$role = Db::name('auth_group')->select();
+			$data = Request::only(['id']);
+			$map = array_filter($data);
+			$role = Db::name('auth_group')->field('id,title,limits,descr,status')->where('status',1)->where($map)->select();
 			$count = $role->count();
 			$res = [];
-			if($role){
+			if($count){
 				$res = ['code'=>0,'msg'=>'','count'=>$count];			
 				foreach($role as $k => $v){
 				$data = ['id'=>$v['id'],'rolename'=>$v['title'],'limits'=>$v['limits'],'descr'=>$v['descr'],'check'=>$v['status']];
 				$res['data'][] = $data; 
 				}
+			} else {
+				$res = ['code'=>-1,'msg'=>'没有查询结果！'];
 			}
 			return json($res);
 		}
+		$roles = Db::name('auth_group')->field('id,title')->where('status',1)->select();
+		View::assign('roles',$roles);
 		return View::fetch('role');
 	}
 	
diff --git a/view/admin/admin/adminedit.html b/view/admin/admin/adminedit.html
deleted file mode 100644
index 1a42838..0000000
--- a/view/admin/admin/adminedit.html
+++ /dev/null
@@ -1,61 +0,0 @@
-
-{extend name="public:base" /}
-
-{block name="body"}
-
-  <div class="layui-form" lay-filter="layuiadmin-form-admin" id="layuiadmin-form-admin" style="padding: 20px 30px 0 0;">
-	<div class="layui-form-item layui-hide">
-	 <input type="text" name="id" class="layui-input" value="{$admin.id}">
-	</div>
-    <div class="layui-form-item">
-      <label class="layui-form-label">登录名</label>
-      <div class="layui-input-inline">
-        <input type="text" name="username" disabled lay-verify="required" placeholder="请输入用户名" autocomplete="off" class="layui-input layui-disabled" value="{$admin.username}">
-      </div>
-    </div>
-	<div class="layui-form-item">
-      <label class="layui-form-label">密码</label>
-      <div class="layui-input-inline">
-        <input type="text" name="password" lay-verify="password" placeholder="请输入密码" autocomplete="off" class="layui-input">
-      </div>
-    </div>
-    <div class="layui-form-item">
-      <label class="layui-form-label">手机</label>
-      <div class="layui-input-inline">
-        <input type="text" name="mobile" lay-verify="phone" placeholder="请输入号码" autocomplete="off" class="layui-input" value="{$admin.mobile}">
-      </div>
-    </div>
-    <div class="layui-form-item">
-      <label class="layui-form-label">邮箱</label>
-      <div class="layui-input-inline">
-        <input type="text" name="email" lay-verify="email" placeholder="请输入邮箱" autocomplete="off" class="layui-input" value="{$admin.email}">
-      </div>
-    </div>
-    <div class="layui-form-item">
-      <label class="layui-form-label">角色</label>
-	  <div class="layui-input-block">
-            <select name="auth_group_id" lay-verify="required">
-			{volist name="auth_group" id="vo"}
-                <option {if condition="$admin.auth_group_id eq $vo.id"} selected {/if} value="{$vo.id}">{$vo.title}</option>
-			{/volist}
-            </select>
-       </div>
-    </div>
-    <div class="layui-form-item layui-hide">
-      <input type="button" lay-submit lay-filter="LAY-user-back-submit" id="LAY-user-back-submit" value="确认">
-    </div>
-  </div>
-
-{/block}
-{block name="js"}  
-  <script>
-  layui.config({
-    base: '/static/admin/' //静态资源所在路径
-  }).extend({
-    index: 'lib/index' //主入口模块
-  }).use(['index', 'form'], function(){
-    var $ = layui.$
-    ,form = layui.form ;
-  })
-  </script>
-{/block}
\ No newline at end of file
diff --git a/view/admin/admin/adminform.html b/view/admin/admin/adminform.html
deleted file mode 100644
index f773449..0000000
--- a/view/admin/admin/adminform.html
+++ /dev/null
@@ -1,57 +0,0 @@
-
-{extend name="public:base" /}
-
-{block name="body"}
-
-  <div class="layui-form" lay-filter="layuiadmin-form-admin" id="layuiadmin-form-admin" style="padding: 20px 30px 0 0;">
-    <div class="layui-form-item">
-      <label class="layui-form-label">登录名</label>
-      <div class="layui-input-inline">
-        <input type="text" name="username" lay-verify="required" placeholder="请输入用户名" autocomplete="off" class="layui-input">
-      </div>
-    </div>
-    <div class="layui-form-item">
-      <label class="layui-form-label">手机</label>
-      <div class="layui-input-inline">
-        <input type="text" name="mobile" lay-verify="phone" placeholder="请输入号码" autocomplete="off" class="layui-input">
-      </div>
-    </div>
-    <div class="layui-form-item">
-      <label class="layui-form-label">邮箱</label>
-      <div class="layui-input-inline">
-        <input type="text" name="email" lay-verify="email" placeholder="请输入邮箱" autocomplete="off" class="layui-input">
-      </div>
-    </div>
-    <div class="layui-form-item">
-      <label class="layui-form-label">角色</label>
-	  <div class="layui-input-block">
-		<select name="auth_group_id" lay-verify="required">
-		{volist name="auth_group" id="vo"}
-			<option value="{$vo.id}">{$vo.title}</option>
-		{/volist}
-       </div>
-    </div>
-    <div class="layui-form-item">
-      <label class="layui-form-label">审核状态</label>
-      <div class="layui-input-inline">
-        <input type="checkbox" lay-filter="switch" name="status" lay-skin="switch" lay-text="通过|待审核">
-      </div>
-    </div>
-    <div class="layui-form-item layui-hide">
-      <input type="button" lay-submit lay-filter="LAY-user-back-submit" id="LAY-user-back-submit" value="确认">
-    </div>
-  </div>
-
-{/block}
-{block name="js"}  
-  <script>
-  layui.config({
-    base: '/static/admin/' //静态资源所在路径
-  }).extend({
-    index: 'lib/index' //主入口模块
-  }).use(['index', 'form'], function(){
-    var $ = layui.$
-    ,form = layui.form ;
-  })
-  </script>
-{/block}
\ No newline at end of file
diff --git a/view/admin/admin/index.html b/view/admin/admin/index.html
index 738eb56..c610711 100644
--- a/view/admin/admin/index.html
+++ b/view/admin/admin/index.html
@@ -8,13 +8,13 @@
           <div class="layui-inline">
             <label class="layui-form-label">登录名</label>
             <div class="layui-input-block">
-              <input type="text" name="loginname" placeholder="请输入" autocomplete="off" class="layui-input">
+              <input type="text" name="username" placeholder="请输入" autocomplete="off" class="layui-input">
             </div>
           </div>
           <div class="layui-inline">
             <label class="layui-form-label">手机</label>
             <div class="layui-input-block">
-              <input type="text" name="telphone" placeholder="请输入" autocomplete="off" class="layui-input">
+              <input type="text" name="mobile" placeholder="请输入" autocomplete="off" class="layui-input">
             </div>
           </div>
           <div class="layui-inline">
@@ -26,14 +26,11 @@
           <div class="layui-inline">
             <label class="layui-form-label">角色</label>
             <div class="layui-input-block">
-              <select name="role">
-                <option value="0">管理员</option>
-                <option value="1">超级管理员</option>
-                <option value="2">纠错员</option>
-                <option value="3">采购员</option>
-                <option value="4">推销员</option>
-                <option value="5">运营人员</option>
-                <option value="6">编辑</option>
+              <select name="auth_group_id">
+			  <option value="">选择角色</option>
+			  {volist name="authGroup" id="vo"}
+                <option value="{$vo.id}">{$vo.title}</option>
+			  {/volist}
               </select>
             </div>
           </div>
@@ -94,7 +91,23 @@
     //监听搜索
     form.on('submit(LAY-user-back-search)', function(data){
       var field = data.field;
-      
+	  $.ajax({
+		type:"post",
+		url:"{:url('admin/admin/index')}",
+		data:{"id":field.id,"username":field.username,"mobile":field.mobile,"email":field.email,"auth_group_id":field.auth_group_id},
+		daType:"json",
+		success:function (data){
+			if (data.code == 0) {
+				
+			} else {
+				layer.open({
+					content:data.msg,
+					icon:5,
+					anim:6
+				});
+			}
+		}
+	});
       //执行重载
       table.reload('LAY-user-back-manage', {
         where: field
diff --git a/view/admin/admin/list.html b/view/admin/admin/list.html
deleted file mode 100644
index a877812..0000000
--- a/view/admin/admin/list.html
+++ /dev/null
@@ -1,226 +0,0 @@
-{extend name="public:base" /}
-
-{block name="body"}
-  <div class="layui-fluid">   
-    <div class="layui-card">
-      <div class="layui-form layui-card-header layuiadmin-card-header-auto">
-        <div class="layui-form-item">
-          <div class="layui-inline">
-            <label class="layui-form-label">登录名</label>
-            <div class="layui-input-block">
-              <input type="text" name="loginname" placeholder="请输入" autocomplete="off" class="layui-input">
-            </div>
-          </div>
-          <div class="layui-inline">
-            <label class="layui-form-label">手机</label>
-            <div class="layui-input-block">
-              <input type="text" name="telphone" placeholder="请输入" autocomplete="off" class="layui-input">
-            </div>
-          </div>
-          <div class="layui-inline">
-            <label class="layui-form-label">邮箱</label>
-            <div class="layui-input-block">
-              <input type="text" name="email" placeholder="请输入" autocomplete="off" class="layui-input">
-            </div>
-          </div>
-          <div class="layui-inline">
-            <label class="layui-form-label">角色</label>
-            <div class="layui-input-block">
-              <select name="role">
-                <option value="0">管理员</option>
-                <option value="1">超级管理员</option>
-                <option value="2">纠错员</option>
-                <option value="3">采购员</option>
-                <option value="4">推销员</option>
-                <option value="5">运营人员</option>
-                <option value="6">编辑</option>
-              </select>
-            </div>
-          </div>
-          <div class="layui-inline">
-            <button class="layui-btn layuiadmin-btn-admin" lay-submit lay-filter="LAY-user-back-search">
-              <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-            </button>
-          </div>
-        </div>
-      </div>
-      
-      <div class="layui-card-body">
-        <div style="padding-bottom: 10px;">
-          <button class="layui-btn layuiadmin-btn-admin" data-type="batchdel">删除</button>
-          <button class="layui-btn layuiadmin-btn-admin" data-type="add">添加</button>
-        </div>
-        
-        <table id="LAY-user-back-manage" lay-filter="LAY-user-back-manage"></table>  
-<!--        <script type="text/html" id="buttonTpl">
-          {{#  if(d.check == 1){ }}
-            <button class="layui-btn layui-btn-xs">已审核</button>
-          {{#  } else { }}
-            <button class="layui-btn layui-btn-primary layui-btn-xs">未审核</button>
-          {{#  } }}
-        </script>
--->
-		<script type="text/html" id="buttonTpl">
-		{{#  if(d.role == '1'){ }}
-		<input type="checkbox" name="admincheck" lay-skin="switch" disabled lay-text="已审核|未审核" value="1" checked id="{{d.id}}">
-		{{#  } else { }}
-		{if condition="checkRuleButton('admin/admin/adminCheck')"}<input type="checkbox" name="admincheck" lay-skin="switch" lay-filter="admincheck" lay-text="已审核|未审核" {{#  if(d.check == 1){ }} checked {{#  } }} id="{{d.id}}" >{else}<button class="layui-btn layui-btn-xs layui-btn-radius layui-btn-disabled">无审核权</button>{/if}
-		{{#  } }}
-        </script>
-        <script type="text/html" id="table-useradmin-admin">
-          <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
-          {{#  if(d.role == '1'){ }}
-            <a class="layui-btn layui-btn-disabled layui-btn-xs"><i class="layui-icon layui-icon-delete"></i>删除</a>
-          {{#  } else { }}
-            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
-          {{#  } }}
-        </script>
-      </div>
-    </div>
-  </div>
-
-{/block}
-{block name="js"}  
-  <script>
-  layui.config({
-    base: '/static/admin/' //静态资源所在路径
-  }).extend({
-    index: 'lib/index' //主入口模块
-  }).use(['index', 'useradmin', 'table'], function(){
-    var $ = layui.$
-    ,form = layui.form
-    ,table = layui.table;
-    
-    //监听搜索
-    form.on('submit(LAY-user-back-search)', function(data){
-      var field = data.field;
-      
-      //执行重载
-      table.reload('LAY-user-back-manage', {
-        where: field
-      });
-    });
-	
-	//监听管理员审核
-	form.on('switch(admincheck)', function(data){
-	var data= data.elem;
-	//console.log(data);
-	
-	if(data.checked == true){
-		data.value = 1;
-	}else{
-		data.value = 0;
-	}
-	//执行管理员审核
-		$.ajax({
-			type:'post',
-			url:"{:url('admin/admin/adminCheck')}",
-			data:{id:data.id,status:data.value,},
-			dataType:'json',
-			success:function(res){
-				if(res.code == 0){
-					layer.msg(res.msg,{
-						icon:res.icon,
-						time:2000
-					}
-					//,function(){location.reload();}
-					);
-				} else {
-					layer.open({
-						title:'审核失败',
-						content:res.msg,
-						icon:5,
-						adim:6
-					})
-				}
-			}
-		});
-		return false;
-	}); 
-
-    //事件
-    var active = {
-      batchdel: function(){
-        var checkStatus = table.checkStatus('LAY-user-back-manage')
-        ,checkData = checkStatus.data; //得到选中的数据
-
-        if(checkData.length === 0){
-          return layer.msg('请选择数据');
-        }
-        
-        layer.prompt({
-          formType: 1
-          ,title: '敏感操作，请验证口令'
-        }, function(value, index){
-          layer.close(index);
-          
-          layer.confirm('确定删除吗？', function(index) {
-            
-            //执行 Ajax 后重载
-            /*
-            admin.req({
-              url: 'xxx'
-              //,……
-            });
-            */
-            table.reload('LAY-user-back-manage');
-            layer.msg('已删除');
-          });
-        }); 
-      }
-      ,add: function(){
-        layer.open({
-          type: 2
-          ,title: '添加管理员'
-          ,content: 'adminform.html'
-          ,area: ['420px', '420px']
-          ,btn: ['确定', '取消']
-          ,yes: function(index, layero){
-            var iframeWindow = window['layui-layer-iframe'+ index]
-            ,submitID = 'LAY-user-back-submit'
-            ,submit = layero.find('iframe').contents().find('#'+ submitID);
-
-            //监听提交
-            iframeWindow.layui.form.on('submit('+ submitID +')', function(data){
-              var field = data.field; //获取提交的字段
-
-              //提交 Ajax 成功后，静态更新表格中的数据
-              $.ajax({
-				type:"post",
-				url:"{:url('admin/admin/adminform')}",
-				data:{"username":field.username,"password":field.username,"mobile":field.mobile,"email":field.email,"auth_group_id":field.auth_group_id,"status":field.status},
-				daType:"json",
-				success:function (data){
-					if (data.code == 1) {
-						layer.msg(data.msg,{
-							icon:6,
-							time:2000
-						});
-					} else {
-						layer.open({
-							tiele:'添加失败',
-							content:data.msg,
-							icon:5,
-							anim:6
-						});
-					}
-				}
-			});
-			  
-              table.reload('LAY-user-back-manage'); //数据刷新
-              layer.close(index); //关闭弹层
-            });  
-            
-            submit.trigger('click');
-          }
-        }); 
-      }
-    }  
-    $('.layui-btn.layuiadmin-btn-admin').on('click', function(){
-      var type = $(this).data('type');
-      active[type] ? active[type].call(this) : '';
-    });
-	
-  });
-  </script>
-{/block}
diff --git a/view/admin/auth_group/role.html b/view/admin/auth_group/role.html
index 5f1e0bf..4108fa8 100644
--- a/view/admin/auth_group/role.html
+++ b/view/admin/auth_group/role.html
@@ -10,15 +10,11 @@
             角色筛选
           </div>
           <div class="layui-inline">
-            <select name="rolename" lay-filter="LAY-user-adminrole-type">
-              <option value="-1">全部角色</option>
-              <option value="0">管理员</option>
-              <option value="1">超级管理员</option>
-              <option value="2">纠错员</option>
-              <option value="3">采购员</option>
-              <option value="4">推销员</option>
-              <option value="5">运营人员</option>
-              <option value="6">编辑</option>
+            <select name="id" lay-filter="LAY-user-adminrole-type">
+              <option value="">全部角色</option>
+			  {volist name="roles" id="vo"}
+              <option value="{$vo.id}">{$vo.title}</option>
+			  {/volist}
             </select>
           </div>
         </div>
@@ -55,12 +51,31 @@
     
     //搜索角色
     form.on('select(LAY-user-adminrole-type)', function(data){
-      //执行重载
-      table.reload('LAY-user-back-role', {
-        where: {
-          role: data.value
-        }
-      });
+	console.log(data);
+	  $.ajax({
+		type:"post",
+		url:"{:url('admin/AuthGroup/list')}",
+		data:{"id":data.value},
+		daType:"json",
+		success:function (data){
+			if (data.code == 0) {
+			  				
+			} else {
+				layer.open({
+					content:data.msg,
+					icon:5,
+					anim:6
+				});
+			}
+		}
+	});
+	//执行重载
+			  table.reload('LAY-user-back-role', {
+				where: {
+				  id: data.value
+				}
+			  });
+
     });
 	
 	//监听角色审核