diff --git a/manifest.config.ts b/manifest.config.ts index 46d3876..7702df5 100644 --- a/manifest.config.ts +++ b/manifest.config.ts @@ -128,6 +128,9 @@ export default defineManifestConfig({ optimization: { subPackages: true, }, + // 是否合并组件虚拟节点外层属性,uni-app 3.5.1+ 开始支持。目前仅支持 style、class 属性。 + // 默认不开启(undefined),这里设置为开启。 + mergeVirtualHostAttributes: true, // styleIsolation: 'shared', usingComponents: true, // __usePrivacyCheck__: true, diff --git a/src/http/http.ts b/src/http/http.ts index 54e4a66..6309526 100644 --- a/src/http/http.ts +++ b/src/http/http.ts @@ -27,7 +27,7 @@ export function http(options: CustomRequestOptions) { const { code = 0, message = '', data = null } = res.data as IResponse // 0和200当做成功都很普遍,这里直接兼容两者,见 ResultEnum if (code !== ResultEnum.Success0 && code !== ResultEnum.Success200) { - throw new Error(`请求错误[${code}]:${message}`) + throw new Error(`请求错误[${code}]:${message || msg}`) } return resolve(data as T) } diff --git a/src/http/types.ts b/src/http/types.ts index a622e0b..42ac8e9 100644 --- a/src/http/types.ts +++ b/src/http/types.ts @@ -12,12 +12,17 @@ export interface HttpRequestResult { requestTask: UniApp.RequestTask } -// 通用响应格式 -export interface IResponse { - code: number | string +// 通用响应格式(兼容 msg + message 字段) +export type IResponse = { + code: number data: T message: string - status: string | number + [key: string]: any // 允许额外属性 +} | { + code: number + data: T + msg: string + [key: string]: any // 允许额外属性 } // 分页请求参数