fix;提交代码子账号

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

@@ -1,5 +1,6 @@
 import { apiBase, request } from './api';
-import { showPartnerToast } from './toast';
+
+const UPLOAD_TIMEOUT_MS = 120_000;
 
 export type OssMediaType = 'IMAGE' | 'VIDEO' | 'FILE';
 
@@ -10,8 +11,7 @@ export type UploadFileResult = {
   mock: boolean;
 };
 
-/** 经 API 服务端转存 OSS，避免浏览器直传跨域 */
-export async function uploadFileToOss(
+async function uploadFileToOssInner(
   file: File,
   options: { bizType: string; mediaType?: OssMediaType },
 ): Promise<UploadFileResult> {
@@ -25,29 +25,48 @@ export async function uploadFileToOss(
   const headers: Record<string, string> = { 'X-Client-App': 'PARTNER_H5' };
   if (token) headers.Authorization = `Bearer ${token}`;
 
-  const res = await fetch(`${apiBase}/common/resources/upload`, {
-    method: 'POST',
-    headers,
-    body: formData,
-  });
-  const json = await res.json();
-  if (json.code === 401) {
-    localStorage.removeItem('accessToken');
-    showPartnerToast('未登录', 'error');
-    throw new Error('未登录');
-  }
-  if (json.code !== 0) {
-    showPartnerToast(json.message || '上传失败', 'error');
-    throw new Error(json.message || '上传失败');
-  }
+  const controller = new AbortController();
+  const timeoutId = window.setTimeout(() => controller.abort(), UPLOAD_TIMEOUT_MS);
 
-  const data = json.data as UploadFileResult;
-  return {
-    url: data.url,
-    ossKey: data.ossKey,
-    bucket: data.bucket,
-    mock: data.mock,
-  };
+  try {
+    const res = await fetch(`${apiBase}/common/resources/upload`, {
+      method: 'POST',
+      headers,
+      body: formData,
+      signal: controller.signal,
+    });
+    const json = await res.json();
+    if (json.code === 401) {
+      localStorage.removeItem('accessToken');
+      throw new Error('未登录');
+    }
+    if (json.code !== 0) {
+      throw new Error(json.message || '上传失败');
+    }
+
+    const data = json.data as UploadFileResult;
+    return {
+      url: data.url,
+      ossKey: data.ossKey,
+      bucket: data.bucket,
+      mock: data.mock,
+    };
+  } catch (e) {
+    if (e instanceof DOMException && e.name === 'AbortError') {
+      throw new Error('上传超时，请检查网络后重试');
+    }
+    throw e;
+  } finally {
+    window.clearTimeout(timeoutId);
+  }
+}
+
+/** 经 API 服务端转存 OSS，避免浏览器直传跨域 */
+export function uploadFileToOss(
+  file: File,
+  options: { bizType: string; mediaType?: OssMediaType },
+): Promise<UploadFileResult> {
+  return uploadFileToOssInner(file, options);
 }
 
 export type OpenCityOption = {