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