diff --git a/apps/api/src/admin.dto.ts b/apps/api/src/admin.dto.ts index 734270a..7eb61ad 100644 --- a/apps/api/src/admin.dto.ts +++ b/apps/api/src/admin.dto.ts @@ -98,6 +98,14 @@ export class CreateOfferingDto { @IsOptional() @IsInt() @Min(0) @Max(9999) sortOrder?: number; @IsOptional() @IsBoolean() isEnabled?: boolean; @IsOptional() config?: Record; + @IsOptional() sections?: Array<{ + type: string; + title: string; + content?: string; + items?: unknown[]; + }>; + @IsOptional() media?: Array<{ url: string; alt?: string; type?: string }>; + @IsOptional() cta?: { type: string; label: string; config?: Record }; } export class UpdateOfferingDto { @@ -111,4 +119,12 @@ export class UpdateOfferingDto { @IsOptional() @IsInt() @Min(0) @Max(9999) sortOrder?: number; @IsOptional() @IsBoolean() isEnabled?: boolean; @IsOptional() config?: Record; + @IsOptional() sections?: Array<{ + type: string; + title: string; + content?: string; + items?: unknown[]; + }>; + @IsOptional() media?: Array<{ url: string; alt?: string; type?: string }>; + @IsOptional() cta?: { type: string; label: string; config?: Record }; } diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts index f8b142f..3c29637 100644 --- a/apps/api/src/main.ts +++ b/apps/api/src/main.ts @@ -161,7 +161,13 @@ export class PublicOfferingController { }, }); if (!item) throw new BadRequestException("业务提供项不存在"); - return item; + const config = (item.config ?? {}) as Record; + return { + ...item, + sections: config.sections ?? [], + media: config.media ?? [], + cta: config.cta ?? null, + }; } } @@ -187,12 +193,17 @@ export class AdminWorkspaceController { @Body() body: CreateOfferingDto, ): Promise { this.requireAdmin(request); - const { config, ...fields } = body; + const { config, sections, media, cta, ...fields } = body; return this.prisma.offering.create({ data: { ...fields, brandId: this.brandId(), - ...(config === undefined ? {} : { config: config as Prisma.InputJsonValue }), + config: { + ...(config ?? {}), + ...(sections === undefined ? {} : { sections }), + ...(media === undefined ? {} : { media }), + ...(cta === undefined ? {} : { cta }), + } as Prisma.InputJsonValue, }, }); } @@ -206,12 +217,24 @@ export class AdminWorkspaceController { this.requireAdmin(request); const item = await this.prisma.offering.findFirst({ where: { id, brandId: this.brandId() } }); if (!item) throw new BadRequestException("业务提供项不存在"); - const { config, ...fields } = body; + const { config, sections, media, cta, ...fields } = body; return this.prisma.offering.update({ where: { id }, data: { ...fields, - ...(config === undefined ? {} : { config: config as Prisma.InputJsonValue }), + ...(config === undefined && + sections === undefined && + media === undefined && + cta === undefined + ? {} + : { + config: { + ...(config ?? {}), + ...(sections === undefined ? {} : { sections }), + ...(media === undefined ? {} : { media }), + ...(cta === undefined ? {} : { cta }), + } as Prisma.InputJsonValue, + }), }, }); } diff --git a/packages/api-client/src/index.ts b/packages/api-client/src/index.ts index c9169ef..aaa320c 100644 --- a/packages/api-client/src/index.ts +++ b/packages/api-client/src/index.ts @@ -108,6 +108,22 @@ export interface BrandTemplateDefinition { serviceCategories: string[]; trustContentTypes: string[]; } +export interface OfferingSection { + type: "text" | "image-list" | "timeline" | "faq"; + title: string; + content?: string; + items?: unknown[]; +} +export interface OfferingMedia { + url: string; + alt?: string; + type?: "image" | "video"; +} +export interface OfferingCta { + type: "inquiry" | "booking" | "contact" | "external-link"; + label: string; + config?: Record; +} export interface Offering { id: string; brandId?: string; @@ -121,6 +137,9 @@ export interface Offering { isEnabled: boolean; sortOrder: number; config?: Record | null; + sections?: OfferingSection[]; + media?: OfferingMedia[]; + cta?: OfferingCta; } export class ApiClientError extends Error {