diff --git a/views/user/templates/base_login.html b/views/user/templates/base_login.html
deleted file mode 100644
index 2dc3123..0000000
--- a/views/user/templates/base_login.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-      <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-      <title>{% block title %}
-      登录
-      {% endblock %}</title>
-      <link rel="stylesheet" href="/static/css/backend-plugin.min.css">
-      <link rel="stylesheet" href="/static/css/backend.css">
-  <meta name="referrer" content="no-referrer" />
-  </head>
-  <body class=" ">
-    <!-- loader Start -->
-    <div id="loading">
-          <div id="loading-center">
-          </div>
-    </div>
-    <!-- loader END -->
-
-      <div class="wrapper">
-    <section class="login-content" style="background-image: url(https://img0.baidu.com/it/u=4260343253,426122526&fm=253&fmt=auto&app=120&f=JPEG?w=1280&h=800);background-repeat: no-repeat;background-size: cover">
-         <div class="container h-100">
-            <div class="row align-items-center justify-content-center h-100">
-               <div class="col-md-5">
-                  <div class="card p-3">
-                     {% block content %}
-                      <div class="card-body">
-                        <div class="auth-logo">
-                           <img src="https://weibo.com/favicon.ico" class="img-fluid rounded-normal light-logo" alt="logo">
-                        </div>
-                        <h3 class="mb-3 font-weight-bold text-center">登录</h3>
-                        <p class="text-center text-secondary mb-4">微博话题舆情分析可视化系统 - flask echarts SnowNLP</p>
-                        <div class="mb-5">
-                            <p class="line-around text-secondary mb-0"><span class="line-around-1">输入您的用户名和密码</span></p>
-                        </div>
-                        <form method="POST" action="/user/login">
-                           <div class="row">
-                              <div class="col-lg-12">
-                                 <div class="form-group">
-                                    <label class="text-secondary">用户名</label>
-                                    <input class="form-control" name="username" type="text" placeholder="请输入您的用户名">
-                                 </div>
-                              </div>
-                              <div class="col-lg-12 mt-2">
-                                 <div class="form-group">
-                                     <div class="d-flex justify-content-between align-items-center">
-                                         <label class="text-secondary">密码</label>
-                                     </div>
-                                    <input class="form-control" name="password" type="password" placeholder="请输入您的密码">
-                                 </div>
-                              </div>
-                           </div>
-                           <button type="submit" class="btn btn-primary btn-block mt-2">登录</button>
-                           <div class="col-lg-12 mt-3">
-                                <p class="mb-0 text-center">还没有账号?  <a href="/user/register">注册</a></p>
-                           </div>
-                        </form>
-                     </div>
-                      {% endblock %}
-                  </div>
-               </div>
-            </div>
-         </div>
-      </section>
-      </div>
-
-    <script src="/static/js/backend-bundle.min.js"></script>
-    <script src="/static/js/customizer.js"></script>
-    <script src="/static/js/sidebar.js"></script>
-    <script src="/static/js/flex-tree.min.js"></script>
-    <script src="/static/js/tree.js"></script>
-    <script src="/static/js/table-treeview.js"></script>
-    <script src="/static/js/sweetalert.js"></script>
-    <script src="/static/js/vector-map-custom.js"></script>
-    <script src="/static/js/chart-custom.js"></script>
-    <script src="/static/js/01.js"></script>
-    <script src="/static/js/02.js"></script>
-    <script src="/static/js/slider.js"></script>
-    <script src="/static/js/index.js" type="module"></script>
-    <script src="/static/js/app.js"></script>  </body>
-</html>
\ No newline at end of file
diff --git a/views/user/templates/login.html b/views/user/templates/login.html
deleted file mode 100644
index 752cccf..0000000
--- a/views/user/templates/login.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends 'base_login.html' %}
\ No newline at end of file
diff --git a/views/user/templates/login1.html b/views/user/templates/login_and_register.html
similarity index 93%
rename from views/user/templates/login1.html
rename to views/user/templates/login_and_register.html
index 80cf0a6..b5d7177 100644
--- a/views/user/templates/login1.html
+++ b/views/user/templates/login_and_register.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh">
 
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>原神登录</title>
+    <title>微博舆情分析系统 | 登录</title>
     <link rel="icon" href="../../../static/原神启动/favicon.ico">
 </head>
 
@@ -326,7 +326,7 @@
     <div id="black-hid">
     </div>
 
-    <form id="login" class="login show">
+    <form id="login" class="login show" method="POST" action="/user/login">
         <div class="login_box">
             <div class="title">
                 <!-- <a class="QRcode" href=""><img src="login_resources/二维码 (1).png" alt=""></a> -->
@@ -335,8 +335,8 @@
             </div>
         </div>
         <div class="content">
-            <div class="input"><input type="text" placeholder="输入手机号/邮箱"></div>
-            <div class="input"><input type="password" placeholder="输入密码"></div>
+            <div class="input"><input type="text" name="username" placeholder="输入账号/原神"></div>
+            <div class="input"><input type="password" name="password" placeholder="输入密码/始める！"></div>
         </div>
         <div class="register-text">
             <span>
@@ -355,7 +355,7 @@
     </form>
 
 
-    <form id="register" class="register">
+    <form id="register" class="register" method="POST" action="/user/register">
         <div class="login_box">
             <div class="title">
                 <a class="logo" href=""><img src="../../../static/原神启动//logo2.08ebb840.png" alt=""></a>
@@ -367,11 +367,11 @@
                 <span
                     style="display: inline-block;width: 60px;height: 60px;font-size: 21px;font-weight: 800;color: black;line-height: 60px;text-align: center; ">
                     +86</span>
-                <input style="width: 452px;float: right;" type="text" placeholder="输入手机号">
+                <input style="width: 452px;float: right;" type="text" name="username" placeholder="输入要注册的账号">
                 <a class="yanzhengma" href=""
-                    style="position: absolute; top: 43px;right: 60px;color: #d6c194;font-weight: 700;letter-spacing: 0.1em;">获取验证码</a>
+                    style="position: absolute; top: 43px;right: 60px;color: #d6c194;font-weight: 700;letter-spacing: 0.1em;">我是假按钮</a>
             </div>
-            <div class="input"><input type="text" placeholder="输入短信验证码"></div>
+            <div class="input"><input type="text" name="password" placeholder="设定密码"></div>
         </div>
         <div class="xieyi">
             <input type="checkbox">
diff --git a/views/user/templates/register.html b/views/user/templates/register.html
deleted file mode 100644
index 54e4446..0000000
--- a/views/user/templates/register.html
+++ /dev/null
@@ -1,48 +0,0 @@
-{% extends 'base_login.html' %}
-
-{% block title %}
-注册
-{% endblock %}
-
-{% block content %}
-<div class="card-body">
-                        <div class="auth-logo">
-                           <img src="https://weibo.com/favicon.ico" class="img-fluid rounded-normal light-logo" alt="logo">
-                        </div>
-                        <h3 class="mb-3 font-weight-bold text-center">注册</h3>
-                        <p class="text-center text-secondary mb-4">微博话题舆情分析可视化系统 - flask echarts SnowNLP</p>
-                        <div class="mb-5">
-                            <p class="line-around text-secondary mb-0"><span class="line-around-1">输填写好注册信息方可完成注册</span></p>
-                        </div>
-                        <form method="POST" action="/user/register">
-                           <div class="row">
-                              <div class="col-lg-12">
-                                 <div class="form-group">
-                                    <label class="text-secondary">用户名</label>
-                                    <input class="form-control" name="username" type="text" placeholder="请输入您的用户名">
-                                 </div>
-                              </div>
-                              <div class="col-lg-12 mt-2">
-                                 <div class="form-group">
-                                     <div class="d-flex justify-content-between align-items-center">
-                                         <label class="text-secondary">密码</label>
-                                     </div>
-                                    <input class="form-control" name="password" type="password" placeholder="请输入您的密码">
-                                 </div>
-                              </div>
-                               <div class="col-lg-12 mt-2">
-                                 <div class="form-group">
-                                     <div class="d-flex justify-content-between align-items-center">
-                                         <label class="text-secondary">确认密码</label>
-                                     </div>
-                                    <input class="form-control" name="checkPassword" type="password" placeholder="请再次输入您的密码">
-                                 </div>
-                              </div>
-                           </div>
-                           <button type="submit" class="btn btn-primary btn-block mt-2">注册</button>
-                           <div class="col-lg-12 mt-3">
-                                <p class="mb-0 text-center">已有账号?  <a href="/user/login">登录</a></p>
-                           </div>
-                        </form>
-                     </div>
-{% endblock %}
\ No newline at end of file
