diff --git a/app/admin/controller/Admin.php b/app/admin/controller/Admin.php
index 845964b..2b99927 100644
--- a/app/admin/controller/Admin.php
+++ b/app/admin/controller/Admin.php
@@ -3,9 +3,11 @@
 namespace app\admin\controller;
 
 use app\model\Admin as AppAdmin;
+use app\model\AdminGroup;
 use app\model\AdminLog;
 use app\UploadFiles as AppUploadFiles;
 use think\facade\View;
+use think\helper\Str;
 
 class Admin extends Common
 {
@@ -80,12 +82,64 @@ class Admin extends Common
 
     public function create()
     {
+
+        $admin_group_list = AdminGroup::select();
+
+        View::assign('group_list',$admin_group_list);
+
         return View::fetch();
     }
 
     public function save()
     {
-        
+        $post_data = $this->request->post();
+
+        $admin_model = AppAdmin::where('account',$post_data['account'])->find();
+
+        if(!empty($admin_model)){
+            $this->error('管理员已存在');
+        }
+
+        if(empty($post_data['password'])){
+            $post_data['password'] = '123456';
+        }
+
+
+        $post_data['salt'] = Str::random(6);
+
+        $post_data['password'] = md5($post_data['password'].$post_data['salt']);
+
+        AppAdmin::create($post_data);
+
+        $this->success('添加成功','index');
+
+    }
+
+    public function editAccount($id)
+    {
+        $model_admin = AppAdmin::find($id);
+        $admin_group_list = AdminGroup::select();
+        View::assign('group_list',$admin_group_list);
+        View::assign('admin',$model_admin);
+        return View::fetch();
+    }
+
+    public function updateAccount()
+    {
+        $post_data = $this->request->post();
+
+        if(!empty($post_data['password'])){
+            $post_data['salt'] = Str::random(6);
+
+            $post_data['password'] = md5($post_data['password'].$post_data['salt']);
+        }else{
+            unset($post_data['password']);
+        }
+
+        AppAdmin::update($post_data);
+
+        $this->success('修改成功','index');
+
     }
 
     public function adminLog()
@@ -97,4 +151,12 @@ class Admin extends Common
 
         return View::fetch();
     }
+
+    public function delete($id)
+    {
+        AppAdmin::destroy($id);
+
+        
+        return json_message();
+    }
 }
diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php
new file mode 100644
index 0000000..4a2b569
--- /dev/null
+++ b/app/admin/controller/User.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace app\admin\controller;
+
+use think\Request;
+
+class User
+{
+    /**
+     * 显示资源列表
+     *
+     * @return \think\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * 显示创建资源表单页.
+     *
+     * @return \think\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * 保存新建的资源
+     *
+     * @param  \think\Request  $request
+     * @return \think\Response
+     */
+    public function save(Request $request)
+    {
+        //
+    }
+
+    /**
+     * 显示指定的资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function read($id)
+    {
+        //
+    }
+
+    /**
+     * 显示编辑资源表单页.
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * 保存更新的资源
+     *
+     * @param  \think\Request  $request
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * 删除指定资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function delete($id)
+    {
+        //
+    }
+}
diff --git a/app/model/Admin.php b/app/model/Admin.php
index 4ed433c..c78f5cb 100644
--- a/app/model/Admin.php
+++ b/app/model/Admin.php
@@ -13,13 +13,21 @@ class Admin extends Model
 
     public function getAvatarAttr($value)
     {
+
+        if(empty($value)){
+            return '/static/images/avatar.jpeg';
+        }
+
         return \get_source_link($value);
     }
 
     public function getGroupAttr()
     {
         if(empty($this->getData('group_id'))){
-            return '未分组';
+            return [];
         }
+
+        return AdminGroup::where('id',$this->getData('group_id'))->cache(1)->find();
     }
+    
 }
diff --git a/app/model/User.php b/app/model/User.php
new file mode 100644
index 0000000..85c8b87
--- /dev/null
+++ b/app/model/User.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace app\model;
+
+use think\Model;
+
+/**
+ * @mixin think\Model
+ */
+class User extends Model
+{
+    //
+}
diff --git a/view/admin/admin/create.html b/view/admin/admin/create.html
index 3c0d0b4..01072dc 100644
--- a/view/admin/admin/create.html
+++ b/view/admin/admin/create.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -7,15 +8,16 @@
     <title>基本资料</title>
     {include file="common/_require"}
 </head>
+
 <body class="layui-layout-body">
-    
+
     <div class="layui-layout layui-layout-admin">
         {include file="common/_header"}
-    
+
         {include file="common/left_admin_manage"}
-    
+
         <div class="layui-body">
-    
+
             <div style="padding:15px">
                 <div class="main-header">
                     <span class="layui-breadcrumb">
@@ -27,25 +29,42 @@
                     <div class="layui-row">
                         <div class="layui-col-md6">
                             <fieldset class="layui-elem-field">
-                                <legend>管理员管理</legend>
+                                <legend>添加管理员</legend>
                                 <div class="layui-field-box">
                                     <form action="{:url('Admin/save')}" method="POST" class="layui-form">
                                         <div class="layui-form-item">
                                             <div class="layui-form-label">登录账号</div>
                                             <div class="layui-input-block">
-                                                <input type="text" name="account" required lay-verify="required" value="" class="layui-input">
+                                                <input type="text" name="account" required lay-verify="required"
+                                                    value="" class="layui-input">
                                             </div>
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-form-label">昵称</div>
                                             <div class="layui-input-block">
-                                                <input type="text" name="nickname" required lay-verify="required" value="" class="layui-input">
+                                                <input type="text" name="nickname" required lay-verify="required"
+                                                    value="" class="layui-input">
                                             </div>
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-form-label">密码</div>
                                             <div class="layui-input-block">
-                                                <input type="password" name="password" required lay-verify="required" value="" class="layui-input">
+                                                <input type="password" name="password"
+                                                    value="" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-form-label">管理组</div>
+                                            <div class="layui-input-block">
+                                                <select name="group_id" lay-verify="">
+                                                    <option value="">请选择一个分组</option>
+                                                    {volist name='group_list' id='group'}
+                                                        <option value="{$group.id}">{$group.name}</option>
+                                                    {/volist}
+                                                </select>
+                                                <div class="layui-form-mid layui-word-aux">
+                                                    不设置分组，帐号拥有所有权限
+                                                </div>
                                             </div>
                                         </div>
                                         <div class="layui-form-item">
@@ -55,7 +74,8 @@
                                                     <div class="layui-btn upload-admin-avatar">上传</div>
                                                 </div>
                                                 <div>
-                                                    <img class="layui-circle admin-avatar" style="width: 80px" src="" alt="" srcset="">
+                                                    <img class="layui-circle admin-avatar" style="width: 80px" src=""
+                                                        alt="" srcset="">
                                                 </div>
                                                 <input type="hidden" name="avatar" value="" class="layui-input">
                                             </div>
@@ -71,36 +91,39 @@
                 </div>
             </div>
         </div>
-    
-    
+
+
         {include file="common/_footer"}
 
         <script>
             layui.config({
-                base:'/static/lib/layui/lib/cropper/'
-            }).use(['layer','upload','croppers'],function(){
+                base: '/static/lib/layui/lib/cropper/'
+            }).use(['layer', 'upload', 'croppers','form'], function () {
                 var upload = layui.upload;
                 var croppers = layui.croppers;
-                
+
 
                 var uploadSiteLogo = croppers.render({
-                    elem:'.upload-admin-avatar',
-                    url:'{:url("api/Files/save")}',
-                    data:{
-                        type:2,
-                        dir:'admin_avatar'
-                    }
-                    ,saveW:150     //保存宽度
-                    ,saveH:150
-                    ,mark:1/1    //选取比例
-                    ,area:'900px'  //弹窗宽度
-                    ,accept:'images',
-                    done:function(result){
-                        if(result.code == 0){
+                    elem: '.upload-admin-avatar',
+                    url: '{:url("api/Files/save")}',
+                    data: {
+                        type: 2,
+                        dir: 'admin_avatar'
+                    },
+                    saveW: 150 //保存宽度
+                        ,
+                    saveH: 150,
+                    mark: 1 / 1 //选取比例
+                        ,
+                    area: '900px' //弹窗宽度
+                        ,
+                    accept: 'images',
+                    done: function (result) {
+                        if (result.code == 0) {
                             layer.msg('上传成功');
                             $('input[name="avatar"]').val(result.data.save_name);
-                            $('.admin-avatar').attr('src',result.data.src);
-                        }else{
+                            $('.admin-avatar').attr('src', result.data.src);
+                        } else {
                             layer.msg(result.msg)
                         }
                     }
@@ -110,4 +133,5 @@
         </script>
     </div>
 </body>
+
 </html>
\ No newline at end of file
diff --git a/view/admin/admin/edit_account.html b/view/admin/admin/edit_account.html
new file mode 100644
index 0000000..4d65524
--- /dev/null
+++ b/view/admin/admin/edit_account.html
@@ -0,0 +1,141 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>应用管理</title>
+    {include file="common/_require"}
+</head>
+<body class="layui-layout-body">
+    
+    <div class="layui-layout layui-layout-admin">
+        {include file="common/_header"}
+    
+        {include file="common/left_admin_manage"}
+    
+        <div class="layui-body">
+    
+            <div style="padding:15px">
+                <div class="main-header">
+                    <span class="layui-breadcrumb">
+                        <a>首页</a>
+                        <a><cite> 编辑管理员</cite></a>
+                    </span>
+                </div>
+                <div class="main-container">
+                    <div class="layui-row">
+                            <div class="layui-col-md6">
+                            <fieldset class="layui-elem-field">
+                                <legend>添加管理员</legend>
+                                <div class="layui-field-box">
+                                    <form action="{:url('Admin/updateAccount')}" method="POST" class="layui-form">
+                                        <input type="hidden" name="id" value="{$admin.id}">
+                                        <div class="layui-form-item">
+                                            <div class="layui-form-label">登录账号</div>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="account" required lay-verify="required"
+                                                    value="{$admin.account}" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-form-label">昵称</div>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="nickname" required lay-verify="required"
+                                                    value="{$admin.nickname}" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-form-label">密码</div>
+                                            <div class="layui-input-block">
+                                                <input type="password" name="password" value="" class="layui-input">
+                                                <div class="layui-form-mid layui-word-aux">
+                                                    留空不修改
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-form-label">管理组</div>
+                                            <div class="layui-input-block">
+                                                <select name="group_id" lay-verify="">
+                                                    <option value="">请选择一个分组</option>
+                                                    {volist name='group_list' id='group'}
+                                                    {if condition="$group.id eq $admin.group_id" }
+                                                        <option value="{$group.id}" selected="selected">{$group.name}</option>
+                                                        {else /}
+                                                        <option value="{$group.id}">{$group.name}</option>
+                                                    {/if}
+                                                    {/volist}
+                                                </select>
+                                                <div class="layui-form-mid layui-word-aux">
+                                                    不设置分组，帐号拥有所有权限
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-form-label">头像</div>
+                                            <div class="layui-input-block">
+                                                <div>
+                                                    <div class="layui-btn upload-admin-avatar">上传</div>
+                                                </div>
+                                                <div>
+                                                    <img class="layui-circle admin-avatar" style="width: 80px" src="{$admin.avatar}"
+                                                        alt="{$admin.avatar}" srcset="">
+                                                </div>
+                                                <input type="hidden" name="avatar" value="{$admin->getData('avatar')}" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <button class="layui-btn layui-btn-fluid" type="submit">创建</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            </fieldset>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    
+    
+        {include file="common/_footer"}
+
+        <script>
+            layui.config({
+                base: '/static/lib/layui/lib/cropper/'
+            }).use(['layer', 'upload', 'croppers','form'], function () {
+                var upload = layui.upload;
+                var croppers = layui.croppers;
+
+
+                var uploadSiteLogo = croppers.render({
+                    elem: '.upload-admin-avatar',
+                    url: '{:url("api/Files/save")}',
+                    data: {
+                        type: 2,
+                        dir: 'admin_avatar'
+                    },
+                    saveW: 150 //保存宽度
+                        ,
+                    saveH: 150,
+                    mark: 1 / 1 //选取比例
+                        ,
+                    area: '900px' //弹窗宽度
+                        ,
+                    accept: 'images',
+                    done: function (result) {
+                        if (result.code == 0) {
+                            layer.msg('上传成功');
+                            $('input[name="avatar"]').val(result.data.save_name);
+                            $('.admin-avatar').attr('src', result.data.src);
+                        } else {
+                            layer.msg(result.msg)
+                        }
+                    }
+                })
+
+            })
+        </script>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/view/admin/admin/index.html b/view/admin/admin/index.html
index 90474a1..fc7e99a 100644
--- a/view/admin/admin/index.html
+++ b/view/admin/admin/index.html
@@ -44,16 +44,16 @@
                             <tbody>
                                 {volist name='$list' id='vo'}
                                     
-                                <tr>
+                                <tr data-id="{$vo.id}">
                                     <td>{$vo.id}</td>
                                     <td><img src="{$vo.avatar}" alt=""></td>
                                     <td>{$vo.account}</td>
                                     <td>{$vo.nickname}</td>
-                                    <td>{$vo.group}</td>
+                                    <td>{$vo.group.name|default="未分组"}</td>
                                     <td>
                                         <div class="layui-btn-container">
-                                            <a class="layui-btn layui-btn-sm" href="{:url('Admin/editaccount',['id'=>{$vo.id}])}">编辑</a>
-                                            <div class="layui-btn layui-btn-sm">
+                                            <a class="layui-btn layui-btn-sm" href="{:url('Admin/editAccount',['id'=>$vo.id])}">编辑</a>
+                                            <div class="layui-btn layui-btn-sm delete">
                                                 删除
                                             </div>
                                         </div>
@@ -74,6 +74,23 @@
 
 
         {include file="common/_footer"}
+
+        <script>
+        
+            $('.delete').click(function(){
+                var item = this;
+                layer.confirm('确定要删除吗？',function(){
+                    $.get('{:url("delete")}',{
+                        id:$(item).parents('tr').data('id')
+                    },function(result){
+                        layer.msg('删除成功');
+
+                        $(item).parents('tr').remove();
+                    })
+                })
+            })
+        
+        </script>
     </div>
 </body>
 
diff --git a/view/admin/admin_group/edit.html b/view/admin/admin_group/edit.html
index 5de9c59..1271c02 100644
--- a/view/admin/admin_group/edit.html
+++ b/view/admin/admin_group/edit.html
@@ -33,6 +33,7 @@
                                             <div class="layui-form-item">
                                                 <div class="layui-form-label">分组名称</div>
                                                 <div class="layui-input-block">
+                                                    
                                                     <input type="text" name="name" class="layui-input" value="{$admin_group.name}">
                                                 </div>
                                             </div>
@@ -40,7 +41,12 @@
                                                 <div class="layui-form-label">分组权限</div>
                                                 <div class="layui-input-block">
                                                     {volist name='permission_list' id='vo'}
+                                                    {if condition="empty($vo->getData('name'))" }
+                                                        
                                                         <input type="checkbox" name="permissions[]" title="{$vo.name}" value="{$vo.id}" lay-skin="primary" {if condition="in_array($vo.id,$admin_group.permissions)"}checked{/if}>
+                                                        {else /}
+                                                        <input type="checkbox" name="permissions[]" title="{$vo.name}({$vo->getData('app')}/{$vo->getData('controller')}/{$vo->getData('action')})" value="{$vo.id}" lay-skin="primary" {if condition="in_array($vo.id,$admin_group.permissions)"}checked{/if}>
+                                                    {/if}
                                                     {/volist}
                                                 </div>
                                             </div>
diff --git a/view/admin/login/index.html b/view/admin/login/index.html
index 31a27ba..ff261fc 100644
--- a/view/admin/login/index.html
+++ b/view/admin/login/index.html
@@ -54,7 +54,7 @@
                                     <div class="layui-input-block">
                                         <input type="text" name="captcha" required lay-verify="required"
                                             placeholder="请输入验证码" autocomplete="off" class="layui-input">
-                                            <img src="/api/Captcha/build" onclick="this.src = '/api/Captcha/build?v='+Math.random()" style="cursor: pointer" alt="">
+                                            <img class="captcha" src="/api/Captcha/build" onclick="this.src = '/api/Captcha/build?v='+Math.random()" style="cursor: pointer" alt="">
                                     </div>
                                     
                                 </div>
@@ -91,6 +91,7 @@
                             location.href = '{:url("admin/Index/index")}'
                         }, 1200);
                     }else{
+                        $('.captcha').click()
                         layer.msg(result.msg);
                     }
                 })