微信小程序登录页面调整

This commit is contained in:
2026-07-12 15:30:58 +08:00
parent bfac6c6663
commit 758760eb36
7 changed files with 134 additions and 21 deletions
+11 -9
View File
@@ -8,6 +8,7 @@ import {
type WechatLoginResult,
} from '@dukang/shared-types';
import PageShell from '../../components/PageShell';
import WechatLoginButton from '../../components/WechatLoginButton';
import { finishLoginNavigate } from '../../lib/auth-nav';
import { request, saveAuth, toast, type SessionPayload } from '../../lib/api';
import { loginWithWechat } from '../../lib/wechat-auth';
@@ -154,7 +155,11 @@ export default function LoginPage() {
const result = await loginWithWechat();
handleWechatLoginResult(result);
} catch (e) {
setMsg(e instanceof Error ? e.message : '微信登录失败');
const raw = e instanceof Error ? e.message : '微信登录失败';
const hint = /invalid code/i.test(raw)
? '微信 code 无效:请确认后端 WX_MINI_APP_ID 与小程序 appid 一致,或本地联调使用 MOCK_WECHAT'
: raw;
setMsg(hint);
} finally {
setWxLoading(false);
}
@@ -162,6 +167,8 @@ export default function LoginPage() {
const displayMsg = msg || sentHint;
const codeDisabled = cooldown > 0 || sending;
const showWechatLogin =
!bindMode && (process.env.TARO_ENV === 'weapp' || wxAuthorize);
return (
<PageShell variant="plain" className="login-page">
@@ -233,22 +240,17 @@ export default function LoginPage() {
</Button>
</View>
{!bindMode && wxAuthorize ? (
{showWechatLogin ? (
<>
<View className="login-divider">
<View className="login-divider-line" />
<Text className="login-divider-text"></Text>
<View className="login-divider-line" />
</View>
<Button
className="login-wechat-btn"
<WechatLoginButton
loading={wxLoading}
disabled={wxLoading}
onClick={() => void wechatLogin()}
>
<Text className="login-wechat-icon"></Text>
<Text></Text>
</Button>
/>
</>
) : null}
</View>