diff --git a/app_admin/views.py b/app_admin/views.py
index 49af1d0..5c7fbc3 100644
--- a/app_admin/views.py
+++ b/app_admin/views.py
@@ -134,12 +134,29 @@ def admin_create_user(request):
 # 管理员后台 - 修改密码
 @superuser_only
 def admin_change_pwd(request):
-    pass
+    if request.method == 'POST':
+        user_id = request.POST.get('user_id',None)
+        password = request.POST.get('password',None)
+        if user_id and password:
+            user = User.objects.get(id=int(user_id))
+            user.set_password(password)
+            user_id.save()
+            return JsonResponse({'status':True,'data':'修改成功'})
+        else:
+            return JsonResponse({'status':False,'data':'参数错误'})
+    else:
+        return JsonResponse({'status':False,'data':'方法错误'})
 
 # 管理员后台 - 删除用户
 @superuser_only
 def admin_del_user(request):
-    pass
+    if request.method == 'POST':
+        user_id = request.POST.get('user_id',None)
+        user = User.objects.get(id=int(user_id))
+        user.delete()
+        return JsonResponse({'status':True,'data':'删除成功'})
+    else:
+        return JsonResponse({'status':False,'data':'方法错误'})
 
 
 # 管理员后台 - 文集管理
@@ -227,5 +244,17 @@ def admin_doctemp(request):
 
 
 # 普通用户修改密码
+@login_required()
 def change_pwd(request):
-    pass
+    if request.method == 'POST':
+        password = request.POST.get('password',None)
+        if password:
+            if len(password) >= 6:
+                user = User.objects.get(id=request.user.id)
+                user.set_password(password)
+                user.save()
+                return JsonResponse({'status':True,'data':'修改成功'})
+            else:
+                return JsonResponse({'status':False,'data':'密码不得少于6位数'})
+        else:
+            return JsonResponse({'status':False,'data':'参数错误'})
diff --git a/app_doc/views.py b/app_doc/views.py
index a43e745..419894c 100644
--- a/app_doc/views.py
+++ b/app_doc/views.py
@@ -157,6 +157,7 @@ def modify_doc(request,doc_id):
         if request.user == doc.create_user:
             project = Project.objects.get(id=doc.top_doc)
             doc_list = Doc.objects.filter(top_doc=project.id)
+            doctemp_list = DocTemp.objects.filter(create_user=request.user)
             return render(request,'app_doc/modify_doc.html',locals())
         else:
             return HttpResponse("非法请求")
diff --git a/db.sqlite3 b/db.sqlite3
index 6f01557..1a58837 100644
Binary files a/db.sqlite3 and b/db.sqlite3 differ
diff --git a/template/app_doc/create_base.html b/template/app_doc/create_base.html
index d1f8782..4d7e846 100644
--- a/template/app_doc/create_base.html
+++ b/template/app_doc/create_base.html
@@ -12,7 +12,8 @@
 <div class="layui-header">
     <div class="layui-main">
         <a class="logo" href="{% url 'pro_list' %}">
-            <img src="/media/logo.png" />
+{#            <img src="/media/logo.png" />#}
+            <h1><strong>MrDoc</strong></h1>
         </a>
         <ul class="layui-nav layui-layout-right">
             {% if request.user.is_authenticated %}
diff --git a/template/app_doc/modify_doc.html b/template/app_doc/modify_doc.html
index 7de48ea..7437f46 100644
--- a/template/app_doc/modify_doc.html
+++ b/template/app_doc/modify_doc.html
@@ -22,7 +22,7 @@
               </select>
             </div>
             <label class="doc-form-label">
-                <button class="layui-btn layui-btn-primary">插入模板</button>
+                <button class="layui-btn layui-btn-primary" id="sel-doctemp">插入模板</button>
             </label>
             <label class="doc-form-label">
                 <button class="layui-btn layui-btn-normal" onclick="createDoc()">保存</button>
@@ -79,5 +79,61 @@
                 }
             });
         };
+        //选择文档模板
+        $("#sel-doctemp").click(function(){
+            layer.open({
+              type: 1,
+                id:'temp-div',
+              content: $('#doctemp-list'),
+                area:['530px','300px'],
+            });
+        });
+        //插入模板
+        insertTemp = function(doctemp_id){
+            $.post("{% url 'get_doctemp' %}",{'doctemp_id':doctemp_id},function(r){
+                if(r.status){
+                    editor.insertValue(r.data);
+                    layer.closeAll()
+                }else{
+                    layer.msg(r.data)
+                }
+            });
+        };
     </script>
+{% endblock %}
+
+{% block custom_div %}
+    <div class="doctemp-list" id="doctemp-list" style="display: none;width: 500px;">
+    <div style="margin: 10px 0 0 10px;">
+        <a class="layui-btn layui-btn-normal" href="{% url 'create_doctemp' %}" target="_blank">创建新模板</a>
+        <a class="layui-btn layui-btn-normal" href="{% url 'manage_doctemp' %}" target="_blank">管理文档模板</a>
+    </div>
+    <table class="layui-table" style="margin: 10px;">
+      <colgroup>
+        <col width="150">
+        <col width="200">
+        <col>
+      </colgroup>
+      <thead>
+        <tr>
+          <th>模板名称</th>
+          <th>创建时间</th>
+          <th>操作</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for temp in doctemp_list %}
+        <tr>
+          <td>{{ temp.name }}</td>
+          <td>{{ temp.create_time }}</td>
+          <td>
+              <a href="javascript:void(0);" onclick="insertTemp('{{temp.id}}');">选择模板</a>
+{#              <a href="javascript:void(0);" onclick="modifyTemp();">修改</a>#}
+{#              <a href="javascript:void(0);" onclick="delTemp();">删除</a>#}
+          </td>
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+</div>
 {% endblock %}
\ No newline at end of file