Merge branch 'master' of https://gitee.com/virus010101/linfeng-community

src/main/resources/static/linfeng-community-vue/src/views/common/login.vue

@@ -3,7 +3,7 @@
     <div class="site-content__wrapper">
       <div class="site-content">
         <div class="brand-info">
-          <h2 class="brand-info__text">林风社交论坛后台系统</h2>
+          <h2 class="brand-info__text">林风社交论坛-开源版后台系统</h2>
           <p class="brand-info__intro">
             基于Springboot MybatisPlus Shiro Jwt Vue Uniapp Redis
             MySQL构建的社交app平台
@@ -12,25 +12,12 @@
         </div>
         <div class="login-main">
           <h3 class="login-title">管理员登录</h3>
-          <el-form
+          <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" status-icon>
-            :model="dataForm"
-            :rules="dataRule"
-            ref="dataForm"
-            @keyup.enter.native="dataFormSubmit()"
-            status-icon
-          >
             <el-form-item prop="userName">
-              <el-input
+              <el-input v-model="dataForm.userName" placeholder="帐号"></el-input>
-                v-model="dataForm.userName"
-                placeholder="帐号"
-              ></el-input>
             </el-form-item>
             <el-form-item prop="password">
-              <el-input
+              <el-input v-model="dataForm.password" type="password" placeholder="密码"></el-input>
-                v-model="dataForm.password"
-                type="password"
-                placeholder="密码"
-              ></el-input>
             </el-form-item>
             <el-form-item prop="captcha">
               <el-row :gutter="20">
@@ -44,12 +31,7 @@
               </el-row>
             </el-form-item>
             <el-form-item>
-              <el-button
+              <el-button class="login-btn-submit" type="primary" @click="dataFormSubmit()">登录</el-button>
-                class="login-btn-submit"
-                type="primary"
-                @click="dataFormSubmit()"
-                >登录</el-button
-              >
             </el-form-item>
           </el-form>
         </div>
@@ -132,6 +114,7 @@ export default {
   left: 0;
   background-color: rgba(38, 50, 56, 0.6);
   overflow: hidden;
+
   &:before {
     position: fixed;
     top: 0;
@@ -143,6 +126,7 @@ export default {
     background-image: url(~@/assets/img/login_bg.jpg);
     background-size: cover;
   }
+
   .site-content__wrapper {
     position: absolute;
     top: 0;
@@ -155,26 +139,31 @@ export default {
     overflow-y: auto;
     background-color: transparent;
   }
+
   .site-content {
     min-height: 100%;
     padding: 30px 500px 30px 30px;
   }
+
   .brand-info {
     margin: 220px 100px 0 90px;
     color: #fff;
   }
+
   .brand-info__text {
     margin: 0 0 22px 0;
     font-size: 48px;
     font-weight: 400;
     text-transform: uppercase;
   }
+
   .brand-info__intro {
     margin: 10px 0;
     font-size: 16px;
     line-height: 1.58;
     opacity: 0.6;
   }
+
   .login-main {
     position: absolute;
     top: 0;
@@ -184,16 +173,20 @@ export default {
     min-height: 100%;
     background-color: #fff;
   }
+
   .login-title {
     font-size: 16px;
   }
+
   .login-captcha {
     overflow: hidden;
+
     >img {
       width: 100%;
       cursor: pointer;
     }
   }
+
   .login-btn-submit {
     width: 100%;
     margin-top: 38px;