From 30ab871400e5064bc38085ef64931b8dc1f64fb9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 16 一月 2024 22:15:37 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front

---
 src/views/login/index.vue |   44 ++++++++++++--------------------------------
 1 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index aef1598..ab64767 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Home class="home">
+  <Home>
     <template slot="test"><span style="color: red">123</span></template>
     <template slot="content">
       <el-form  class="login-form" autoComplete="on" :model="loginForm" :rules="loginRules" ref="loginForm" label-position="left">
@@ -7,44 +7,23 @@
         <span class="svg-container svg-container_login">
           <svg-icon icon-class="user" />
         </span>
-        <el-input  name="username" type="text" v-model="loginForm.username" autoComplete="on" placeholder="璇疯緭鍏ョ敤鎴峰悕" />
+        <el-input class="home-input"  name="username" type="text" v-model="loginForm.username" autoComplete="on" placeholder="璇疯緭鍏ョ敤鎴峰悕" />
       </el-form-item>
       <el-form-item prop="password" class="username">
         <span class="svg-container">
           <svg-icon icon-class="password"></svg-icon>
         </span>
-        <el-input name="password" :type="pwdType" @keyup.enter.native="handleLogin" v-model="loginForm.password" autoComplete="off"
+        <el-input class="home-input" name="password" :type="pwdType" @keyup.enter.native="handleLogin" v-model="loginForm.password" autoComplete="off"
           placeholder="璇疯緭鍏ュ瘑鐮�"></el-input>
           <span class="show-pwd" @click="showPwd"><svg-icon icon-class="eye" v-show="pwdType==='password'"/><svg-icon icon-class="eyeopen" v-show="pwdType!=='password'"/></span>
       </el-form-item>
-      <el-form-item style="text-align: center;margin-top: 30px">
+      <el-form-item class="login-btn" style="text-align: center;">
         <div class="btn" :loading="loading" @click="handleLogin">
           鐧诲綍
         </div>
       </el-form-item>
     </el-form>
-    <p class="compName">鍗冩枃绉戞妧</p><el-form class="login-form" autoComplete="on" :model="loginForm" :rules="loginRules" ref="loginForm" label-position="left">
-      <el-form-item prop="username" class="username">
-        <span class="svg-container svg-container_login">
-          <svg-icon icon-class="user" />
-        </span>
-        <el-input  name="username" type="text" v-model="loginForm.username" autoComplete="on" placeholder="璇疯緭鍏ョ敤鎴峰悕" />
-      </el-form-item>
-      <el-form-item prop="password" class="username">
-        <span class="svg-container">
-          <svg-icon icon-class="password"></svg-icon>
-        </span>
-        <el-input name="password" :type="pwdType" @keyup.enter.native="handleLogin" v-model="loginForm.password" autoComplete="off"
-          placeholder="璇疯緭鍏ュ瘑鐮�"></el-input>
-          <span class="show-pwd" @click="showPwd"><svg-icon icon-class="eye" v-show="pwdType==='password'"/><svg-icon icon-class="eyeopen" v-show="pwdType!=='password'"/></span>
-      </el-form-item>
-      <el-form-item style="text-align: center;margin-top: 30px">
-        <div class="btn" :loading="loading" @click="handleLogin">
-          鐧诲綍
-        </div>
-      </el-form-item>
-    </el-form>
-    <p class="compName">鍗冩枃绉戞妧</p>
+    <p class="compName">Copyright 漏  2023 姹熻嫃鍗冩枃绉戞妧鏈夐檺鍏徃   鐗堟潈鎵�鏈�</p>
     </template>
   </Home>
   <!-- <div class="login-container">
@@ -168,8 +147,7 @@
 $light_gray:#eee;
 
 /* reset element-ui css */
-// .home {
-  .el-input {
+  .login-form .el-input {
     display: inline-block;
     // height: 47px;
     width: calc(100% - 40px);
@@ -178,7 +156,7 @@
       border: 0px;
       -webkit-appearance: none;
       border-radius: 0px;
-      padding: 12px 5px 12px 15px;
+      // padding: 12px 5px 12px 15px;
       color: $light_gray;
       // height: 47px;
       &:-webkit-autofill {
@@ -187,7 +165,6 @@
       }
     }
   }
-// }
 
 
 </style>
@@ -208,8 +185,8 @@
     padding-left: 30px;
     height: 94px;
     flex: 0 0 auto;
-    background-image: url('~@/assets/img/login/top.png');
-    background-size: contain;
+    background: url('~@/assets/img/login/top.png') 100% 100% no-repeat;
+    // background-size: cover;
     img {
       display: inline-block;
       width: 500px;
@@ -313,4 +290,7 @@
     text-align: center;
     font-size: 70%;
   }
+  .login-btn {
+    margin-top: 30px;
+  }
 </style>

--
Gitblit v1.9.3