diff --git a/apps/h5-partner/src/lib/storePackages.ts b/apps/h5-partner/src/lib/storePackages.ts
index bd9e7d6..7a7f841 100644
--- a/apps/h5-partner/src/lib/storePackages.ts
+++ b/apps/h5-partner/src/lib/storePackages.ts
@@ -1,5 +1,9 @@
import type { StorePackageItemDto } from '@dukang/shared-types';
-import { STORE_PACKAGE_MAX_COUNT } from '@dukang/shared-types';
+import {
+ STORE_PACKAGE_IMAGE_MAX_COUNT,
+ STORE_PACKAGE_MAX_COUNT,
+ normalizeStorePackageImageUrls,
+} from '@dukang/shared-types';
export type PackageFormItem = StorePackageItemDto;
@@ -11,24 +15,34 @@ export function emptyPackage(index = 0): PackageFormItem {
usableTime: '',
otherNotes: '',
imageUrl: '',
+ imageUrls: [],
sortOrder: index,
};
}
export function normalizePackageFormItems(raw: PackageFormItem[]): PackageFormItem[] {
return raw
- .map((item, index) => ({
- name: item.name.trim(),
- price: item.price.trim(),
- dishes: item.dishes.trim(),
- usableTime: item.usableTime?.trim() || '',
- otherNotes: item.otherNotes?.trim() || '',
- imageUrl: item.imageUrl?.trim() || '',
- sortOrder: index,
- }))
+ .map((item, index) => {
+ const imageUrls = normalizeStorePackageImageUrls(item);
+ return {
+ name: item.name.trim(),
+ price: item.price.trim(),
+ dishes: item.dishes.trim(),
+ usableTime: item.usableTime?.trim() || '',
+ otherNotes: item.otherNotes?.trim() || '',
+ imageUrl: imageUrls[0] ?? '',
+ imageUrls,
+ sortOrder: index,
+ };
+ })
.filter(
(item) =>
- item.name || item.price || item.dishes || item.usableTime || item.otherNotes || item.imageUrl,
+ item.name ||
+ item.price ||
+ item.dishes ||
+ item.usableTime ||
+ item.otherNotes ||
+ item.imageUrls.length > 0,
);
}
@@ -43,6 +57,9 @@ export function validatePackageFormItems(items: PackageFormItem[]): string | nul
const price = Number(item.price);
if (!Number.isFinite(price) || price < 0) return `第 ${i + 1} 条套餐价格须为非负数字`;
if (!item.dishes) return `第 ${i + 1} 条套餐菜品不能为空`;
+ if ((item.imageUrls?.length ?? 0) > STORE_PACKAGE_IMAGE_MAX_COUNT) {
+ return `第 ${i + 1} 条套餐图片最多 ${STORE_PACKAGE_IMAGE_MAX_COUNT} 张`;
+ }
}
return null;
}
diff --git a/apps/h5-partner/src/pages/StorePackagesPage.tsx b/apps/h5-partner/src/pages/StorePackagesPage.tsx
index d49c7d3..e975c72 100644
--- a/apps/h5-partner/src/pages/StorePackagesPage.tsx
+++ b/apps/h5-partner/src/pages/StorePackagesPage.tsx
@@ -1,6 +1,7 @@
import { useEffect, useState } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import type { StorePackagesResponse } from '@dukang/shared-types';
+import { normalizeStorePackageImageUrls } from '@dukang/shared-types';
import StorePackagesForm from '../components/StorePackagesForm';
import { request } from '../lib/api';
import { toastError, toastSuccess } from '../lib/toast';
@@ -30,7 +31,18 @@ export default function StorePackagesPage() {
: data.live?.length
? data.live
: [emptyPackage()];
- setItems(base.map((p, i) => ({ ...p, price: String(p.price), sortOrder: i })));
+ setItems(
+ base.map((p, i) => {
+ const imageUrls = normalizeStorePackageImageUrls(p);
+ return {
+ ...p,
+ price: String(p.price),
+ imageUrl: imageUrls[0] ?? '',
+ imageUrls,
+ sortOrder: i,
+ };
+ }),
+ );
setPending(data.pendingRequest ?? null);
})
.catch((e) => setError(e instanceof Error ? e.message : '加载失败'))
diff --git a/apps/h5-shop/src/components/ShopPackagesForm.tsx b/apps/h5-shop/src/components/ShopPackagesForm.tsx
index 812c7b6..a805655 100644
--- a/apps/h5-shop/src/components/ShopPackagesForm.tsx
+++ b/apps/h5-shop/src/components/ShopPackagesForm.tsx
@@ -1,5 +1,8 @@
import { useRef, useState } from 'react';
-import { STORE_PACKAGE_MAX_COUNT } from '@dukang/shared-types';
+import {
+ STORE_PACKAGE_IMAGE_MAX_COUNT,
+ STORE_PACKAGE_MAX_COUNT,
+} from '@dukang/shared-types';
import { emptyPackage, type PackageFormItem } from '../lib/storePackages';
import { uploadFileToOss } from '../lib/upload';
@@ -11,17 +14,29 @@ type Props = {
export default function ShopPackagesForm({ items, onChange, disabled }: Props) {
const [collapsed, setCollapsed] = useState
>({});
- const [uploadingIndex, setUploadingIndex] = useState(null);
- const fileRefs = useRef>({});
+ const [uploadingKey, setUploadingKey] = useState(null);
+ const fileRefs = useRef>({});
- async function pickPackageImage(index: number, file?: File | null) {
+ async function pickPackageImage(pkgIndex: number, imgIndex: number, file?: File | null) {
if (!file || disabled) return;
- setUploadingIndex(index);
+ const key = `${pkgIndex}-${imgIndex}`;
+ setUploadingKey(key);
try {
const result = await uploadFileToOss(file, 'STORE_PACKAGE');
- updateAt(index, { imageUrl: result.url });
+ const current = items[pkgIndex];
+ const imageUrls =
+ Array.isArray(current.imageUrls) && current.imageUrls.length > 0
+ ? current.imageUrls.map((u) => String(u ?? ''))
+ : current.imageUrl
+ ? [String(current.imageUrl)]
+ : [];
+ const next = [...imageUrls];
+ if (imgIndex < next.length) next[imgIndex] = result.url;
+ else next.push(result.url);
+ const cleaned = next.map((u) => u.trim()).filter(Boolean);
+ updateAt(pkgIndex, { imageUrls: next, imageUrl: cleaned[0] ?? '' });
} finally {
- setUploadingIndex(null);
+ setUploadingKey(null);
}
}
@@ -58,6 +73,13 @@ export default function ShopPackagesForm({ items, onChange, disabled }: Props) {
{list.map((item, index) => {
const isCollapsed = !!collapsed[index];
const displayName = item.name.trim() || `套餐 ${index + 1}`;
+ const imageUrls = Array.isArray(item.imageUrls) && item.imageUrls.length > 0
+ ? item.imageUrls.map((u) => String(u ?? ''))
+ : item.imageUrl
+ ? [String(item.imageUrl)]
+ : [''];
+ const slots = imageUrls;
+ const filled = slots.map((u) => u.trim()).filter(Boolean);
return (
@@ -83,7 +105,7 @@ export default function ShopPackagesForm({ items, onChange, disabled }: Props) {
{!isCollapsed ? (
<>