Merge remote-tracking branch 'origin/master'

src/views/login/components/login.vue

@@ -1,6 +1,5 @@
 <template>
     <div>
-        
         <div v-if="!isRestPwd">
             <div class="login_form">
                 <el-form autoComplete="on" :model="loginForm" :rules="loginRules" ref="loginForm">

src/views/login/index.scss

@@ -55,13 +55,15 @@
                 .top {
                     display: flex;
                     justify-content: space-between;
-                    h2 {
+                    height: 40px;
+                    .title {
+                        font-weight: bold;
                         color: #40485B;
                         font-size: 35px;
                     }
                     span {
-                        margin-top: 10px;
-                        color: #40485B;;
+                        color: #40485B;
+                        line-height: 40px;
                     }
                 }
             }

src/views/login/index.vue

@@ -11,7 +11,7 @@
                 <div class="login_box">
                     <div class="login_box_content">
                         <div class="top">
-                            <h2>平台{{status == 'register' ? '注册' : '登录' }}</h2>
+                            <span class="title">平台{{status == 'register' ? '注册' : '登录' }}</span>
                             <span v-if="status == 'login'" >没有账号？<a style="color:#409EFF;" @click="status = 'register' ">点此注册</a> </span>
                             <span v-else>已有账号？<a style="color:#409EFF;" @click="status = 'login' ">点此登录</a> </span>
                         </div>