Merge branch 'liuxin' into develop

src/pages/login.vue

@@ -50,7 +50,7 @@ export default {
   },
   methods: {
     changeType () {
-      this.pwdType = this.pwdType === 'password' ? 'text' : 'password';
+      this.pwdType = this.pwdType === 'password' ? 'text' : 'password'
       this.openEye =
         this.pwdType === 'password'
           ? require('@/assets/login/passNoShow.png')
@@ -100,7 +100,7 @@ export default {
       } else if (!vm.password || vm.password === undefined) {
         vm.hlsPopup.showLongCenter('请输入密码')
       } else {
-        let url = process.env.loginPath + 'admin';
+        let url = process.env.loginPath + 'admin'
         let param = {}
         vm.hlsPopup.showLoading('请稍等')
         vm.$post(url, param).then(function (res) {
@@ -117,11 +117,11 @@ export default {
       this.$router.push('pwd-forgot')
     },
     clearAccount: function () {
-      this.username = '';
-      this.password = '';
+      this.username = ''
+      this.password = ''
     },
     clearPassword: function () {
-      this.password = '';
+      this.password = ''
     },
   },
 }
@@ -192,6 +192,7 @@ export default {
         font-size: 14px;
         color: #2a2a2a;
         height: 35px;
+        line-height: 35px;
         display: flex;
         align-items: center;
         border-bottom: 1px solid rgba(42, 42, 42, 0.4);

src/pages/regiester2.vue

@@ -306,6 +306,7 @@ export default {
           padding-bottom: 8px;
           font-size: 14px;
           color: #ffffff;
+          line-height: 30px;
           border-bottom: 1px solid rgba(255, 255, 255, 0.4);
         }
         input::placeholder {