Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -284,7 +284,7 @@ export default {
   }
   }
   .login-user {
   .login-user {
     width: 100%;
     width: 100%;
-    height: 46px;
+    height: 40px;
     border: 1px solid #E5E5E5;
     border: 1px solid #E5E5E5;
     box-sizing: border-box;
     box-sizing: border-box;
     margin-top: 30px;
     margin-top: 30px;
@@ -292,7 +292,7 @@ export default {
     position: relative;
     position: relative;
     .user-icon {
     .user-icon {
       float: left;
       float: left;
-      margin: 13px auto auto 10px;
+      margin: 10px auto auto 10px;
       width: 28px;
       width: 28px;
       height: 18px;
       height: 18px;
     }
     }
@@ -303,7 +303,8 @@ export default {
       outline: 0;
       outline: 0;
       border: none;
       border: none;
       color: #4a4a4a;
       color: #4a4a4a;
-      line-height: 260%;
+      height: 38px;
+      line-height: 40px;
     }
     }
     .password-eye {
     .password-eye {
       float: right;
       float: right;
@@ -339,13 +340,14 @@ export default {
   }
   }
   .login-btn {
   .login-btn {
     width: 100%;
     width: 100%;
-    height: 40px;
+    height: 48px;
     background: #74A3F5;
     background: #74A3F5;
-    border-radius: 4px;
+    border-radius: 2px;
     margin: 0 auto;
     margin: 0 auto;
     margin-top: 40px;
     margin-top: 40px;
-    font-size: 16px;
-    line-height: 40px;
+    font-size: 20px;
+    font-weight: 500;
+    line-height: 48px;
     text-align: center;
     text-align: center;
     color: #fff;
     color: #fff;
     cursor: pointer;
     cursor: pointer;