Merge branch 'master' of git.mes123.com:zhouyx/mes-ui

pages/account/login/index.vue

@@ -26,17 +26,20 @@
           <div class="page-account-top-logo tc">
             <img src="@/assets/images/logo.png" alt="logo" />
           </div>
-          <div class="page-account-top-desc tc">SaaS MES 制造执行系统</div>
+          <!-- <div class="page-account-top-desc tc">SaaS MES 制造执行系统</div> -->
         </div>
-        <h3 class="mb10">用户登陆</h3>
+        <h3 class="mb20">用户登陆</h3>
         <Login @on-submit="oidc">
           <UserName name="username" value="admin" />
           <Password name="password" value="admin" enter-to-submit />
-          <div class="page-account-auto-login">
-            <Checkbox v-model="autoLogin" size="large">{{ $t('page.login.remember') }}</Checkbox>
+          <div class="page-account-auto-login mb20">
+            <Checkbox v-model="autoLogin" >{{ $t('page.login.remember') }}</Checkbox>
             <a href>{{ $t('page.login.forgot') }}</a>
           </div>
-          <Submit>{{ $t('page.login.submit') }}</Submit>
+          <div class="mt20">
+            <Submit class="shadown">{{ $t('page.login.submit') }}</Submit>
+          </div>
+          
         </Login>
       </div>
     </div>
@@ -120,7 +123,7 @@ export default {
 };
 </script>
 <style lang="less">
-@jianju:50px;
+@jianju:40px;
 .account {
   position: fixed;
   width: 100%;
@@ -148,7 +151,7 @@ export default {
     background-image: url("../../../assets/images/login/bg2.jpg");
   }
   .bg3 {
-    background-image: url("../../../assets/images/login/bg3.png");
+    background-image: url("../../../assets/images/login/bg3.jpg");
   }
   .main {
     position: absolute;
@@ -157,7 +160,7 @@ export default {
     left: @jianju;
     right: @jianju;
     bottom: @jianju;
-    background: rgba(0, 0, 0, 0.35);
+    background: rgba(38,128,235, 0.3);
     display: flex;
     .ad{
       flex: 1;
@@ -167,7 +170,23 @@ export default {
     .login {
       background-color: white;
       width: 600px;
-      padding: 100px 50px;     
+      padding: 150px 90px; 
+      //  background-image: url("../../../assets/images/login/33.png");
+      //  background-repeat: no-repeat;
+      //  background-position-y: 525px;    
+      .ivu-input-wrapper {
+        margin-bottom: 5px;
+       
+      }
+      .mt20{
+        margin-top: 50px;
+        .shadown{
+          box-shadow: 1px 5px 15px #2680EB;
+        }
+         .ivu-btn-large{
+          height: 50px !important;
+        }
+      }
     }
   }
 }