From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/pc/components/login/normal-login/index.scss |   93 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 83 insertions(+), 10 deletions(-)

diff --git a/src/pc/components/login/normal-login/index.scss b/src/pc/components/login/normal-login/index.scss
index 95e396e..e1b347c 100644
--- a/src/pc/components/login/normal-login/index.scss
+++ b/src/pc/components/login/normal-login/index.scss
@@ -7,6 +7,7 @@
   background-repeat: no-repeat;
   background-size: cover;
   min-height: 100px;
+  max-width: 100%;
   
   .card-control {
     position: absolute;
@@ -38,15 +39,35 @@
         background: transparent;
       }
     }
-    button:not(.vercode) {
-      width: 100%;
-      height: 40px;
-      line-height: 1;
-      font-size: 18px;
-      margin-bottom: 15px;
+    .form-item-wrap {
+      .btn-login {
+        // margin-top: 45px;
+        .login-form-button {
+          width: 100%;
+          height: 40px;
+          line-height: 1;
+          font-size: 18px;
+          margin-bottom: 15px;
+          border-radius: 4px;
+        }
+        .sign-form-button {
+          width: 100%;
+          height: 40px;
+          line-height: 1;
+          font-size: 18px;
+          margin-bottom: 15px;
+          border-radius: 30px;
+        }
+      }
     }
     .ant-form-item:last-child {
       margin-bottom: 0;
+    }
+    .mk-jump-way {
+      cursor: pointer;
+      float: right;
+      color: #1890ff;
+      margin-bottom: 15px;
     }
   }
   .login-way-title {
@@ -93,7 +114,10 @@
   .protocol-wrap {
     padding: 0 20px 15px;
     span {
-      font-size: 13px;
+      font-size: 12px;
+    }
+    .ant-checkbox + span {
+      padding-right: 0px;
     }
     .protocol {
       color: #1890ff;
@@ -111,6 +135,53 @@
   }
   .login-ways.center {
     text-align: center;
+  }
+  .sign-ways {
+    clear: both;
+    text-align: center;
+    margin-top: 25px;
+    .title {
+      color: #959595;
+      display: flex;
+      padding: 0 15%;
+    }
+    .title::before, .title::after {
+      display: inline-block;
+      content: ' ';
+      height: 0.5px;
+      flex: 1;
+      background-color: rgba(0, 0, 0, 0.15);
+      position: relative;
+      top: 12px;
+    }
+    .title::before {
+      margin: 0 25px 0 0;
+    }
+    .title::after {
+      margin: 0 0 0 25px;
+    }
+    .content {
+      display: flex;
+      .item {
+        flex: 1;
+        cursor: pointer;
+        padding-top: 10px;
+        .anticon {
+          font-size: 20px;
+          width: 40px;
+          height: 40px;
+          line-height: 45px;
+          border-radius: 40px;
+          background: #e6f7ff;
+          color: #1890ff;
+        }
+        .name {
+          color: #000000;
+          display: block;
+          margin-top: 10px;
+        }
+      }
+    }
   }
 
   .form-scan-wrap {
@@ -157,9 +228,6 @@
 
 .mk-mob-view .login-edit-box {
   display: block;
-  // .login-way-wrap.simple {
-  //   display: none;
-  // }
   .login-way-wrap {
     padding: 0 15px;
     border-radius: 0;
@@ -186,4 +254,9 @@
     border: 0;
     border-radius: 0;
   }
+  .protocol-wrap {
+    span {
+      font-size: 13px;
+    }
+  }
 }

--
Gitblit v1.8.0