diff --git a/src/api/mall/product/spu.ts b/src/api/mall/product/spu.ts
index b6bec97e..5ddaa92e 100644
--- a/src/api/mall/product/spu.ts
+++ b/src/api/mall/product/spu.ts
@@ -49,6 +49,16 @@ export interface Spu {
recommendGood?: boolean // 是否优品
}
+export interface SpuRespVO extends Spu {
+ price: number
+ salesCount: number
+ marketPrice: number
+ costPrice: number
+ stock: number
+ createTime: Date
+ status: number
+}
+
// 获得 Spu 列表
export const getSpuPage = (params: PageParam) => {
return request.get({ url: '/product/spu/page', params })
diff --git a/src/api/mall/promotion/seckill/seckillActivity.ts b/src/api/mall/promotion/seckill/seckillActivity.ts
index 2c59319c..fc2d1871 100644
--- a/src/api/mall/promotion/seckill/seckillActivity.ts
+++ b/src/api/mall/promotion/seckill/seckillActivity.ts
@@ -1,8 +1,9 @@
import request from '@/config/axios'
+import { Sku, SpuRespVO } from '@/api/mall/product/spu'
export interface SeckillActivityVO {
id: number
- spuId: number
+ spuIds: number[]
name: string
status: number
remark: string
@@ -17,6 +18,22 @@ export interface SeckillActivityVO {
singleLimitCount: number
stock: number
totalStock: number
+ products: SeckillProductVO[]
+}
+
+export interface SeckillProductVO {
+ spuId: number
+ skuId: number
+ seckillPrice: number
+ stock: number
+}
+
+type SkuExtension = Sku & {
+ productConfig: SeckillProductVO
+}
+
+export interface SpuExtension extends SpuRespVO {
+ skus: SkuExtension[] // 重写类型
}
// 查询秒杀活动列表
diff --git a/src/views/mall/product/spu/components/SkuList.vue b/src/views/mall/product/spu/components/SkuList.vue
index 6aa26a2b..04718f3d 100644
--- a/src/views/mall/product/spu/components/SkuList.vue
+++ b/src/views/mall/product/spu/components/SkuList.vue
@@ -1,7 +1,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.properties[index]?.valueName }}
+
+
+
+
+
+
+ {{ row.barCode }}
+
+
+
+
+ {{ row.price }}
+
+
+
+
+ {{ row.marketPrice }}
+
+
+
+
+ {{ row.costPrice }}
+
+
+
+
+ {{ row.stock }}
+
+
+
+
+
diff --git a/src/views/mall/promotion/seckill/activity/components/SpuAndSkuSelectForm.vue b/src/views/mall/promotion/seckill/activity/components/SpuAndSkuSelectForm.vue
index cf538fc2..c3de9a2b 100644
--- a/src/views/mall/promotion/seckill/activity/components/SpuAndSkuSelectForm.vue
+++ b/src/views/mall/promotion/seckill/activity/components/SpuAndSkuSelectForm.vue
@@ -51,7 +51,7 @@
:data="list"
:expand-row-keys="expandRowKeys"
row-key="id"
- @expandChange="getPropertyList"
+ @expand-change="expandChange"
@selection-change="selectSpu"
>
@@ -111,7 +111,7 @@