diff --git a/admin-frontend-vue/src/pages/jd/JdProductDetailContent.vue b/admin-frontend-vue/src/pages/jd/JdProductDetailContent.vue new file mode 100644 index 000000000..516fb21e9 --- /dev/null +++ b/admin-frontend-vue/src/pages/jd/JdProductDetailContent.vue @@ -0,0 +1,636 @@ + + + + + diff --git a/admin-frontend-vue/src/pages/jd/JdProductDetailDrawer.vue b/admin-frontend-vue/src/pages/jd/JdProductDetailDrawer.vue index 3401c1e38..d26c0af13 100644 --- a/admin-frontend-vue/src/pages/jd/JdProductDetailDrawer.vue +++ b/admin-frontend-vue/src/pages/jd/JdProductDetailDrawer.vue @@ -1,21 +1,11 @@ @@ -371,315 +85,5 @@ function dash(value: string | number | null | undefined): string { min-height: 0; overflow-y: auto; padding: 16px 20px 28px; - display: flex; - flex-direction: column; - gap: 18px; -} -.drawer-tip { - margin: 0; - color: #8293a5; - font-size: 13.5px; -} -.drawer-failure { - display: flex; - align-items: center; - gap: 12px; - padding: 12px 14px; - border: 1px solid #f0c9c2; - border-radius: 10px; - background: #fdf1ef; - color: #a04432; - font-size: 13.5px; -} -.detail-block h4 { - margin: 0 0 10px; - font-size: 13.5px; - font-weight: 650; - color: #4e6479; -} -/* 顶部「左图右信息」(京麦详情布局):左侧主图大图+缩略图切换,右侧关键信息网格。 */ -.detail-hero { - display: flex; - align-items: flex-start; - gap: 16px; -} -.hero-gallery { - flex: 0 0 300px; - display: flex; - flex-direction: column; - gap: 8px; - min-width: 0; -} -.hero-main { - display: block; - width: 100%; - aspect-ratio: 1; - object-fit: cover; - border: 1px solid #d8e3ee; - border-radius: 10px; - background: #f2f7fb; - cursor: zoom-in; -} -.hero-empty { - display: flex; - align-items: center; - justify-content: center; - width: 100%; - aspect-ratio: 1; - border: 1px dashed #c7d7e5; - border-radius: 10px; - background: #f8fbfd; - color: #8293a5; - font-size: 13px; -} -.hero-thumbs { - display: flex; - flex-wrap: wrap; - gap: 6px; -} -.hero-thumbs img { - width: 44px; - height: 44px; - object-fit: cover; - border: 1px solid #d8e3ee; - border-radius: 6px; - cursor: pointer; - opacity: 0.85; -} -.hero-thumbs img.active { - outline: 2px solid #2f5d8b; - opacity: 1; -} -.hero-info { - flex: 1; - min-width: 0; - display: grid; - grid-template-columns: repeat(2, minmax(0, 1fr)); - gap: 10px 16px; - margin: 0; -} -.hero-info dt { - color: #5b6f83; - font-size: 12px; - margin-bottom: 3px; -} -.hero-info dd { - margin: 0; - color: #24384d; - font-size: 13.5px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} -.hero-title dd { - font-size: 14.5px; - font-weight: 650; - color: #24384d; - white-space: normal; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; -} -@media (max-width: 760px) { - .detail-hero { - flex-direction: column; - } - .hero-gallery { - flex-basis: auto; - width: 100%; - } -} -.info-grid { - display: grid; - grid-template-columns: repeat(3, minmax(0, 1fr)); - gap: 10px 16px; - margin: 0; -} -.info-item { - min-width: 0; -} -.info-item-wide { - grid-column: 1 / -1; -} -.info-item dt { - color: #5b6f83; - font-size: 12px; - margin-bottom: 3px; -} -.info-item dd { - margin: 0; - color: #24384d; - font-size: 13.5px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} -.attr-group { - margin-bottom: 12px; -} -.attr-group h5 { - margin: 0 0 6px; - color: #5b6f83; - font-size: 12.5px; -} -.attr-group table { - width: 100%; - border-collapse: collapse; - border: 1px solid #dbe5ee; - border-radius: 8px; - overflow: hidden; -} -.attr-group th, -.attr-group td { - padding: 7px 10px; - border-bottom: 1px solid #e7eef5; - font-size: 13px; - text-align: left; - vertical-align: top; -} -.attr-group th { - width: 180px; - background: #f2f7fb; - color: #4e6479; - font-weight: 600; -} -.attr-group tr:last-child th, -.attr-group tr:last-child td { - border-bottom: 0; -} -.attr-raw { - margin: 0; - padding: 10px 12px; - border: 1px solid #dbe5ee; - border-radius: 8px; - background: #f8fbfd; - color: #24384d; - font-size: 12px; - white-space: pre-wrap; - word-break: break-all; - max-height: 240px; - overflow-y: auto; -} -.sku-summary { - margin: 0 0 8px; - color: #5b6f83; - font-size: 12.5px; -} -.sku-table-wrap { - overflow-x: auto; - border: 1px solid #dbe5ee; - border-radius: 8px; -} -.sku-table { - width: 100%; - border-collapse: collapse; - font-size: 12.5px; - white-space: nowrap; -} -.sku-table th, -.sku-table td { - padding: 7px 10px; - border-bottom: 1px solid #e7eef5; - text-align: left; - color: #24384d; -} -.sku-table th { - background: #f2f7fb; - color: #4e6479; - font-weight: 600; -} -.sku-table tbody tr:last-child td { - border-bottom: 0; -} -.sku-table .sku-id { - font-family: ui-monospace, SFMono-Regular, Consolas, monospace; - font-size: 12px; - color: #4e6479; -} -.image-grid { - display: grid; - grid-template-columns: repeat(auto-fill, minmax(110px, 1fr)); - gap: 10px; -} -.image-grid img { - display: block; - width: 100%; - aspect-ratio: 1; - object-fit: cover; - border: 1px solid #d8e3ee; - border-radius: 8px; - background: #f2f7fb; - cursor: zoom-in; -} -.modal-mask { - position: fixed; - inset: 0; - z-index: 3000; - display: flex; - align-items: center; - justify-content: center; - padding: 40px 20px; - background: rgba(45, 66, 86, 0.36); - backdrop-filter: blur(6px); -} -.preview-modal { - display: flex; - flex-direction: column; - width: min(880px, 100%); - max-height: 88vh; - padding: 16px 20px; - border: 1px solid #c7d7e5; - border-radius: 14px; - background: #ffffff; - box-shadow: 0 22px 60px rgba(39, 67, 94, 0.2); -} -.preview-head { - display: flex; - align-items: center; - justify-content: space-between; -} -.preview-head h3 { - margin: 0; - font-size: 15px; - color: #24384d; -} -.preview-image { - display: block; - flex: 1; - min-height: 0; - max-height: 68vh; - margin: 12px 0; - object-fit: contain; - background: #f2f7fb; - border-radius: 8px; -} -.preview-foot { - display: flex; - align-items: center; - justify-content: space-between; -} -.preview-foot a { - color: #2f5d8b; - font-size: 13px; -} -.btn { - display: inline-flex; - align-items: center; - justify-content: center; - min-height: 38px; - padding: 7px 16px; - border-radius: 9px; - font-size: 13px; - cursor: pointer; -} -.btn-secondary { - background: #ffffff; - color: #5b6f83; - border: 1px solid #c7d7e5; -} -.btn-secondary:hover { - color: #2f5d8b; - border-color: #95b1cb; - background: #edf5fb; } diff --git a/admin-frontend-vue/src/pages/jd/JdProductDetailModal.vue b/admin-frontend-vue/src/pages/jd/JdProductDetailModal.vue new file mode 100644 index 000000000..1803e6e93 --- /dev/null +++ b/admin-frontend-vue/src/pages/jd/JdProductDetailModal.vue @@ -0,0 +1,150 @@ + + + + + diff --git a/admin-frontend-vue/tests/mount/jd-product-detail-modal.mount.test.ts b/admin-frontend-vue/tests/mount/jd-product-detail-modal.mount.test.ts new file mode 100644 index 000000000..9ebbdeea6 --- /dev/null +++ b/admin-frontend-vue/tests/mount/jd-product-detail-modal.mount.test.ts @@ -0,0 +1,161 @@ +/** + * 京东商品详情居中弹窗(JdProductDetailModal,v1.6 蓝图 Phase 4)的挂载契约。 + * + * 弹窗壳只管 chrome(遮罩/标题/「编辑/删除」动作分档/关闭),内容与取数在共享块 + * JdProductDetailContent(与侧滑抽屉同一份实现,抽屉薄壳化行为由页面 mount 测试兜住)。 + * 挂载时序与真实页面一致:先 visible=false 挂载,再置 true(Content 的 watch 靠变更触发取数)。 + * + * 跑法:`npx vitest run tests/mount/jd-product-detail-modal.mount.test.ts` + */ +import { beforeEach, describe, expect, it, vi } from 'vitest' +import { flushPromises, mount, type VueWrapper } from '@vue/test-utils' + +import JdProductDetailModal from '@/pages/jd/JdProductDetailModal.vue' +import type { JdProductItem } from '@/pages/jd/jd-product-model.ts' + +const jdApi = vi.hoisted(() => ({ + fetchJdProductDetail: vi.fn(), +})) + +vi.mock('@/pages/jd/jd-product-api.ts', () => jdApi) + +function item(): JdProductItem { + return { + id: 1, + shopId: 3, + shopName: '旗舰自营店', + productCode: 'JD-10086', + skuId: 'SKU-1', + itemNum: 'ITEM-1', + skuCount: 1, + healthScore: 81, + title: '304不锈钢保温杯大容量便携', + brand: '锅宝', + categoryPath: '家居 > 厨具 > 保温杯', + priceMin: '12.90', + priceMax: '15.90', + stockTotal: 500, + saleStatus: '上架中', + listTab: 'search', + jdCreatedAt: '2026-11-07 18:49:47', + jdOnlineAt: '2026-11-12 15:03:37', + jdUpdatedAt: '2026-11-13 14:06:07', + mainImageUrl: 'https://img.example/main-1.jpg', + attrCount: 6, + imageCount: 2, + groupId: 7, + groupName: '甲组', + syncedAt: '2026-11-12 09:00:00', + } as JdProductItem +} + +/** fetchJdProductDetail 的返回(已由 parseJdProductDetail 归一的形状,与页面 mount 测试同构)。 */ +function detailPayload() { + return { + item: item(), + attrGroups: [ + { groupName: '规格', attrs: [{ key: 'capacity', label: '容量', value: '500ml' }] }, + ], + images: [ + { id: 1, imageType: 'MAIN', attrName: '', sortNo: 1, url: 'https://img.example/main.jpg', byteSize: null, width: 800, height: 800 }, + { id: 2, imageType: 'DETAIL', attrName: '', sortNo: 2, url: 'https://img.example/detail.jpg', byteSize: null, width: null, height: null }, + ], + skus: [ + { skuId: 'S1', skuName: '上衣 S', skuSeq: '1', price: '162', stock: 200, saleAttrs: [{ name: '颜色', value: '上衣' }, { name: '尺码', value: 'S' }], sortNo: 0 }, + ], + attrJsonRaw: '', + } +} + +beforeEach(() => { + vi.clearAllMocks() +}) + +/** 与真实页面同构的挂载:先 visible=false 挂载,再置 true 触发 Content 取数。 */ +async function mountOpened(canWrite = true): Promise> { + jdApi.fetchJdProductDetail.mockResolvedValue(detailPayload()) + const wrapper = mount(JdProductDetailModal, { + props: { item: item(), visible: false, canWrite }, + }) + await wrapper.setProps({ visible: true }) + await flushPromises() + await flushPromises() + return wrapper +} + +describe('居中弹窗 chrome(设计稿款式:居中大弹窗+顶部动作)', () => { + it('打开即取数(按 item.id)并渲染共享块内容:hero 左图右信息/属性分组/SKU 矩阵/图片三区', async () => { + const wrapper = await mountOpened() + expect(jdApi.fetchJdProductDetail).toHaveBeenCalledWith(1) + expect(wrapper.get('.jd-modal-mask').exists()).toBe(true) + expect(wrapper.get('.jd-modal-head h3').text()).toBe('商品详情 · JD-10086') + // 共享块(与侧滑抽屉同一份实现)——类名与页面 mount 测试钉住的抽屉断言同字。 + expect(wrapper.get('.detail-hero').exists()).toBe(true) + expect(wrapper.get('.hero-main').exists()).toBe(true) + expect(wrapper.get('.hero-info').text()).toContain('价格区间') + expect(wrapper.get('.hero-info').text()).toContain('12.9 ~ 15.9') + expect(wrapper.get('.jd-modal').text()).toContain('规格') + expect(wrapper.get('.jd-modal').text()).toContain('容量') + expect(wrapper.get('.jd-modal').text()).toContain('销售属性 / SKU 矩阵') + expect(wrapper.get('.jd-modal').text()).toContain('1 个 SKU · ¥162 · 库存 200') + expect(wrapper.get('.jd-modal').text()).toContain('主图') + expect(wrapper.get('.jd-modal').text()).toContain('详情图') + wrapper.unmount() + }) + + it('关闭:点遮罩自身与右上 × 都 emit close;关闭后 mask 摘掉', async () => { + const wrapper = await mountOpened() + await wrapper.get('.jd-modal-mask').trigger('click') + expect(wrapper.emitted('close')).toHaveLength(1, 'mask @click.self(点内容区不算)') + await wrapper.get('.jd-modal-close').trigger('click') + expect(wrapper.emitted('close')).toHaveLength(2) + await wrapper.setProps({ visible: false }) + await flushPromises() + expect(wrapper.find('.jd-modal-mask').exists()).toBe(false) + wrapper.unmount() + }) +}) + +describe('顶部动作按写权限档分档(emit 给页面接既有链)', () => { + it('可写档渲染「编辑/删除」:点击分别 emit edit/remove 且不冒泡成 close', async () => { + const wrapper = await mountOpened(true) + const actions = wrapper.get('.jd-modal-actions') + const buttons = actions.findAll('button') + expect(buttons.map((b) => b.text())).toEqual(['编辑', '删除']) + await buttons[0]!.trigger('click') + expect(wrapper.emitted('edit')).toHaveLength(1) + expect(wrapper.emitted('close')).toBeFalsy() + await buttons[1]!.trigger('click') + expect(wrapper.emitted('remove')).toHaveLength(1) + expect(wrapper.emitted('close')).toBeFalsy() + wrapper.unmount() + }) + + it('只读档(canWrite=false):无动作区(普通账号只读,与现表格操作列分档同口径)', async () => { + const wrapper = await mountOpened(false) + expect(wrapper.find('.jd-modal-actions').exists()).toBe(false) + expect(wrapper.findAll('button').map((b) => b.text())).not.toContain('编辑') + expect(wrapper.findAll('button').map((b) => b.text())).not.toContain('删除') + wrapper.unmount() + }) +}) + +describe('加载失败与重试(取数在共享块,两条壳同一份兜底)', () => { + it('失败红条可见且重试真能重跑', async () => { + jdApi.fetchJdProductDetail.mockRejectedValueOnce(new Error('上游 502')) + jdApi.fetchJdProductDetail.mockResolvedValue(detailPayload()) + const wrapper = mount(JdProductDetailModal, { props: { item: item(), visible: false, canWrite: true } }) + await wrapper.setProps({ visible: true }) + await flushPromises() + await flushPromises() + const bar = wrapper.get('.drawer-failure') + expect(bar.text()).toContain('上游 502', 'requestErrorMessage 透传后端/网络原因(与旧抽屉同一出口)') + expect(bar.find('button').text()).toBe('重试') + await bar.find('button').trigger('click') + await flushPromises() + await flushPromises() + expect(wrapper.find('.drawer-failure').exists()).toBe(false, '重试成功后红条消失') + expect(wrapper.get('.detail-hero').exists()).toBe(true) + wrapper.unmount() + }) +})