Merge branch 'master' of http://192.168.60.201/root/sup-server

dsk-srm-server/src/login.vue

@@ -5,6 +5,7 @@
                 <source src="@/assets/background.mp4" type="video/mp4">
             </video>
         </div>
+        <img class="logo" src="@/assets/images/logo.png">
         <img class="righttop" src="@/assets/images/ico01.png">
         <div class="login">
             <img class="logintop" src="@/assets/images/ico02.png">
@@ -16,12 +17,12 @@
                 <input placeholder="请输入账号密码">
             </div>
             <div class="inputs">
-                <input placeholder="请输入账号密码">
+                <input placeholder="" class="small">
                 <div class="login-code">
                     <img :src="codeUrl" @click="getCode" class="login-code-img"/>
                 </div>
             </div>
-            <button class="loginin">登录</button>
+            <div class="loginin">登录</div>
             <img class="loginbot" src="@/assets/images/ico03.png">
         </div>
         <footers/>
@@ -66,6 +67,12 @@
         position: fixed;
         bottom: 0;
         left: 0;}
+        .logo{
+            position: absolute;
+            left: 16px;
+            top: 16px;
+
+        }
         .righttop{
             position: absolute;
             right: 16px;
@@ -95,24 +102,56 @@
                 text-align: center;
                 margin-top: 60px;
                 margin-bottom: 40px;
+                line-height: 17px;
             }
             .inputs{
                 margin-bottom: 24px;
-                text-align: center;
+                padding:0 43px;
                 input{
-                    width: 340px;
-                    height: 48px;
+                    width: 338px;
+                    height: 46px;
                     background: #F8F8F8;
                     border-radius: 8px;
                     border: 1px solid #F4F4F4;
-                    padding-left: 16px  ;
+                    text-indent: 16px  ;
                     outline: none;
                     font-size: 14px;
+                    padding: 0;
                 }
                 input::-webkit-input-placeholder,
                 textarea::-webkit-input-placeholder {
                     color: #9E9E9E;
                 }
+                .small{
+                    width: 191px;
+
+                }
+                .login-code{
+                    float: right;
+                    width: 131px;
+                    height: 46px;
+                    background: #FFFFFF;
+                    border-radius: 8px;
+                    border: 1px solid #F1F1F1;
+                }
+            }
+            .loginin{
+                width: 340px;
+                height: 48px;
+                background: #0081FF;
+                border-radius: 8px;
+                margin: 0 auto;
+                line-height: 48px;
+                font-size: 16px;
+                font-family: Microsoft YaHei-Bold, Microsoft YaHei;
+                font-weight: bold;
+                color: #FFFFFF;
+                text-align: center;
+            }
+            .loginbot{
+                position: absolute;
+                bottom: 32px;
+                left: 169px;
             }
         }
     }