jacy/dukang
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

fix;合并修复问题

Browse Source
This commit is contained in:
ljy
2026-07-09 21:42:36 +08:00
parent 3d3588babb
commit 336116fbf2
18 changed files with 341 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/h5-partner/src/pages/LoginPage.tsx
+55 -26
View File
@@ -1,10 +1,10 @@
import { useEffect, useState } from 'react';
import { Link, useNavigate, useSearchParams } from 'react-router-dom';
import { request, saveAuth } from '../lib/api';
import { request, getLastPhone, getPartnerProfile, saveAuth } from '../lib/api';
import { usePartnerSession } from '../contexts/PartnerSessionContext';
import { partnerHomePath } from '../lib/partnerAccess';
import type { PartnerMe } from '@dukang/shared-types';
import {
bindPartnerWechatAfterSmsLogin,
fetchClientConfig,
handlePartnerWechatCallback,
handlePartnerWechatLoginResult,
@@ -13,10 +13,16 @@ import {
import { isWechatEnv } from '../lib/weixin';
import { isWxAuthorizeEnabled } from '@dukang/shared-types';
import { WECHAT_INAPP_REQUIRED_MSG } from '@dukang/weixin-sdk';
import { toastError } from '../lib/toast';
const REMEMBER_PHONE_KEY = 'partner_remember_phone';
const REMEMBER_FLAG_KEY = 'partner_remember_account';
function maskPhone(phone: string) {
if (phone.length < 7) return phone;
return `${phone.slice(0, 3)} **** ${phone.slice(-4)}`;
}
function loadRememberedPhone(): { phone: string; remember: boolean } {
try {
const remember = localStorage.getItem(REMEMBER_FLAG_KEY) === '1';
@@ -40,10 +46,12 @@ function formatPartnerError(e: unknown): string {
export default function LoginPage() {
const navigate = useNavigate();
const { refresh } = usePartnerSession();
const [params] = useSearchParams();
const quick = params.get('quick') === '1';
const savedProfile = getPartnerProfile();
const remembered = loadRememberedPhone();
const [phone, setPhone] = useState(remembered.phone || '13700000001');
const [phone, setPhone] = useState(remembered.phone || getLastPhone());
const [code, setCode] = useState('');
const [rememberAccount, setRememberAccount] = useState(remembered.remember);
const [agreed, setAgreed] = useState(true);
@@ -59,15 +67,21 @@ export default function LoginPage() {
.catch(() => setWxAuthorize(false));
}, []);
const quickName = savedProfile?.name ?? '城市合伙人';
const quickCompany = savedProfile?.companyName ?? '';
const quickPhone = savedProfile?.phone || phone;
useEffect(() => {
if (!isWechatEnv() || !wxAuthorize) return;
if (!isWechatEnv() || !wxAuthorize || !params.get('code')) return;
void handlePartnerWechatCallback()
.then((result) => {
.then(async (result) => {
if (!result) return;
if (handlePartnerWechatLoginResult(result)) navigate('/');
if (!handlePartnerWechatLoginResult(result)) return;
const account = await refresh();
navigate(partnerHomePath(account ?? undefined));
})
.catch((e) => setMsg(formatWechatError(e)));
}, [navigate, wxAuthorize]);
}, [navigate, refresh, wxAuthorize, params]);
function formatWechatError(e: unknown): string {
const text = e instanceof Error ? e.message : '微信登录失败';
@@ -79,7 +93,9 @@ export default function LoginPage() {
function ensureAgreed() {
if (!agreed) {
setMsg('请先勾选并同意用户协议');
const text = '请先勾选并同意用户协议';
setMsg(text);
toastError(text);
return false;
}
return true;
@@ -106,6 +122,7 @@ export default function LoginPage() {
await request('PARTNER_H5', '/partner/auth/sms/send', {
method: 'POST',
body: JSON.stringify({ phone, scene: 'PARTNER_LOGIN' }),
silent: true,
});
setMsg('验证码已发送');
setCodeCooldown(60);
@@ -119,7 +136,9 @@ export default function LoginPage() {
});
}, 1000);
} catch (e) {
setMsg(formatPartnerError(e));
const text = formatPartnerError(e);
setMsg(text);
toastError(text);
}
}
@@ -131,25 +150,24 @@ export default function LoginPage() {
if (options?.quick) {
await request('PARTNER_H5', '/partner/auth/sms/send', {
method: 'POST',
body: JSON.stringify({ phone, scene: 'PARTNER_LOGIN' }),
body: JSON.stringify({ phone: quickPhone, scene: 'PARTNER_LOGIN' }),
silent: true,
});
}
const loginPhone = options?.quick ? quickPhone : phone;
const data = await request<{ accessToken: string; partner?: PartnerMe }>('PARTNER_H5', '/partner/auth/login/sms', {
method: 'POST',
body: JSON.stringify({ phone, code }),
body: JSON.stringify({ phone: loginPhone, code }),
silent: true,
});
saveAuth(data);
persistRememberAccount(phone);
const home = partnerHomePath(data.partner);
if (isWechatEnv() && wxAuthorize) {
setMsg('登录成功，正在关联微信…');
await bindPartnerWechatAfterSmsLogin();
navigate(home);
return;
}
navigate(home);
persistRememberAccount(loginPhone);
const account = await refresh();
navigate(partnerHomePath(account ?? data.partner));
} catch (e) {
setMsg(formatPartnerError(e));
const text = formatPartnerError(e);
setMsg(text);
toastError(text);
} finally {
setLoading(false);
}
@@ -160,14 +178,20 @@ export default function LoginPage() {
setMsg('');
if (!isWechatEnv()) {
setMsg(WECHAT_INAPP_REQUIRED_MSG);
toastError(WECHAT_INAPP_REQUIRED_MSG);
return;
}
setWxLoading(true);
try {
const ok = await loginPartnerWithWechat();
if (ok) navigate('/');
if (ok) {
const account = await refresh();
navigate(partnerHomePath(account ?? undefined));
}
} catch (e) {
setMsg(formatWechatError(e));
const text = formatWechatError(e);
setMsg(text);
toastError(text);
} finally {
setWxLoading(false);
}
@@ -191,15 +215,20 @@ export default function LoginPage() {
</div>
<div style={{ textAlign: 'center' }}>
<h2 className="headline-md">
李明 <span className="text-muted body-md" style={{ fontWeight: 400 }}>(郑州合伙人)</span>
{quickName}
{quickCompany ? (
<span className="text-muted body-md" style={{ fontWeight: 400 }}> ({quickCompany})</span>
) : null}
</h2>
<p className="text-muted body-md" style={{ letterSpacing: '0.1em', marginTop: 4 }}>137 **** 0001</p>
<p className="text-muted body-md" style={{ letterSpacing: '0.1em', marginTop: 4 }}>
{quickPhone ? maskPhone(quickPhone) : '暂无已保存账号'}
</p>
</div>
</section>
<nav style={{ width: '100%', maxWidth: 384, marginTop: 16 }}>
{msg && <p className="partner-auth-msg" style={{ color: 'var(--color-error, #d33)', fontSize: 13, textAlign: 'center', marginBottom: 12 }}>{msg}</p>}
<button type="button" className="partner-btn-primary" onClick={() => void login({ quick: true })} disabled={loading}>
<button type="button" className="partner-btn-primary" onClick={() => void login({ quick: true })} disabled={loading || !quickPhone}>
<span>{loading ? '登录中...' : '一键登录'}</span>
{!loading && <span className="material-symbols-outlined">arrow_forward</span>}
</button>