fix;合并修复问题

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
+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);
}