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>
apps/h5-partner/src/pages/StaffCreatePage.tsx
+18 -8
View File
@@ -3,6 +3,7 @@ import { useNavigate } from 'react-router-dom';
import PageHeader from '@dukang/shared-ui/PageHeader';
import { PARTNER_STAFF_ROLE_LABELS, PartnerStaffRole } from '@dukang/shared-types';
import { createPartnerStaff, sendStaffAddSms } from '../lib/staff';
import { toastError, toastSuccess } from '../lib/toast';
const ROLE_OPTIONS = Object.values(PartnerStaffRole);
@@ -18,7 +19,9 @@ export default function StaffCreatePage() {
async function sendCode() {
if (!/^1[3-9]\d{9}$/.test(phone.trim())) {
setMsg('请输入正确的11位手机号');
const text = '请输入正确的11位手机号';
setMsg(text);
toastError(text);
return;
}
setSending(true);
@@ -26,8 +29,8 @@ export default function StaffCreatePage() {
try {
await sendStaffAddSms(phone.trim());
setMsg('验证码已发送');
} catch (e) {
setMsg(e instanceof Error ? e.message : '发送失败');
} catch {
/* request 已 toast */
} finally {
setSending(false);
}
@@ -35,15 +38,21 @@ export default function StaffCreatePage() {
async function submit() {
if (!name.trim()) {
setMsg('请填写真实姓名');
const text = '请填写真实姓名';
setMsg(text);
toastError(text);
return;
}
if (!/^1[3-9]\d{9}$/.test(phone.trim())) {
setMsg('请输入正确的11位手机号');
const text = '请输入正确的11位手机号';
setMsg(text);
toastError(text);
return;
}
if (!code.trim()) {
setMsg('请输入验证码');
const text = '请输入验证码';
setMsg(text);
toastError(text);
return;
}
setSubmitting(true);
@@ -55,9 +64,10 @@ export default function StaffCreatePage() {
staffRole,
code: code.trim(),
});
toastSuccess('子账号创建成功');
navigate('/center/staff');
} catch (e) {
setMsg(e instanceof Error ? e.message : '创建失败');
} catch {
/* request 已 toast */
} finally {
setSubmitting(false);
}
apps/h5-partner/src/pages/StaffListPage.tsx
+10 -9
View File
@@ -8,6 +8,7 @@ import {
type PartnerStaffItem,
} from '@dukang/shared-types';
import { deletePartnerStaff, listPartnerStaff, updatePartnerStaff } from '../lib/staff';
import { toastError } from '../lib/toast';
export default function StaffListPage() {
const navigate = useNavigate();
@@ -17,8 +18,8 @@ export default function StaffListPage() {
const [busyId, setBusyId] = useState<string | null>(null);
const loadStaff = useCallback(() => {
return listPartnerStaff().then(setStaff).catch((e) => {
setError(e instanceof Error ? e.message : '加载失败');
return listPartnerStaff().then(setStaff).catch(() => {
/* request 已 toast */
});
}, []);
@@ -39,8 +40,8 @@ export default function StaffListPage() {
try {
await updatePartnerStaff(item.id, { status: next });
await loadStaff();
} catch (e) {
setError(e instanceof Error ? e.message : '操作失败');
} catch {
/* request 已 toast */
} finally {
setBusyId(null);
}
@@ -54,8 +55,8 @@ export default function StaffListPage() {
try {
await deletePartnerStaff(item.id);
await loadStaff();
} catch (e) {
setError(e instanceof Error ? e.message : '删除失败');
} catch {
/* request 已 toast */
} finally {
setBusyId(null);
}
@@ -70,7 +71,7 @@ export default function StaffListPage() {
if (roleInput == null) return;
const staffRole = roleOptions.find((r) => r === roleInput || PARTNER_STAFF_ROLE_LABELS[r] === roleInput);
if (!staffRole) {
setError('无效的角色');
toastError('无效的角色');
return;
}
setBusyId(item.id);
@@ -78,8 +79,8 @@ export default function StaffListPage() {
try {
await updatePartnerStaff(item.id, { name: name.trim(), staffRole });
await loadStaff();
} catch (e) {
setError(e instanceof Error ? e.message : '编辑失败');
} catch {
/* request 已 toast */
} finally {
setBusyId(null);
}
apps/h5-partner/src/pages/StoreCreatePage.tsx
+27 -48
View File
@@ -9,6 +9,7 @@ import ChinaRegionPicker from '../components/ChinaRegionPicker';
import OssUploadField from '../components/OssUploadField';
import { request } from '../lib/api';
import { toastError, toastSuccess } from '../lib/toast';
import { resolveRegionBinding } from '../lib/china-region';
@@ -96,7 +97,10 @@ export default function StoreCreatePage() {
const [wechatReady, setWechatReady] = useState(false);
function reportFormError(message: string) {
setSubmitError(message);
toastError(message);
}
const stepFromUrl = Number(params.get('step') || 0);
@@ -176,7 +180,7 @@ export default function StoreCreatePage() {
})
.catch((e) => setSubmitError(e instanceof Error ? e.message : '微信授权失败'));
.catch((e) => reportFormError(e instanceof Error ? e.message : '微信授权失败'));
}, [params, setParams]);
@@ -194,7 +198,11 @@ export default function StoreCreatePage() {
})
.catch((e) => setCitiesError(e instanceof Error ? e.message : '加载开城城市失败'));
.catch((e) => {
const msg = e instanceof Error ? e.message : '加载开城城市失败';
setCitiesError(msg);
toastError(msg);
});
}, []);
@@ -283,11 +291,8 @@ export default function StoreCreatePage() {
const msg = validateStoreStep1(form);
if (msg) {
setSubmitError(msg);
reportFormError(msg);
return;
}
setCheckingPhone(true);
@@ -301,21 +306,13 @@ export default function StoreCreatePage() {
const phoneCheck = await checkStorePhoneAvailable(form.phone.trim());
if (!phoneCheck.available) {
setFieldErrors({
phone: phoneCheck.message ?? '该手机号已绑定门店，请更换',
});
const phoneMsg = phoneCheck.message ?? '该手机号已绑定门店，请更换';
setFieldErrors({ phone: phoneMsg });
toastError(phoneMsg);
return;
}
} catch (e) {
setSubmitError(e instanceof Error ? e.message : '手机号校验失败');
} catch {
return;
} finally {
@@ -331,11 +328,8 @@ export default function StoreCreatePage() {
const msg = validateStoreStep2(form);
if (msg) {
setSubmitError(msg);
reportFormError(msg);
return;
}
}
@@ -351,39 +345,32 @@ export default function StoreCreatePage() {
const msg = validateStoreStep3(form);
if (msg) {
setSubmitError(msg);
reportFormError(msg);
return;
}
const step1Msg = validateStoreStep1(form);
if (step1Msg) {
setSubmitError(step1Msg);
reportFormError(step1Msg);
goStep(1);
return;
}
if (!/^\d+$/.test(form.cityId.trim())) {
reportFormError('所选地区未匹配到开城城市，请重新选择');
goStep(1);
return;
}
const step2Msg = validateStoreStep2(form);
if (step2Msg) {
setSubmitError(step2Msg);
reportFormError(step2Msg);
goStep(2);
return;
}
setSubmitting(true);
setSubmitError('');
@@ -451,25 +438,17 @@ export default function StoreCreatePage() {
});
clearStoreDraft();
toastSuccess('门店录入成功');
navigate(`/stores/${result.store.id}`);
} catch (e) {
const message = e instanceof Error ? e.message : '提交失败';
if (isPhoneConflictMessage(message)) {
setFieldErrors({ phone: message });
toastError(message);
goStep(1);
return;
}
setSubmitError(message);
} finally {
setSubmitting(false);
apps/h5-partner/src/pages/StoreDetailPage.tsx
+7 -19
View File
@@ -3,6 +3,7 @@ import { useNavigate, useParams } from 'react-router-dom';
import PageHeader from '@dukang/shared-ui/PageHeader';
import AppImage from '@dukang/shared-ui/AppImage';
import { request } from '../lib/api';
import { toastSuccess } from '../lib/toast';
import { usePartnerSession } from '../contexts/PartnerSessionContext';
import { isSubAccount } from '../lib/partnerAccess';
import { storeStatusLabel, storeStatusPillClass, type StoreStatusValue } from '../lib/storeStatus';
@@ -20,13 +21,6 @@ export default function StoreDetailPage() {
const [status, setStatus] = useState<StoreStatusValue>('OPEN');
const [statusSaving, setStatusSaving] = useState(false);
const [saving, setSaving] = useState(false);
const [error, setError] = useState('');
const [toast, setToast] = useState('');
function showToast(message: string) {
setToast(message);
window.setTimeout(() => setToast(''), 2000);
}
function applyStore(data: Record<string, unknown>) {
setStore(data);
@@ -58,7 +52,6 @@ export default function StoreDetailPage() {
if (!ok) return;
}
setStatusSaving(true);
setError('');
try {
const updated = await request<Record<string, unknown>>('PARTNER_H5', `/partner/stores/${id}/status`, {
method: 'PUT',
@@ -66,9 +59,9 @@ export default function StoreDetailPage() {
});
setStatus(next);
setStore((prev) => (prev ? { ...prev, ...updated, status: next } : prev));
showToast('状态已更新');
} catch (e) {
setError(e instanceof Error ? e.message : '状态更新失败');
toastSuccess('状态已更新');
} catch {
/* request 已 toast */
} finally {
setStatusSaving(false);
}
@@ -77,7 +70,6 @@ export default function StoreDetailPage() {
async function saveBasic() {
if (!id || saving || status === 'CLOSED') return;
setSaving(true);
setError('');
try {
const data = await request<Record<string, unknown>>('PARTNER_H5', `/partner/stores/${id}/basic`, {
method: 'PUT',
@@ -89,9 +81,9 @@ export default function StoreDetailPage() {
}),
});
applyStore(data);
showToast('已保存');
} catch (e) {
setError(e instanceof Error ? e.message : '保存失败');
toastSuccess('已保存');
} catch {
/* request 已 toast */
} finally {
setSaving(false);
}
@@ -118,8 +110,6 @@ export default function StoreDetailPage() {
<PageHeader title="门店详情" onBack={() => navigate('/stores')} />
<main style={{ padding: '16px 20px' }}>
{error && <p className="partner-form-error" role="alert" style={{ marginBottom: 12 }}>{error}</p>}
{!subReadonly && (
<section className="partner-form-card" style={{ margin: '0 0 16px' }}>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 }}>
@@ -217,8 +207,6 @@ export default function StoreDetailPage() {
</button>
)}
</footer>
{toast && <div className="partner-toast">{toast}</div>}
</div>
);
}
apps/h5-partner/src/pages/StoreListPage.tsx
+2 -2
View File
@@ -52,8 +52,8 @@ export default function StoreListPage() {
body: JSON.stringify({ status: next }),
});
await loadStores();
} catch (e) {
setError(e instanceof Error ? e.message : '状态更新失败');
} catch {
/* request 已 toast */
} finally {
setUpdatingId(null);
}