Merge branch 'master' into dev

@@ -11,11 +11,16 @@
           class="demo-ruleForm"
           class="demo-ruleForm"
         >
         >
           <el-form-item prop="account">
           <el-form-item prop="account">
-            <el-input v-model="user.account" placeholder="用户名"></el-input>
+            <el-input
+              class="username"
+              v-model="user.account"
+              placeholder="用户名"
+            ></el-input>
           </el-form-item>
           </el-form-item>
           <el-form-item prop="password">
           <el-form-item prop="password">
             <el-input
             <el-input
               type="password"
               type="password"
+              class="password"
               v-model="user.password"
               v-model="user.password"
               placeholder="登录密码"
               placeholder="登录密码"
             ></el-input>
             ></el-input>
@@ -129,6 +134,13 @@ export default {
 };
 };
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
+.username,
+.password {
+  /deep/ .el-input__inner {
+    border: 1px solid #6bc1fc;
+    background-color: transparent !important;
+  }
+}
 .bg {
 .bg {
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
@@ -157,7 +169,6 @@ export default {
     margin-bottom: 20px;
     margin-bottom: 20px;
   }
   }
 }
 }
-
 .login .btn {
 .login .btn {
   width: 100%;
   width: 100%;
   height: 6vh;
   height: 6vh;
@@ -188,20 +199,9 @@ export default {
 
 
 #loginform .el-input__inner {
 #loginform .el-input__inner {
   width: 100% !important;
   width: 100% !important;
-  caret-color: #000 !important;
-  color: #606266 !important;
-  border-radius: 4px !important;
-  border: 1px solid #67c23a !important;
-  background: #fff !important;
-  opacity: 1 !important;
 }
 }
 
 
-#loginform .el-input__inner::-webkit-input-placeholder {
-  /* WebKit browsers */
-  color: #80807f !important;
-}
 .el-checkbox__label {
 .el-checkbox__label {
   color: #fff;
   color: #fff;
 }
 }
 </style>
 </style>
-<style></style>