fix(*): 合并冲突

src/style.css

@@ -40,6 +40,17 @@
   box-shadow: 0px 3px 6px 0px rgba(13, 15, 18, 0.1);
   padding: 1rem;
   box-sizing: border-box;
+    padding: 0;
+    margin: 0;
+}
+
+.page-container {
+    width: 100%;
+    background: #ffffff;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(13, 15, 18, 0.10);
+    padding: 1rem;
+    box-sizing: border-box;
 }
 
 .view-btn {
@@ -51,6 +62,26 @@
 }
 
 .el-button--primary {
-  background-color: #2182a0 !important;
-  border-color: #2182a0 !important;
+    background-color: #2182a0 !important;
+    border-color: #2182a0 !important;
+}
+
+.login-container .el-form-item {
+    background: transparent !important;
+    border: unset !important;
+}
+
+.login-container .el-input__wrapper {
+    background: #181d21 !important;
+    border-radius: 0 !important;
+}
+
+input:-webkit-autofill,
+textarea:-webkit-autofill,
+select:-webkit-autofill {
+    -webkit-text-fill-color: black !important;
+    -webkit-box-shadow: 0 0 0px 1000px transparent inset !important;
+    background-color: transparent;
+    background-image: none;
+    transition: background-color 50000s ease-in-out 0s;
 }
\ No newline at end of file

src/views/login/index.vue

@@ -28,7 +28,7 @@
             tabindex="1"
             @blur="handleAccountBlur($event)"
             @input="debounceAction"
-            autocomplete="on"
+            autocomplete="off"
           />
         </el-form-item>
       </div>
@@ -46,6 +46,7 @@
               show-password
               placeholder="密码 / Password"
               tabindex="1"
+              autocomplete="off"
             />
           </el-form-item>
         </el-tooltip>
@@ -1164,8 +1165,10 @@ $light_gray: #eee;
 .login-container {
   min-height: 100vh;
   width: 100%;
-  background-image: url("../../assets/bg.jpg");
-  background-size: cover;
+  background: url("../../assets/bg.png") no-repeat;
+  background-size: 100% 500px;
+  background-position: calc(50% - 640px) center;
+  background-color: #000;
   overflow: hidden;
 
   .login-container-title {
@@ -1173,30 +1176,38 @@ $light_gray: #eee;
 
     .title {
       font-size: 38px;
+      color: #fff;
+      text-align: right;
+      padding-right: 4%;
     }
   }
 
   .login-old {
     width: 457px;
     height: 500px;
-    background: rgba(255, 255, 255, 1);
-    box-shadow: 0px 15px 30px 0px rgba(0, 85, 183, 0.15);
+    // background: rgba(255, 255, 255, 1);
+    background: #191c21;
+    box-shadow: 0px 15px 30px 0px rgba(255, 255, 255, 0.2);
     padding: 40px;
     position: absolute;
-    right:10%;
-    top: 15%;
-    // transform: translateY(-50%);
-    border-radius: 20px;
+    right:4%;
+    top: calc(50% - 250px);
+    border-radius: 4px;
 
     .el-checkbox-group label {
       margin-top: 20px;
     }
-
     button {
       width: 100%;
       margin-top: 40px;
-      background: #2182a0;
+      background: #181d21 !important;
+      color: #36f1cd !important;
+      border: 1px solid #2a2a2a !important;
       height: 40px;
+      transition: border 0.5s ease;
+    }
+    button:hover {
+      border: 1px solid rgba(54, 241, 205, 0.7) !important;
     }
 
     img {
@@ -1220,6 +1231,11 @@ $light_gray: #eee;
     .el-checkbox-group label {
       margin-top: 20px;
     }
+    .el-form-item {
+      border-bottom: 0 !important;
+      background: transparent !important;
+    }
+    
 
     .login-btn {
       width: 100%;
@@ -1268,11 +1284,11 @@ $light_gray: #eee;
     .title {
       font-size: 26px;
       display: inline-block;
-      color: #2182a0;
+      color: #36f1cd;
     }
 
     span {
-      color: #d4d4d4;
+      color: #29ad93;
       margin-left: 10px;
     }
   }