diff --git a/apps/mini-user/src/pages/login/index.tsx b/apps/mini-user/src/pages/login/index.tsx index 0e3390e..c5617f7 100644 --- a/apps/mini-user/src/pages/login/index.tsx +++ b/apps/mini-user/src/pages/login/index.tsx @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react'; -import { View, Text, Input, Button, Image } from '@tarojs/components'; +import { View, Text, Input, Image } from '@tarojs/components'; import Taro, { useRouter } from '@tarojs/taro'; import { SmsScene, @@ -351,20 +351,20 @@ export default function LoginPage() { ) : null} - + + {loading + ? '处理中...' + : completeMode === 'phone' + ? '完成验证' + : bindMode + ? '绑定并登录' + : '登录'} + + )} diff --git a/apps/mini-user/src/styles/login.css b/apps/mini-user/src/styles/login.css index 250d259..a79eeed 100644 --- a/apps/mini-user/src/styles/login.css +++ b/apps/mini-user/src/styles/login.css @@ -155,10 +155,10 @@ width: 100%; height: 48px; margin-top: 8px; - border: 1px solid rgba(166, 29, 36, 0.2); + border: 1.5px solid var(--color-heritage-red, #a61d24); border-radius: var(--radius-lg); - background: transparent; - color: var(--color-heritage-red); + background: #fff; + color: var(--color-heritage-red, #a61d24); font-family: var(--font-headline); font-size: 18px; font-weight: 600; @@ -167,14 +167,24 @@ justify-content: center; line-height: 1; padding: 0; + box-sizing: border-box; } -.login-sms-btn::after { - border: none; +.login-sms-btn__text { + color: var(--color-heritage-red, #a61d24); + font-size: 18px; + font-weight: 600; + line-height: 26px; } -.login-sms-btn[disabled] { +.login-sms-btn:active { + background: rgba(166, 29, 36, 0.06); + transform: scale(0.98); +} + +.login-sms-btn--disabled { opacity: 0.6; + pointer-events: none; } .login-divider {