diff --git a/app_admin/urls.py b/app_admin/urls.py
index 9980227..37c5601 100644
--- a/app_admin/urls.py
+++ b/app_admin/urls.py
@@ -6,7 +6,8 @@ urlpatterns = [
     path('logout/',views.log_out,name='logout'),# 注销
     path('register/',views.register,name="register"), # 注册
     path('user_manage/',views.admin_user,name="user_manage"), # 用户管理
-    path('create/',views.admin_create_user,name="create_user"), # 新建用户
+    path('create_user/',views.admin_create_user,name="create_user"), # 新建用户
+    path('del_user/',views.admin_del_user,name='del_user'), # 删除用户
     path('project_manage/',views.admin_project,name='project_manage'), # 文集管理
     path('doc_manage/',views.admin_doc,name='doc_manage'), # 文集管理
     path('doctemp_manage/',views.admin_doctemp,name='doctemp_manage'), # 文集管理
diff --git a/app_doc/views.py b/app_doc/views.py
index a1eb364..a111c1a 100644
--- a/app_doc/views.py
+++ b/app_doc/views.py
@@ -92,6 +92,10 @@ def del_project(request):
         if pro_id != '':
             pro = Project.objects.get(id=pro_id)
             if request.user == pro.create_user:
+                # 删除文集下的文档
+                pro_doc_list = Doc.objects.filter(top_doc=int(pro_id))
+                pro_doc_list.delete()
+                # 删除文集
                 pro.delete()
                 return JsonResponse({'status':True})
             else:
@@ -169,7 +173,7 @@ def create_doc(request):
                     sort = sort if sort != '' else 99,
                     create_user=request.user
                 )
-                return JsonResponse({'status':True,'data':'创建成功'})
+                return JsonResponse({'status':True,'data':doc.id})
             else:
                 return JsonResponse({'status':False,'data':'参数错误'})
         except Exception as e:
diff --git a/db.sqlite3 b/db.sqlite3
index c572389..17f6518 100644
Binary files a/db.sqlite3 and b/db.sqlite3 differ
diff --git a/template/app_admin/admin_user.html b/template/app_admin/admin_user.html
index 4b03d58..18092f3 100644
--- a/template/app_admin/admin_user.html
+++ b/template/app_admin/admin_user.html
@@ -50,7 +50,7 @@
     <script type="text/html" id="userOpera">
       {% verbatim %}
       <a class="layui-table-link" href="javascript:void(0);" onclick="changePwd('{{ d.id }}','{{ d.username }}')">修改密码</a>&nbsp;&nbsp;
-      <a class="layui-table-link" href="javascript:void(0);" onclick="delUser('{{ d.id }}')">删除用户</a>
+      <a class="layui-table-link" href="javascript:void(0);" onclick="delUser('{{ d.id }}','{{ d.username }}')">删除用户</a>
       {% endverbatim %}
     </script>
 <script>
@@ -123,6 +123,34 @@
             btn:['确认修改','取消'],
         })
     };
+    //删除用户
+    delUser = function(uid,username){
+        layer.open({
+            type:1,
+            title:'删除用户',
+            area:'300px;',
+            id:'delPro',//配置ID
+            content:'<div style="margin-left:10px;">警告：此操作将删除用户'+username+'及其所有文档！</div>',
+            btn:['确定','取消'], //添加按钮
+            btnAlign:'c', //按钮居中
+            yes:function (index,layero) {
+                data = {
+                    'user_id':uid,
+                }
+                $.post("{% url 'del_user' %}",data,function(r){
+                    if(r.status){
+                        //删除成功
+                        window.location.reload();
+                        //layer.close(index)
+                    }else{
+                        //删除失败，提示
+                        //console.log(r)
+                        layer.msg(r.data)
+                    }
+                })
+            },
+        });
+    };
     //页面加载执行 获取所有用户信息
     getUserInfo();