From d0764c7facff9abf00af6f3ff06a26260d1d8770 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 五月 2025 16:34:25 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/views/login/index.scss |  139 +++++++++++++++++++++++++++++++++++-----------
 1 files changed, 105 insertions(+), 34 deletions(-)

diff --git a/src/views/login/index.scss b/src/views/login/index.scss
index 608a846..598e2be 100644
--- a/src/views/login/index.scss
+++ b/src/views/login/index.scss
@@ -1,22 +1,25 @@
 .login-container {
   height: 100vh;
   min-height: 600px;
-  background-color: #000000;
+  background-color: var(--mk-sys-background);
   background-size: cover;
   background-repeat: no-repeat;
   background-position: center center;
+  --mk-login-offset-top: 0px;
+  --mk-login-offset-left: 0px;
+
   .logo {
     position: relative;
     height: 100px;
     padding-top: 30px;
     line-height: 80px;
-    border-bottom: 2px solid #1890ff;
+    border-bottom: 2px solid var(--mk-sys-color);
     img {
       max-height: 100%;
     }
     .plat-name {
       position: absolute;
-      color: #ffffff;
+      color: var(--mk-sys-font-color);
       line-height: 30px;
       font-size: 30px;
       font-weight: 600;
@@ -28,23 +31,48 @@
 
   .login-middle {
     position: relative;
-    height: calc(100vh - 194px);
+    height: calc(100vh - 200px);
     min-height: 420px;
-    background-size: cover;
-    background-position: center center;
-    border-bottom: 2px solid #1890ff;
+    border-bottom: 2px solid var(--mk-sys-color);
+    display: flex;
+    align-items: center;
+    justify-content: right;
+    padding-right: 20vw;
+    overflow: hidden;
+
+    .login-form-button {
+      background-color: var(--mk-sys-color);
+      border-color: var(--mk-sys-color);
+    }
+    .login-form-button[disabled] {
+      background-color: var(--mk-sys-color5);
+      border-color: var(--mk-sys-color5);
+    }
+    .login-form-button.disabled {
+      background-color: var(--mk-sys-color5);
+      border-color: var(--mk-sys-color5);
+      color: #ffffff;
+      cursor: not-allowed;
+      opacity: 0.9;
+    }
+
+    .login-way-wrap {
+      .login-way.active, .login-way:hover {
+        color: var(--mk-sys-color);
+      }
+    }
 
     .login-form {
       position: relative;
-      float: right;
-      margin-top: 5%;
-      margin-right: 20%;
       background: #ffffff;
       width: 22vw;
       min-width: 300px;
       border-radius: 5px;
       overflow: hidden;
       border: 1px solid #bfbfbf;
+      top: var(--mk-login-offset-top, 0px);
+      left: var(--mk-login-offset-left, 0px);
+      transition: all 0.2s;
 
       .login-way-title {
         font-size: 18px;
@@ -100,6 +128,15 @@
       .form-item-wrap {
         // padding: 0.6vw 1.6vw 1.6vw;
         padding: 0.6vw 1.6vw 0vw;
+
+        .ant-select-auto-complete.ant-select .ant-select-selection--single {
+          height: calc(2vw + 5px);
+          min-height: 30px;
+        }
+
+        .ant-select-auto-complete.ant-select .ant-input:focus, .ant-select-auto-complete.ant-select .ant-input:hover {
+          border-color: var(--mk-sys-color);
+        }
       }
 
       h4 {
@@ -129,6 +166,7 @@
       .btn-login {
         margin-bottom: 3vh;
         clear: both;
+        height: auto;
       }
       .register-line {
         font-size: 14px;
@@ -151,6 +189,7 @@
         display: inline-block;
         margin-bottom: 3vh;
         margin-top: -10px;
+        height: 35px;
       }
       .minline.right {
         float: right;
@@ -165,8 +204,37 @@
           }
         }
       }
+      .proline {
+        display: inline-block;
+        margin-bottom: 10px;
+        height: auto;
+        margin-top: calc(-3vh + 10px);
+        font-size: 13px;
+        .ant-form-item-children {
+          display: flex;
+          align-items: flex-start;
+          line-height: 1.5;
+          color: rgba(0, 0, 0, 0.5);
+
+          // .ant-checkbox-inner {
+          //   width: 15px;
+          //   height: 15px;
+          // }
+          input[type="checkbox"] {
+            width: 35px;
+            height: 22px;
+            top: -4px;
+            left: -4px;
+          }
+
+          a {
+            color: var(--mk-sys-color);
+          }
+        }
+      }
       button.vercode {
         border: 0;
+        color: var(--mk-sys-color);
       }
       button:not(.vercode) {
         width: 100%;
@@ -198,7 +266,7 @@
         font-size: 18px;
       }
       .anticon-eye {
-        color: #1890ff;
+        color: var(--mk-sys-color);
       }
     }
     .login-sync-button {
@@ -209,15 +277,14 @@
   }
   .login-bottom {
     text-align: center;
-    color: #ffffff;
+    color: var(--mk-sys-font-color);
     padding-top: 20px;
-    p span.split {
-      margin-right: 15px;
+    p {
+      margin-bottom: 5px;
+      text-align: center;
     }
     a {
-      display: inline-block;
-      margin-bottom: 5px;
-      color: #ffffff;
+      color: var(--mk-sys-font-color);
     }
   }
   .ant-btn-primary[disabled] {
@@ -265,6 +332,25 @@
         }
       }
     }
+
+    .qr-wrap + img {
+      width: 24px;
+      margin-right: 5px;
+      vertical-align: middle;
+    }
+  }
+}
+.mk-user-option {
+  .anticon-close-circle {
+    float: right;
+    opacity: 0;
+    transition: opacity 0.3s;
+    padding: 3px;
+  }
+}
+.mk-user-option:hover {
+  .anticon-close-circle {
+    opacity: 1;
   }
 }
 .sync-cloud-application {
@@ -279,23 +365,8 @@
 @media screen and (max-width: 500px) {
   .login-container {
     .login-middle {
-      .login-form {
-        float: unset;
-        margin: 0 auto;
-        margin-top: 5%;
-      }
-    }
-  }
-}
-
-@media screen and (min-width: 1550px) {
-  .login-container {
-    .ant-tabs.ant-tabs-card {
-      .ant-tabs-card-bar {
-        .ant-tabs-tab {
-          font-size: 20px;
-        }
-      }
+      justify-content: center;
+      padding-right: 0px;
     }
   }
 }
\ No newline at end of file

--
Gitblit v1.8.0