diff --git a/app_admin/views.py b/app_admin/views.py
index f2f2080..5685798 100644
--- a/app_admin/views.py
+++ b/app_admin/views.py
@@ -50,6 +50,28 @@ def register(request):
     else:
         if request.method == 'GET':
             return render(request,'register.html',locals())
+        elif request.method == 'POST':
+            username = request.POST.get('username',None)
+            email = request.POST.get('email',None)
+            password = request.POST.get('password',None)
+            if username and email and password:
+                if '@'in email:
+                    email_exit = User.objects.filter(email=email)
+                    username_exit = User.objects.filter(username=username)
+                    if email_exit.count() > 0:
+                        errormsg = '电子邮箱已经被注册使用，请更换电子邮箱地址！'
+                        return render(request, 'register.html', locals())
+                    elif username_exit.count() > 0:
+                        errormsg = '用户名已存在，请换一个用户名！'
+                        return render(request, 'register.html', locals())
+                    elif len(password) < 6:
+                        errormsg = '密码必须大于等于6位！'
+                        return render(request, 'register.html', locals())
+                    else:
+                        pass
+                else:
+                    errormsg = '请输入正确的电子邮箱格式！'
+                    return render(request, 'register.html', locals())
 
 # 注销
 def log_out(request):
diff --git a/template/register.html b/template/register.html
index 3925d4f..822527c 100644
--- a/template/register.html
+++ b/template/register.html
@@ -36,7 +36,7 @@
         <div></div>
         <div></div>
         <div class="login-form">
-            <form class="layui-form" action="{% url 'login' %}"  method='POST'>
+            <form class="layui-form" action="{% url 'register' %}"  method='POST'>
                 {% csrf_token %}
                 <div class="layui-form-item">
                     <h2><strong>注册 - MrDoc</strong></h2>
@@ -47,6 +47,11 @@
                       <input type="text" name="username" required  lay-verify="required" placeholder="请输入用户名" autocomplete="off" class="layui-input">
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <div class="layui-input-inline">
+                      <input type="email" name="email" required  lay-verify="required" placeholder="请输入电子邮箱" autocomplete="off" class="layui-input">
+                    </div>
+                </div>
                 <div class="layui-form-item">
                     <div class="layui-input-inline">
                       <input type="password" name="password" required  lay-verify="required" placeholder="请输入密码" autocomplete="off" class="layui-input">
@@ -57,7 +62,6 @@
                         <button class="layui-btn layui-btn-fluid layui-btn-radius  layui-btn-normal" lay-submit lay-filter="formDemo" type="submit">登录</button>
                     </div>
                 </div>
-                <a href="{% url 'register' %}" class="register-link">注册新账号</a>
             </form>
         </div>
     </div>