main #96

Merged
charles merged 4 commits from main into prod 2026-04-21 16:24:36 +08:00
Showing only changes of commit e316cda2cb - Show all commits

View File

@ -118,18 +118,19 @@
</div> </div>
<!-- 微信登录按钮 --> <!-- 微信登录按钮 -->
<div style="display:flex;margin-bottom: 30px"> <!-- <div style="display:flex;margin-bottom: 30px">
<el-button style="width: 300px;margin-top: 10px;color: #1890ff" class="login-btn" <el-button style="width: 300px;margin-top: 10px;color: #1890ff" class="login-btn"
@click.native.prevent="wxBtn"> @click.native.prevent="wxBtn">
微信登录 微信登录
</el-button> </el-button>
</div> </div> -->
<!-- 底部链接忘记密码和注册 --> <!-- 底部链接忘记密码和注册 -->
<div class="two-btn"> <div class="two-btn">
<span type="text" class="forget-password" @click="resetPassword()"> <!-- <span type="text" class="forget-password" @click="resetPassword()">
忘记密码? 忘记密码?
</span> </span> -->
<i></i>
<span :loading="loading" type="primary" class="go-register" <span :loading="loading" type="primary" class="go-register"
style="width: 127px; margin-bottom: 30px; margin-left: 0px" @click.native.prevent="handleRegister" style="width: 127px; margin-bottom: 30px; margin-left: 0px" @click.native.prevent="handleRegister"
@click="handleRegister"> @click="handleRegister">
@ -1083,8 +1084,8 @@ $dark_gray: #889aa4;
padding-left: 52px; padding-left: 52px;
padding-right: 49px; padding-right: 49px;
width: 481px; //width: 481px;
height: 521px; //height: 521px;
mix-blend-mode: normal; mix-blend-mode: normal;
background-color: white; background-color: white;
border-radius: 24px; border-radius: 24px;