From 2c922c5fdd8cf5f09adafa1a01f0b9583bc304e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 10 Sep 2023 08:13:35 +0800
Subject: [PATCH] =?UTF-8?q?:style:=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/login.scss              |  4 +++-
 src/views/components/Login/phoneLogin.vue |  7 +------
 src/views/login.vue                       | 20 +++++++++++---------
 src/views/register.vue                    |  2 +-
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/assets/styles/login.scss b/src/assets/styles/login.scss
index 46026d1..347f48f 100644
--- a/src/assets/styles/login.scss
+++ b/src/assets/styles/login.scss
@@ -16,6 +16,7 @@
     border-radius: 6px;
     width: var(--base-login-width);
     position: relative;
+    height: 420px;
   }
 }
 
@@ -28,7 +29,7 @@
 .login-form {
   padding: 5px 25px 5px 25px;
   position: relative;
-  height: 250px;
+  // height: 250px;
 
   .input-icon {
     height: 30px;
@@ -115,6 +116,7 @@
   text-align: center;
   align-items: center;
   justify-content: space-around;
+  margin-bottom: 20px;
 }
 
 @media screen and (max-width: 500px) {
diff --git a/src/views/components/Login/phoneLogin.vue b/src/views/components/Login/phoneLogin.vue
index 310339a..bd5c598 100644
--- a/src/views/components/Login/phoneLogin.vue
+++ b/src/views/components/Login/phoneLogin.vue
@@ -40,7 +40,7 @@
 
 <script setup name="phonelogin">
 import { getCodeImg } from '@/api/system/login'
-import useUserStore from '@/store/modules/user'
+// import useUserStore from '@/store/modules/user'
 
 const route = useRoute()
 const { proxy } = getCurrentInstance()
@@ -98,9 +98,4 @@ getCode()
 
 <style lang="scss" scoped>
 @import '@/assets/styles/login.scss';
-.forget-pwd {
-  color: #ccc;
-  margin-right: 10px;
-  cursor: pointer;
-}
 </style>
diff --git a/src/views/login.vue b/src/views/login.vue
index 842a392..36aad40 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -40,20 +40,20 @@
           </div>
         </el-form-item>
 
-        <div style="display: flex; justify-content: space-between; align-items: center">
-          <el-checkbox v-model="loginForm.rememberMe">{{ $t('login.rememberMe') }}</el-checkbox>
-          <span style="font-size: 12px">
-            <span @click="handleForgetPwd()" class="forget-pwd">{{ $t('login.forgotPwd') }}</span>
-            <router-link class="link-type" :to="'/register'">{{ $t('login.register') }}</router-link>
-          </span>
-        </div>
-
         <el-form-item style="width: 100%" :style="{ 'margin-top': captchaOnOff == 'off' ? '40px' : '' }">
           <el-button :loading="loading" size="default" round type="primary" style="width: 100%" @click.prevent="handleLogin">
             <span v-if="!loading">{{ $t('login.btnLogin') }}</span>
             <span v-else>登 录 中...</span>
           </el-button>
         </el-form-item>
+
+        <div style="display: flex; justify-content: space-between; align-items: center">
+          <el-checkbox v-model="loginForm.rememberMe">{{ $t('login.rememberMe') }}</el-checkbox>
+          <span style="font-size: 12px">
+            <router-link class="link-type" :to="'/register'">{{ $t('login.register') }}</router-link>
+            <span @click="handleForgetPwd()" class="forget-pwd">{{ $t('login.forgotPwd') }}</span>
+          </span>
+        </div>
       </el-form>
       <div class="qr-wrap login-form" v-show="loginType == 3">
         <div class="login-scan-container">
@@ -258,8 +258,10 @@ getCookie()
 @import '@/assets/styles/login.scss';
 .forget-pwd {
   color: #ccc;
-  margin-right: 10px;
+  margin-left: 10px;
   cursor: pointer;
+  border-left: 1px solid;
+  padding-left: 10px;
 }
 .qrCode {
   width: 160px;
diff --git a/src/views/register.vue b/src/views/register.vue
index bb28ade..68dbc7e 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -162,7 +162,7 @@ getCode()
   background: radial-gradient(220% 105% at top center, #1b2947 10%, #4b76a7 40%, #81acae 65%, #f7f7b6);
 }
 .login-form {
-  height: 380px;
+  padding: 15px 25px 15px 25px;
 }
 .title {
   margin: 0px auto 30px auto;