diff --git a/public-api.js b/public-api.js index 10c1bdb..c820378 100644 --- a/public-api.js +++ b/public-api.js @@ -400,6 +400,12 @@ const legacyMain = (t) => t && t.kind === 'main' && !Array.isArray(t.mainImages) const tplImagesOf = (t) => (t && !legacyMain(t) ? arr(t.images).slice(0, 20) : []); const tplMainOf = (t) => (!t ? [] : legacyMain(t) ? arr(t.images) : arr(t.mainImages)).slice(0, 6); const tplFilesOf = (t) => [...tplImagesOf(t), ...tplMainOf(t)]; +// 主图模板里给某个型号单独指定了主图(mainCover[产品id]):那张排第一,其余按模板顺序 +const tplMainFor = (t, p) => { + const list = !t ? [] : legacyMain(t) ? arr(t.images) : arr(t.mainImages); + const c = t && t.mainCover && p && t.mainCover[p.id]; + return (c && list.includes(c) ? [c, ...list.filter((f) => f !== c)] : list).slice(0, 6); +}; // 产品引用的模板(按产品里选的顺序;已删除的模板自动忽略) const templatesOf = (p, templates) => (Array.isArray(p[TEMPLATE_IDS_FIELD]) ? p[TEMPLATE_IDS_FIELD] : []) .map((id) => templates.find((t) => t.id === id)).filter(Boolean); @@ -436,10 +442,14 @@ function toPublic(p, templates = [], packSpecs = []) { const base = conf('PUBLIC_BASE_URL'); // 主图:产品自己的网站主图在前,主图模板的图片接在后面,最多 6 张; // 产品没有自己的网站主图、也没用主图模板时,才退回用产品档案里的"产品主图" - const mainTpl = templatesOf(p, templates).flatMap((t) => tplMainOf(t) + const mainTpl = templatesOf(p, templates).flatMap((t) => tplMainFor(t, p) .map((f) => `${base}/api/public/tplmedia/${encodeURIComponent(t.id)}/${encodeURIComponent(f)}`)); const own = (Array.isArray(p[IMAGES_FIELD]) && p[IMAGES_FIELD].length) || !mainTpl.length ? imagesOf(p) : []; - out.images = [...own.map((f) => `${base}/api/public/media/${slug}/${encodeURIComponent(f)}`), ...mainTpl].slice(0, 6); + // 在模板管理里给这个型号单独指定了主图:它排在最前面(作列表封面),然后是产品自己的主图,再是模板其余的图 + const coverTpl = templatesOf(p, templates).find((t) => t.mainCover && t.mainCover[p.id] && tplMainFor(t, p)[0] === t.mainCover[p.id]); + const coverUrl = coverTpl ? `${base}/api/public/tplmedia/${encodeURIComponent(coverTpl.id)}/${encodeURIComponent(coverTpl.mainCover[p.id])}` : ''; + const ownUrls = own.map((f) => `${base}/api/public/media/${slug}/${encodeURIComponent(f)}`); + out.images = (coverUrl ? [coverUrl, ...ownUrls, ...mainTpl.filter((u) => u !== coverUrl)] : [...ownUrls, ...mainTpl]).slice(0, 6); out.detailImages = detailsOf(p).map((f) => `${base}/api/public/media/${slug}/${encodeURIComponent(f)}`); // 模板图片:同一个模板被多个产品引用时 URL 相同,网站构建时只下载一次 const tplUrls = templatesOf(p, templates).flatMap((t) => tplImagesOf(t)