fix;合并修复问题

apps/h5-partner/src/App.tsx

@@ -1,44 +1,13 @@
-import { Routes, Route, Navigate } from 'react-router-dom';
+import { Routes, Route, Navigate } from 'react-router-dom';
-
+import LoginPage from './pages/LoginPage';
-import { useEffect } from 'react';
+import PartnerAppRoutes from './PartnerAppRoutes';
-
+import { isLoggedIn } from './lib/api';
-import LoginPage from './pages/LoginPage';
+
-
+export default function App() {
-import PartnerAppRoutes from './PartnerAppRoutes';
+  return (
-
+    <Routes>
-import { handlePartnerWechatCallback, handlePartnerWechatLoginResult } from './lib/wechat-auth';
+      <Route path="/login" element={<LoginPage />} />
-
+      <Route path="/*" element={isLoggedIn() ? <PartnerAppRoutes /> : <Navigate to="/login" replace />} />
-import { isLoggedIn } from './lib/api';
+    </Routes>
-
+  );
-import { isWechatEnv } from './lib/weixin';
+}
-
-import { useLocation, useNavigate } from 'react-router-dom';
-
-
-
-function WechatOAuthHandler() {
-
-  const location = useLocation();
-
-  const navigate = useNavigate();
-
-
-
-  useEffect(() => {
-
-    if (!isWechatEnv() || !location.search.includes('code=')) return;
-
-    if (location.pathname === '/login') return;
-
-    void handlePartnerWechatCallback()
-
-      .then((result) => {
-
-        if (!result || !handlePartnerWechatLoginResult(result)) return;
-
-        const params = new URLSearchParams(location.search);
-
-        params.delete('code');
-
-        params.delete('state');
-

apps/h5-partner/src/components/OssUploadField.tsx

@@ -1,5 +1,6 @@
 import { useEffect, useId, useRef, useState } from 'react';
 import { uploadFileToOss, type OssMediaType } from '../lib/upload';
+import { toastError } from '../lib/toast';
 import {
   authorizePartnerWechat,
   fetchClientConfig,
@@ -84,7 +85,9 @@ export default function OssUploadField({
 
   async function uploadSelectedFile(file: File) {
     if (file.size > DEFAULT_MAX_MB * 1024 * 1024) {
-      setError(`文件不能超过 ${DEFAULT_MAX_MB}MB`);
+      const text = `文件不能超过 ${DEFAULT_MAX_MB}MB`;
+      setError(text);
+      toastError(text);
       return;
     }
     setUploading(true);
@@ -106,7 +109,9 @@ export default function OssUploadField({
     try {
       await authorizePartnerWechat();
     } catch (e) {
-      setError(e instanceof Error ? e.message : '微信授权失败');
+      const text = e instanceof Error ? e.message : '微信授权失败';
+      setError(text);
+      toastError(text);
       setAuthorizing(false);
     }
   }
@@ -132,7 +137,9 @@ export default function OssUploadField({
     setError('');
 
     if (useWechatPicker && needsAuth) {
-      setError('请先完成微信授权后再上传照片');
+      const text = '请先完成微信授权后再上传照片';
+      setError(text);
+      toastError(text);
       return;
     }
 

apps/h5-partner/src/contexts/PartnerSessionContext.tsx

@@ -12,7 +12,7 @@ type PartnerSessionValue = {
   account: PartnerAccount | null;
   loading: boolean;
   loggedIn: boolean;
-  refresh: () => Promise<void>;
+  refresh: () => Promise<PartnerAccount | null>;
   logout: () => void;
 };
 
@@ -21,18 +21,24 @@ const PartnerSessionContext = createContext<PartnerSessionValue | null>(null);
 export function PartnerSessionProvider({ children }: { children: ReactNode }) {
   const [account, setAccount] = useState<PartnerAccount | null>(null);
   const [loading, setLoading] = useState(true);
+  const [loggedIn, setLoggedIn] = useState(() => isLoggedIn());
 
-  const refresh = useCallback(async () => {
+  const refresh = useCallback(async (): Promise<PartnerAccount | null> => {
     if (!isLoggedIn()) {
       setAccount(null);
+      setLoggedIn(false);
       setLoading(false);
-      return;
+      return null;
     }
+    setLoggedIn(true);
+    setLoading(true);
     try {
-      const data = await request<PartnerAccount>('PARTNER_H5', '/partner/me');
+      const data = await request<PartnerAccount>('PARTNER_H5', '/partner/me', { silent: true });
       setAccount(data);
+      return data;
     } catch {
       setAccount(null);
+      return null;
     } finally {
       setLoading(false);
     }
@@ -41,6 +47,7 @@ export function PartnerSessionProvider({ children }: { children: ReactNode }) {
   const logout = useCallback(() => {
     clearAuth();
     setAccount(null);
+    setLoggedIn(false);
     window.location.href = toAppPath('/login');
   }, []);
 
@@ -50,7 +57,7 @@ export function PartnerSessionProvider({ children }: { children: ReactNode }) {
 
   return (
     <PartnerSessionContext.Provider
-      value={{ account, loading, loggedIn: isLoggedIn(), refresh, logout }}
+      value={{ account, loading, loggedIn, refresh, logout }}
     >
       {children}
     </PartnerSessionContext.Provider>

apps/h5-partner/src/contexts/PartnerToastContext.tsx

@@ -0,0 +1,53 @@
+import { createContext, useCallback, useContext, useEffect, useRef, useState, type ReactNode } from 'react';
+import { registerPartnerToastListener, type PartnerToastVariant } from '../lib/toast';
+
+type PartnerToastContextValue = {
+  showToast: (message: string, variant?: PartnerToastVariant) => void;
+};
+
+const PartnerToastContext = createContext<PartnerToastContextValue | null>(null);
+
+export function PartnerToastProvider({ children }: { children: ReactNode }) {
+  const [toast, setToast] = useState('');
+  const [variant, setVariant] = useState<PartnerToastVariant>('success');
+  const timerRef = useRef<number | null>(null);
+
+  const showToast = useCallback((message: string, nextVariant: PartnerToastVariant = 'success') => {
+    if (timerRef.current) window.clearTimeout(timerRef.current);
+    setVariant(nextVariant);
+    setToast(message);
+    timerRef.current = window.setTimeout(() => {
+      setToast('');
+      timerRef.current = null;
+    }, nextVariant === 'error' ? 3000 : 2000);
+  }, []);
+
+  useEffect(() => {
+    registerPartnerToastListener(showToast);
+    return () => {
+      registerPartnerToastListener(null);
+      if (timerRef.current) window.clearTimeout(timerRef.current);
+    };
+  }, [showToast]);
+
+  return (
+    <PartnerToastContext.Provider value={{ showToast }}>
+      {children}
+      {toast ? (
+        <div
+          className={`partner-toast${variant === 'error' ? ' partner-toast--error' : ''}`}
+          role="alert"
+          aria-live="assertive"
+        >
+          {toast}
+        </div>
+      ) : null}
+    </PartnerToastContext.Provider>
+  );
+}
+
+export function usePartnerToast(): PartnerToastContextValue {
+  const ctx = useContext(PartnerToastContext);
+  if (!ctx) throw new Error('usePartnerToast 必须在 PartnerToastProvider 内使用');
+  return ctx;
+}

apps/h5-partner/src/lib/api.ts

@@ -1,34 +1,82 @@
+import type { PartnerMe } from '@dukang/shared-types';
 import { isOnAppPath, toAppPath } from '@dukang/weixin-sdk';
+import { showPartnerToast } from './toast';
 
 export const apiBase = '/api/v1';
 
-export async function request<T>(clientApp: string, path: string, options: RequestInit = {}): Promise<T> {
+const LAST_PHONE = 'partnerLastPhone';
+const PARTNER_PROFILE = 'partnerProfile';
+
+export type PartnerSessionProfile = Pick<PartnerMe, 'id' | 'name' | 'phone' | 'companyName'>;
+
+export type PartnerAuthPayload = {
+  accessToken: string;
+  partner?: PartnerSessionProfile;
+};
+
+export type ApiRequestOptions = RequestInit & {
+  /** 为 true 时不弹出 toast（由调用方自行展示） */
+  silent?: boolean;
+};
+
+export function getLastPhone() {
+  return localStorage.getItem(LAST_PHONE) ?? '';
+}
+
+export function getPartnerProfile(): PartnerSessionProfile | null {
+  try {
+    const raw = localStorage.getItem(PARTNER_PROFILE);
+    return raw ? (JSON.parse(raw) as PartnerSessionProfile) : null;
+  } catch {
+    return null;
+  }
+}
+
+export async function request<T>(
+  clientApp: string,
+  path: string,
+  options: ApiRequestOptions = {},
+): Promise<T> {
+  const { silent, ...fetchOptions } = options;
   const token = localStorage.getItem('accessToken');
   const headers: Record<string, string> = {
     'Content-Type': 'application/json',
     'X-Client-App': clientApp,
-    ...(options.headers as Record<string, string>),
+    ...(fetchOptions.headers as Record<string, string>),
   };
   if (token) headers.Authorization = `Bearer ${token}`;
-  const res = await fetch(`${apiBase}${path}`, { ...options, headers });
+  const res = await fetch(`${apiBase}${path}`, { ...fetchOptions, headers });
   const json = await res.json().catch(() => ({ code: res.status, message: '网络异常' }));
+  const message = json.message || (res.status === 401 ? '登录已过期，请重新登录' : '请求失败');
+
   if (res.status === 401 || json.code === 401) {
-    clearAuth();
+    if (token && localStorage.getItem('accessToken') === token) {
-    if (typeof window !== 'undefined' && !isOnAppPath('/login')) {
+      clearAuth();
-      window.location.href = toAppPath('/login');
+      if (!silent) showPartnerToast(message, 'error');
+      if (typeof window !== 'undefined' && !isOnAppPath('/login')) {
+        window.location.href = toAppPath('/login');
+      }
     }
-    throw new Error(json.message || '登录已过期，请重新登录');
+    throw new Error(message);
+  }
+  if (json.code !== 0) {
+    if (!silent) showPartnerToast(message, 'error');
+    throw new Error(message);
   }
-  if (json.code !== 0) throw new Error(json.message || '请求失败');
   return json.data as T;
 }
 
-export function saveAuth(data: { accessToken: string }) {
+export function saveAuth(data: PartnerAuthPayload) {
   localStorage.setItem('accessToken', data.accessToken);
+  if (data.partner) {
+    localStorage.setItem(PARTNER_PROFILE, JSON.stringify(data.partner));
+    localStorage.setItem(LAST_PHONE, data.partner.phone);
+  }
 }
 
 export function clearAuth() {
   localStorage.removeItem('accessToken');
+  localStorage.removeItem(PARTNER_PROFILE);
 }
 
 export function isLoggedIn() {

apps/h5-partner/src/lib/toast.ts

@@ -0,0 +1,23 @@
+export type PartnerToastVariant = 'success' | 'error';
+
+type PartnerToastListener = (message: string, variant: PartnerToastVariant) => void;
+
+let listener: PartnerToastListener | null = null;
+
+export function registerPartnerToastListener(fn: PartnerToastListener | null) {
+  listener = fn;
+}
+
+export function showPartnerToast(message: string, variant: PartnerToastVariant = 'error') {
+  const text = message.trim();
+  if (!text || !listener) return;
+  listener(text, variant);
+}
+
+export function toastError(message: string) {
+  showPartnerToast(message, 'error');
+}
+
+export function toastSuccess(message: string) {
+  showPartnerToast(message, 'success');
+}

apps/h5-partner/src/lib/upload.ts

@@ -1,4 +1,5 @@
 import { apiBase, request } from './api';
+import { showPartnerToast } from './toast';
 
 export type OssMediaType = 'IMAGE' | 'VIDEO' | 'FILE';
 
@@ -32,9 +33,13 @@ export async function uploadFileToOss(
   const json = await res.json();
   if (json.code === 401) {
     localStorage.removeItem('accessToken');
+    showPartnerToast('未登录', 'error');
     throw new Error('未登录');
   }
-  if (json.code !== 0) throw new Error(json.message || '上传失败');
+  if (json.code !== 0) {
+    showPartnerToast(json.message || '上传失败', 'error');
+    throw new Error(json.message || '上传失败');
+  }
 
   const data = json.data as UploadFileResult;
   return {

apps/h5-partner/src/lib/wechat-auth.ts

@@ -41,6 +41,19 @@ export function handlePartnerWechatLoginResult(result: WechatLoginResult): boole
   return true;
 }
 
+/** 微信登录成功后拉取并缓存合伙人资料，供一键登录页展示 */
+export async function persistPartnerProfileAfterLogin(): Promise<void> {
+  try {
+    const profile = await fetchPartnerProfile();
+    saveAuth({
+      accessToken: localStorage.getItem('accessToken') ?? '',
+      partner: profile,
+    });
+  } catch {
+    /* ignore */
+  }
+}
+
 export async function handlePartnerWechatCallback(): Promise<WechatLoginResult | null> {
   if (!isWechatEnv()) return null;
   const config = await fetchClientConfig();
@@ -62,16 +75,6 @@ export async function loginPartnerWithWechat(): Promise<boolean | void> {
   if (result) return handlePartnerWechatLoginResult(result);
 }
 
-/**
- * 短信登录成功后于微信内自动发起 OAuth，将 openId 绑定到当前合伙人账号（便于同一微信后续免登）。
- */
-export async function bindPartnerWechatAfterSmsLogin(): Promise<void> {
-  const config = await fetchClientConfig();
-  if (!isWxAuthorizeEnabled(config)) return;
-  if (!isWechatEnv()) return;
-  await weixinSdk.login();
-}
-
 export async function authorizePartnerWechat(): Promise<WechatLoginResult | void> {
   const config = await fetchClientConfig();
   if (!isWxAuthorizeEnabled(config)) return;

apps/h5-partner/src/main.tsx

@@ -4,14 +4,17 @@ import { BrowserRouter } from 'react-router-dom';
 import { getRouterBasename } from '@dukang/weixin-sdk';
 import App from './App';
 import { PartnerSessionProvider } from './contexts/PartnerSessionContext';
+import { PartnerToastProvider } from './contexts/PartnerToastContext';
 import './styles.css';
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
     <BrowserRouter basename={getRouterBasename()}>
-      <PartnerSessionProvider>
+      <PartnerToastProvider>
-        <App />
+        <PartnerSessionProvider>
-      </PartnerSessionProvider>
+          <App />
+        </PartnerSessionProvider>
+      </PartnerToastProvider>
     </BrowserRouter>
   </React.StrictMode>,
 );

apps/h5-partner/src/pages/LoginPage.tsx

@@ -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);
+      persistRememberAccount(loginPhone);
-      const home = partnerHomePath(data.partner);
+      const account = await refresh();
-      if (isWechatEnv() && wxAuthorize) {
+      navigate(partnerHomePath(account ?? data.partner));
-        setMsg('登录成功，正在关联微信…');
-        await bindPartnerWechatAfterSmsLogin();
-        navigate(home);
-        return;
-      }
-      navigate(home);
     } 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

@@ -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) {
+    } catch {
-      setMsg(e instanceof Error ? e.message : '发送失败');
+      /* 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) {
+    } catch {
-      setMsg(e instanceof Error ? e.message : '创建失败');
+      /* request 已 toast */
     } finally {
       setSubmitting(false);
     }

apps/h5-partner/src/pages/StaffListPage.tsx

@@ -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) => {
+    return listPartnerStaff().then(setStaff).catch(() => {
-      setError(e instanceof Error ? e.message : '加载失败');
+      /* request 已 toast */
     });
   }, []);
 
@@ -39,8 +40,8 @@ export default function StaffListPage() {
     try {
       await updatePartnerStaff(item.id, { status: next });
       await loadStaff();
-    } catch (e) {
+    } catch {
-      setError(e instanceof Error ? e.message : '操作失败');
+      /* request 已 toast */
     } finally {
       setBusyId(null);
     }
@@ -54,8 +55,8 @@ export default function StaffListPage() {
     try {
       await deletePartnerStaff(item.id);
       await loadStaff();
-    } catch (e) {
+    } catch {
-      setError(e instanceof Error ? e.message : '删除失败');
+      /* 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) {
+    } catch {
-      setError(e instanceof Error ? e.message : '编辑失败');
+      /* request 已 toast */
     } finally {
       setBusyId(null);
     }

apps/h5-partner/src/pages/StoreCreatePage.tsx

@@ -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) {
-
+        reportFormError(msg);
-        setSubmitError(msg);
-
         return;
-
       }
 
       setCheckingPhone(true);
@@ -301,21 +306,13 @@ export default function StoreCreatePage() {
         const phoneCheck = await checkStorePhoneAvailable(form.phone.trim());
 
         if (!phoneCheck.available) {
-
+          const phoneMsg = phoneCheck.message ?? '该手机号已绑定门店，请更换';
-          setFieldErrors({
+          setFieldErrors({ phone: phoneMsg });
-
+          toastError(phoneMsg);
-            phone: phoneCheck.message ?? '该手机号已绑定门店，请更换',
-
-          });
-
           return;
-
         }
 
-      } catch (e) {
+      } catch {
-
-        setSubmitError(e instanceof Error ? e.message : '手机号校验失败');
-
         return;
 
       } finally {
@@ -331,11 +328,8 @@ export default function StoreCreatePage() {
       const msg = validateStoreStep2(form);
 
       if (msg) {
-
+        reportFormError(msg);
-        setSubmitError(msg);
-
         return;
-
       }
 
     }
@@ -351,39 +345,32 @@ export default function StoreCreatePage() {
     const msg = validateStoreStep3(form);
 
     if (msg) {
-
+      reportFormError(msg);
-      setSubmitError(msg);
-
       return;
-
     }
 
     const step1Msg = validateStoreStep1(form);
 
     if (step1Msg) {
-
+      reportFormError(step1Msg);
-      setSubmitError(step1Msg);
-
       goStep(1);
-
       return;
+    }
 
+    if (!/^\d+$/.test(form.cityId.trim())) {
+      reportFormError('所选地区未匹配到开城城市，请重新选择');
+      goStep(1);
+      return;
     }
 
     const step2Msg = validateStoreStep2(form);
 
     if (step2Msg) {
-
+      reportFormError(step2Msg);
-      setSubmitError(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

@@ -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('状态已更新');
+      toastSuccess('状态已更新');
-    } catch (e) {
+    } catch {
-      setError(e instanceof Error ? e.message : '状态更新失败');
+      /* 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('已保存');
+      toastSuccess('已保存');
-    } catch (e) {
+    } catch {
-      setError(e instanceof Error ? e.message : '保存失败');
+      /* 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

@@ -52,8 +52,8 @@ export default function StoreListPage() {
         body: JSON.stringify({ status: next }),
       });
       await loadStores();
-    } catch (e) {
+    } catch {
-      setError(e instanceof Error ? e.message : '状态更新失败');
+      /* request 已 toast */
     } finally {
       setUpdatingId(null);
     }

apps/h5-partner/src/styles.css

@@ -2076,6 +2076,13 @@ nav.app-tabbar .app-tabbar-label {
   border-radius: 8px;
   font-size: 14px;
   z-index: 10001;
+  max-width: min(320px, calc(100vw - 40px));
+  text-align: center;
+  line-height: 1.5;
+}
+
+.partner-toast--error {
+  background: rgba(166, 29, 36, 0.92);
 }
 
 /* ── Orders ── */

server/dukang-api/src/common/parse-bigint.ts

@@ -0,0 +1,13 @@
+import { BadRequestException } from '@nestjs/common';
+
+export function parseBigIntParam(value: unknown, label = 'ID'): bigint {
+  const text = String(value ?? '').trim();
+  if (!/^\d+$/.test(text)) {
+    throw new BadRequestException(`${label}格式无效`);
+  }
+  try {
+    return BigInt(text);
+  } catch {
+    throw new BadRequestException(`${label}格式无效`);
+  }
+}

server/dukang-api/src/modules/store/store.service.ts

@@ -9,6 +9,7 @@ import { PARTNER_STAFF_ROLE_LABELS, PartnerStaffRole, type PartnerLeaderboardPer
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { serializeBigInt } from '../../common/decorators/current-user.decorator';
 import { mapStoreCompat } from '../../common/compat/v31-compat';
+import { parseBigIntParam } from '../../common/parse-bigint';
 import { AnalyticsService } from '../analytics/analytics.service';
 
 @Injectable()
@@ -133,7 +134,7 @@ export class StoreService {
       data: {
         cityId: city.id,
         partnerId: account.partnerId,
-        categoryId: body.categoryId ? BigInt(String(body.categoryId)) : null,
+        categoryId: body.categoryId ? parseBigIntParam(body.categoryId, '分类ID') : null,
         name: String(body.name),
         phone: normalizedPhone,
         province: String(body.province ?? city.province ?? '河南省'),
@@ -226,7 +227,12 @@ export class StoreService {
       extraJson: { storeName: store.name, phone: normalizedPhone },
     });
 
-    return serializeBigInt({ store, audit });
+    return serializeBigInt({
+      store: mapStoreCompat({
+        ...store,
+        coverResource: coverUrl ? { url: coverUrl } : null,
+      }),
+    });
   }
 
   async partnerUpdateStoreStatus(
@@ -681,7 +687,7 @@ export class StoreService {
   private async resolvePartnerCity(partnerId: bigint, cityId: unknown) {
     if (cityId) {
       const city = await this.prisma.commonCity.findFirst({
-        where: { id: BigInt(String(cityId)), partnerId },
+        where: { id: parseBigIntParam(cityId, '城市ID'), partnerId },
       });
       if (!city) throw new BadRequestException('所选地区未匹配到开城城市');
       return city;