From 94d7cb492a1b80acc0f5378819b9290d702256e2 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: Wed, 30 Aug 2023 18:20:55 +0800
Subject: [PATCH] =?UTF-8?q?:lipstick:=E6=9B=B4=E6=96=B0=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/pages/login/zh-cn.json |  2 +-
 src/views/login.vue             |  2 +-
 src/views/register.vue          | 96 +++++++++++++++++----------------
 3 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/src/i18n/pages/login/zh-cn.json b/src/i18n/pages/login/zh-cn.json
index 253fe84..7680439 100644
--- a/src/i18n/pages/login/zh-cn.json
+++ b/src/i18n/pages/login/zh-cn.json
@@ -10,7 +10,7 @@
     "reLogin": "重新登录",
     "invalidSession": "无效的会话，或者会话已过期，请重新登录。",
     "otherLoginWay": "其他登录方式",
-    "register": "注册",
+    "register": "立即注册",
     "forgotPwd": "忘记密码"
   }
 }
diff --git a/src/views/login.vue b/src/views/login.vue
index a91f766..502bb2c 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -43,7 +43,7 @@
           </span>
         </div>
 
-        <el-form-item style="width: 100%">
+        <el-form-item style="width: 100%" :style="{ 'margin-top': captchaOnOff == 'off' ? '40px' : '' }">
           <el-button :loading="loading" size="default" type="primary" style="width: 100%" @click.prevent="handleLogin">
             <span v-if="!loading">{{ $t('login.btnLogin') }}</span>
             <span v-else>登 录 中...</span>
diff --git a/src/views/register.vue b/src/views/register.vue
index 6029890..d1298ac 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -1,49 +1,51 @@
 <template>
   <starBackground></starBackground>
-  <div class="register">
-    <el-form ref="registerFormRef" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">{{ title }}</h3>
-      <el-form-item prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
-          <template #prefix>
-            <svg-icon name="user" />
-          </template>
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="password">
-        <el-input v-model="registerForm.password" type="password" auto-complete="off" placeholder="密码" @keyup.enter="handleRegister">
-          <template #prefix>
-            <svg-icon name="password" />
-          </template>
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="confirmPassword">
-        <el-input v-model="registerForm.confirmPassword" type="password" auto-complete="off" placeholder="确认密码" @keyup.enter="handleRegister">
-          <template #prefix>
-            <svg-icon name="password" />
-          </template>
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="code" v-if="captchaOnOff">
-        <el-input v-model="registerForm.code" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter="handleRegister">
-          <template #prefix>
-            <svg-icon name="validCode" />
-          </template>
-        </el-input>
-        <div class="register-code ml10">
-          <img :src="codeUrl" @click="getCode" class="register-code-img" />
-        </div>
-      </el-form-item>
-      <el-form-item style="width: 100%">
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%" @click.prevent="handleRegister">
-          <span v-if="!loading">注 册</span>
-          <span v-else>注 册 中...</span>
-        </el-button>
-        <div style="float: right">
-          <router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
-        </div>
-      </el-form-item>
-    </el-form>
+  <div class="login-wrap">
+    <div class="login">
+      <el-form ref="registerFormRef" :model="registerForm" :rules="registerRules" class="login-form">
+        <h3 class="title">{{ title }}</h3>
+        <el-form-item prop="username">
+          <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
+            <template #prefix>
+              <svg-icon name="user" />
+            </template>
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="password">
+          <el-input v-model="registerForm.password" type="password" auto-complete="off" placeholder="密码" @keyup.enter="handleRegister">
+            <template #prefix>
+              <svg-icon name="password" />
+            </template>
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="confirmPassword">
+          <el-input v-model="registerForm.confirmPassword" type="password" auto-complete="off" placeholder="确认密码" @keyup.enter="handleRegister">
+            <template #prefix>
+              <svg-icon name="password" />
+            </template>
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="code" v-if="captchaOnOff">
+          <el-input v-model="registerForm.code" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter="handleRegister">
+            <template #prefix>
+              <svg-icon name="validCode" />
+            </template>
+          </el-input>
+          <div class="register-code ml10">
+            <img :src="codeUrl" @click="getCode" class="register-code-img" />
+          </div>
+        </el-form-item>
+        <el-form-item style="width: 100%">
+          <el-button :loading="loading" type="primary" size="default" style="width: 100%" @click.prevent="handleRegister">
+            <span v-if="!loading">注 册</span>
+            <span v-else>注 册 中...</span>
+          </el-button>
+          <div style="text-align: center">
+            <router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
+          </div>
+        </el-form-item>
+      </el-form>
+    </div>
     <!--  底部  -->
     <div class="el-register-footer">
       <div v-html="defaultSettings.copyright"></div>
@@ -147,11 +149,14 @@ getCode()
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
+@import '@/assets/styles/login.scss';
 .register {
   display: flex;
   justify-content: center;
   align-items: center;
   height: 100%;
+  background-size: cover;
+  flex-direction: column;
   background: radial-gradient(220% 105% at top center, #1b2947 10%, #4b76a7 40%, #81acae 65%, #f7f7b6);
 }
 .title {
@@ -161,10 +166,9 @@ getCode()
 }
 
 .register-form {
-  border-radius: 6px;
   background: #fff;
   width: var(--base-login-width);
-  padding: 25px 15px 5px 15px;
+  padding: 35px 15px 5px 15px;
   .el-input {
     height: 38px;
     input {