feat:优化商品汇总管理

src/api/product/summary/index.ts

@@ -1,79 +1,64 @@
-import request from "@/config/axios";
+import request from '@/config/axios'
 
-// 商品汇总分页查询参数
-export interface SummaryPageReqVO {
-  pageNo: number; // 页码，从 1 开始
-  pageSize: number; // 每页条数，最大值为 100
-  name?: string; // 商品名称
-  deviceId?: string; // 设备IMEI
-  barCode?: string; // SKU 的条形码
-  keyword?: string; // 关键字
-  introduction?: string; // 商品简介
-  description?: string; // 商品详情
-  categoryId?: string; // 商品分类编号
-  brandId?: string; // 商品品牌编号
-  picUrl?: string; // 商品封面图
-  sliderPicUrls?: string; // 商品轮播图地址数组，以逗号分隔 最多上传15张
-  sort?: string; // 排序字段
-  price?: string; // 商品价格，单位使用：分
-  marketPrice?: string; // 市场价，单位使用：分
-  costPrice?: string; // 成本价，单位： 分
-  createTime?: string[]; // 创建时间
-}
-
-// 商品汇总 VO
-export interface SummaryVO {
-  id: number; // 商品编号，自增
-  deviceId: string; // 设备IMEI
-  barCode: string; // SKU 的条形码
-  name: string; // 商品名称
-  keyword: string; // 关键字
-  introduction: string; // 商品简介
-  description: string; // 商品详情
-  categoryId: number; // 商品分类编号
-  brandId: number; // 商品品牌编号
-  picUrl: string; // 商品封面图
-  sliderPicUrls: string; // 商品轮播图地址
+// 商品spu VO
+export interface SpuVO {
+  id: number // 商品 SPU 编号，自增
+  name: string // 商品名称
+  keyword: string // 关键字
+  introduction: string // 商品简介
+  description: string // 商品详情
+  categoryId: number // 商品分类编号
+  brandId: number // 商品品牌编号
+  picUrl: string // 商品封面图
+  sliderPicUrls: string // 商品轮播图地址
   //  数组，以逗号分隔
-  //  最多上传15张
-  sort: number; // 排序字段
-  price: number; // 商品价格，单位使用：分
-  marketPrice: number; // 市场价，单位使用：分
-  costPrice: number; // 成本价，单位： 分
+  // 最多上传15张
+  sort: number // 排序字段
+  status: number // 商品状态: 1 上架（开启） 0 下架（禁用） -1 回收
+  types: number // 商品类型: 0  商城商品   1 提货柜商品
+  specType: boolean // 规格类型：0 单规格 1 多规格
+  price: number // 商品价格，单位使用：分
+  marketPrice: number // 市场价，单位使用：分
+  costPrice: number // 成本价，单位： 分
+  stock: number // 库存
+  deliveryTypes: string // 配送方式数组
+  deliveryTemplateId: number // 物流配置模板编号
+  giveIntegral: number // 赠送积分
+  subCommissionType: boolean // 分销类型
+  salesCount: number // 商品销量
+  virtualSalesCount: number // 虚拟销量
+  browseCount: number // 商品点击量
 }
 
-// 商品汇总 API
-export const SummaryApi = {
-  // 查询商品汇总分页
-  getSummaryPage: async (params: SummaryPageReqVO) => {
-    return await request.get({ url: `/product/summary/sumPage`, params });
+// 商品spu API
+export const SpuApi = {
+  // 查询商品spu分页
+  getSpuPage: async (params: any) => {
+    return await request.get({ url: `/product/spu/page`, params })
   },
 
-  // 查询商品汇总详情
-  getSummary: async (id: number) => {
-    return await request.get({ url: `/product/summary/get?id=` + id });
+  // 查询商品spu详情
+  getSpu: async (id: number) => {
+    return await request.get({ url: `/product/spu/get?id=` + id })
   },
 
-  // 新增商品汇总
-  createSummary: async (data: SummaryVO) => {
-    return await request.post({ url: `/product/summary/create`, data });
+  // 新增商品spu
+  createSpu: async (data: SpuVO) => {
+    return await request.post({ url: `/product/spu/create`, data })
   },
 
-  // 修改商品汇总
-  updateSummary: async (data: SummaryVO) => {
-    return await request.put({ url: `/product/summary/update`, data });
+  // 修改商品spu
+  updateSpu: async (data: SpuVO) => {
+    return await request.put({ url: `/product/spu/update`, data })
   },
 
-  // 删除商品汇总
-  deleteSummary: async (id: number) => {
-    return await request.delete({ url: `/product/summary/delete?id=` + id });
+  // 删除商品spu
+  deleteSpu: async (id: number) => {
+    return await request.delete({ url: `/product/spu/delete?id=` + id })
   },
 
-  // 导出商品汇总 Excel
-  exportSummary: async (params) => {
-    return await request.download({
-      url: `/product/summary/export-excel`,
-      params,
-    });
-  },
-};
+  // 导出商品spu Excel
+  exportSpu: async (params) => {
+    return await request.download({ url: `/product/spu/export-excel`, params })
+  }
+}

src/views/mall/product/summary/SpuForm.vue

@@ -7,12 +7,6 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="设备IMEI" prop="deviceId">
-        <el-input v-model="formData.deviceId" placeholder="请输入设备IMEI" />
-      </el-form-item>
-      <el-form-item label="SKU 的条形码" prop="barCode">
-        <el-input v-model="formData.barCode" placeholder="请输入SKU 的条形码" />
-      </el-form-item>
       <el-form-item label="商品名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入商品名称" />
       </el-form-item>
@@ -34,22 +28,29 @@
       <el-form-item label="商品封面图" prop="picUrl">
         <el-input v-model="formData.picUrl" placeholder="请输入商品封面图" />
       </el-form-item>
-      <el-form-item
-        label="商品轮播图地址
+      <el-form-item label="商品轮播图地址
  数组，以逗号分隔
- 最多上传15张"
-        prop="sliderPicUrls"
-      >
-        <el-input
-          v-model="formData.sliderPicUrls"
-          placeholder="请输入商品轮播图地址
+ 最多上传15张" prop="sliderPicUrls">
+        <el-input v-model="formData.sliderPicUrls" placeholder="请输入商品轮播图地址
  数组，以逗号分隔
- 最多上传15张"
-        />
+ 最多上传15张" />
       </el-form-item>
       <el-form-item label="排序字段" prop="sort">
         <el-input v-model="formData.sort" placeholder="请输入排序字段" />
       </el-form-item>
+      <el-form-item label="商品状态: 1 上架（开启） 0 下架（禁用） -1 回收" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio value="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="商品类型: 0  商城商品   1 提货柜商品" prop="types">
+        <el-input v-model="formData.types" placeholder="请输入商品类型: 0  商城商品   1 提货柜商品" />
+      </el-form-item>
+      <el-form-item label="规格类型：0 单规格 1 多规格" prop="specType">
+        <el-radio-group v-model="formData.specType">
+          <el-radio value="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item label="商品价格，单位使用：分" prop="price">
         <el-input v-model="formData.price" placeholder="请输入商品价格，单位使用：分" />
       </el-form-item>
@@ -59,6 +60,32 @@
       <el-form-item label="成本价，单位： 分" prop="costPrice">
         <el-input v-model="formData.costPrice" placeholder="请输入成本价，单位： 分" />
       </el-form-item>
+      <el-form-item label="库存" prop="stock">
+        <el-input v-model="formData.stock" placeholder="请输入库存" />
+      </el-form-item>
+      <el-form-item label="配送方式数组" prop="deliveryTypes">
+        <el-input v-model="formData.deliveryTypes" placeholder="请输入配送方式数组" />
+      </el-form-item>
+      <el-form-item label="物流配置模板编号" prop="deliveryTemplateId">
+        <el-input v-model="formData.deliveryTemplateId" placeholder="请输入物流配置模板编号" />
+      </el-form-item>
+      <el-form-item label="赠送积分" prop="giveIntegral">
+        <el-input v-model="formData.giveIntegral" placeholder="请输入赠送积分" />
+      </el-form-item>
+      <el-form-item label="分销类型" prop="subCommissionType">
+        <el-radio-group v-model="formData.subCommissionType">
+          <el-radio value="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="商品销量" prop="salesCount">
+        <el-input v-model="formData.salesCount" placeholder="请输入商品销量" />
+      </el-form-item>
+      <el-form-item label="虚拟销量" prop="virtualSalesCount">
+        <el-input v-model="formData.virtualSalesCount" placeholder="请输入虚拟销量" />
+      </el-form-item>
+      <el-form-item label="商品点击量" prop="browseCount">
+        <el-input v-model="formData.browseCount" placeholder="请输入商品点击量" />
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -67,10 +94,10 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { SummaryApi, SummaryVO } from '@/api/product/summary'
+import { SpuApi, SpuVO } from '@/api/product/summary'
 
-/** 商品汇总 表单 */
- defineOptions({ name: 'SummaryForm' })
+/** 商品spu 表单 */
+defineOptions({ name: 'SpuForm' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -81,8 +108,6 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
-  deviceId: undefined,
-  barCode: undefined,
   name: undefined,
   keyword: undefined,
   introduction: undefined,
@@ -92,19 +117,33 @@ const formData = ref({
   picUrl: undefined,
   sliderPicUrls: undefined,
   sort: undefined,
+  status: undefined,
+  types: undefined,
+  specType: undefined,
   price: undefined,
   marketPrice: undefined,
-  costPrice: undefined
+  costPrice: undefined,
+  stock: undefined,
+  deliveryTypes: undefined,
+  deliveryTemplateId: undefined,
+  giveIntegral: undefined,
+  subCommissionType: undefined,
+  salesCount: undefined,
+  virtualSalesCount: undefined,
+  browseCount: undefined
 })
 const formRules = reactive({
-  deviceId: [{ required: true, message: '设备IMEI不能为空', trigger: 'blur' }],
-  barCode: [{ required: true, message: 'SKU 的条形码不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '商品名称不能为空', trigger: 'blur' }],
   categoryId: [{ required: true, message: '商品分类编号不能为空', trigger: 'blur' }],
   picUrl: [{ required: true, message: '商品封面图不能为空', trigger: 'blur' }],
   sort: [{ required: true, message: '排序字段不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '商品状态: 1 上架（开启） 0 下架（禁用） -1 回收不能为空', trigger: 'blur' }],
+  types: [{ required: true, message: '商品类型: 0  商城商品   1 提货柜商品不能为空', trigger: 'blur' }],
   price: [{ required: true, message: '商品价格，单位使用：分不能为空', trigger: 'blur' }],
-  costPrice: [{ required: true, message: '成本价，单位： 分不能为空', trigger: 'blur' }]
+  costPrice: [{ required: true, message: '成本价，单位： 分不能为空', trigger: 'blur' }],
+  stock: [{ required: true, message: '库存不能为空', trigger: 'blur' }],
+  deliveryTypes: [{ required: true, message: '配送方式数组不能为空', trigger: 'blur' }],
+  giveIntegral: [{ required: true, message: '赠送积分不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -118,7 +157,7 @@ const open = async (type: string, id?: number) => {
   if (id) {
     formLoading.value = true
     try {
-      formData.value = await SummaryApi.getSummary(id)
+      formData.value = await SpuApi.getSpu(id)
     } finally {
       formLoading.value = false
     }
@@ -134,12 +173,12 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as SummaryVO
+    const data = formData.value as unknown as SpuVO
     if (formType.value === 'create') {
-      await SummaryApi.createSummary(data)
+      await SpuApi.createSpu(data)
       message.success(t('common.createSuccess'))
     } else {
-      await SummaryApi.updateSummary(data)
+      await SpuApi.updateSpu(data)
       message.success(t('common.updateSuccess'))
     }
     dialogVisible.value = false
@@ -154,8 +193,6 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
-    deviceId: undefined,
-    barCode: undefined,
     name: undefined,
     keyword: undefined,
     introduction: undefined,
@@ -165,9 +202,20 @@ const resetForm = () => {
     picUrl: undefined,
     sliderPicUrls: undefined,
     sort: undefined,
+    status: undefined,
+    types: undefined,
+    specType: undefined,
     price: undefined,
     marketPrice: undefined,
-    costPrice: undefined
+    costPrice: undefined,
+    stock: undefined,
+    deliveryTypes: undefined,
+    deliveryTemplateId: undefined,
+    giveIntegral: undefined,
+    subCommissionType: undefined,
+    salesCount: undefined,
+    virtualSalesCount: undefined,
+    browseCount: undefined
   }
   formRef.value?.resetFields()
 }

src/views/mall/product/summary/index.vue

@@ -8,24 +8,6 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="设备IMEI" prop="deviceId">
-        <el-input
-          v-model="queryParams.deviceId"
-          placeholder="请输入设备IMEI"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="SKU 的条形码" prop="barCode">
-        <el-input
-          v-model="queryParams.barCode"
-          placeholder="请输入SKU 的条形码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item> -->
       <el-form-item label="商品名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -35,7 +17,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="关键字" prop="keyword">
+      <!-- <el-form-item label="关键字" prop="keyword">
         <el-input
           v-model="queryParams.keyword"
           placeholder="请输入关键字"
@@ -43,7 +25,7 @@
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="商品简介" prop="introduction">
         <el-input
           v-model="queryParams.introduction"
@@ -53,7 +35,7 @@
           class="!w-240px"
         />
       </el-form-item> -->
-      <!-- <el-form-item label="商品分类编号" prop="categoryId">
+      <el-form-item label="分类编号" prop="categoryId">
         <el-input
           v-model="queryParams.categoryId"
           placeholder="请输入商品分类编号"
@@ -61,7 +43,7 @@
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
-      </el-form-item> -->
+      </el-form-item>
       <!-- <el-form-item label="商品品牌编号" prop="brandId">
         <el-input
           v-model="queryParams.brandId"
@@ -79,13 +61,10 @@
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
-      </el-form-item> -->
-      <!-- <el-form-item
-        label="商品轮播图地址
+      </el-form-item>
+      <el-form-item label="商品轮播图地址
  数组，以逗号分隔
- 最多上传15张"
-        prop="sliderPicUrls"
-      >
+ 最多上传15张" prop="sliderPicUrls">
         <el-input
           v-model="queryParams.sliderPicUrls"
           placeholder="请输入商品轮播图地址
@@ -105,7 +84,36 @@
           class="!w-240px"
         />
       </el-form-item> -->
-      <!-- <el-form-item label="商品价格，单位使用：分" prop="price">
+      <!-- <el-form-item label="商品状态: 1 上架（开启） 0 下架（禁用） -1 回收" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择商品状态: 1 上架（开启） 0 下架（禁用） -1 回收"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select> -->
+      <!-- </el-form-item>
+      <el-form-item label="商品类型: 0  商城商品   1 提货柜商品" prop="types">
+        <el-input
+          v-model="queryParams.types"
+          placeholder="请输入商品类型: 0  商城商品   1 提货柜商品"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="规格类型：0 单规格 1 多规格" prop="specType">
+        <el-select
+          v-model="queryParams.specType"
+          placeholder="请选择规格类型：0 单规格 1 多规格"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商品价格，单位使用：分" prop="price">
         <el-input
           v-model="queryParams.price"
           placeholder="请输入商品价格，单位使用：分"
@@ -132,6 +140,79 @@
           class="!w-240px"
         />
       </el-form-item> -->
+      <!-- <el-form-item label="库存" prop="stock">
+        <el-input
+          v-model="queryParams.stock"
+          placeholder="请输入库存"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="配送方式数组" prop="deliveryTypes">
+        <el-input
+          v-model="queryParams.deliveryTypes"
+          placeholder="请输入配送方式数组"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="物流配置模板编号" prop="deliveryTemplateId">
+        <el-input
+          v-model="queryParams.deliveryTemplateId"
+          placeholder="请输入物流配置模板编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="赠送积分" prop="giveIntegral">
+        <el-input
+          v-model="queryParams.giveIntegral"
+          placeholder="请输入赠送积分"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="分销类型" prop="subCommissionType">
+        <el-select
+          v-model="queryParams.subCommissionType"
+          placeholder="请选择分销类型"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item> -->
+      <!-- <el-form-item label="商品销量" prop="salesCount">
+        <el-input
+          v-model="queryParams.salesCount"
+          placeholder="请输入商品销量"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="虚拟销量" prop="virtualSalesCount">
+        <el-input
+          v-model="queryParams.virtualSalesCount"
+          placeholder="请输入虚拟销量"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="商品点击量" prop="browseCount">
+        <el-input
+          v-model="queryParams.browseCount"
+          placeholder="请输入商品点击量"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item> -->
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
@@ -150,7 +231,7 @@
           type="primary"
           plain
           @click="openForm('create')"
-          v-hasPermi="['product:summary:create']"
+          v-hasPermi="['product:spu:create']"
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
@@ -159,7 +240,7 @@
           plain
           @click="handleExport"
           :loading="exportLoading"
-          v-hasPermi="['product:summary:export']"
+          v-hasPermi="['product:spu:export']"
         >
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
@@ -170,27 +251,62 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="商品编号，自增" align="center" prop="id" />
-      <el-table-column label="设备IMEI" align="center" prop="deviceId" />
-      <!-- <el-table-column label="SKU 的条形码" align="center" prop="barCode" /> -->
+      <el-table-column label="商品编号" align="center" prop="id" />
       <el-table-column label="商品名称" align="center" prop="name" />
-      <el-table-column label="关键字" align="center" prop="keyword" />
+      <!-- <el-table-column label="关键字" align="center" prop="keyword" /> -->
       <!-- <el-table-column label="商品简介" align="center" prop="introduction" /> -->
-      <el-table-column label="商品详情" align="center" prop="description" />
-      <el-table-column label="商品分类编号" align="center" prop="categoryId" />
+      <!-- <el-table-column label="商品详情" align="center" prop="description" /> -->
+      <el-table-column label="分类编号" align="center" prop="categoryId" />
       <!-- <el-table-column label="商品品牌编号" align="center" prop="brandId" /> -->
-      <!-- <el-table-column label="商品封面图" align="center" prop="picUrl" /> -->
-      <!-- <el-table-column
-        label="商品轮播图地址
+      <el-table-column label="商品封面图" align="center" prop="picUrl" width="120">
+        <template #default="scope">
+          <el-image
+            v-if="scope.row.picUrl"
+            :src="scope.row.picUrl"
+            :preview-src-list="[scope.row.picUrl]"
+            fit="cover"
+            style="width: 60px; height: 60px; border-radius: 4px;"
+            :preview-teleported="true"
+          />
+          <span v-else class="text-gray-400">暂无图片</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="商品轮播图地址
  数组，以逗号分隔
- 最多上传15张"
-        align="center"
-        prop="sliderPicUrls"
-      /> -->
+ 最多上传15张" align="center" prop="sliderPicUrls" /> -->
       <!-- <el-table-column label="排序字段" align="center" prop="sort" /> -->
-      <el-table-column label="商品价格，单位使用：分" align="center" prop="price" />
-      <el-table-column label="市场价，单位使用：分" align="center" prop="marketPrice" />
-      <el-table-column label="成本价，单位： 分" align="center" prop="costPrice" />
+      <el-table-column label="商品状态" align="center" prop="status" width="100">
+        <template #default="scope">
+          <el-tag
+            :type="getStatusTagType(scope.row.status)"
+            effect="plain"
+          >
+            {{ getStatusText(scope.row.status) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品类型" align="center" prop="types" width="120">
+        <template #default="scope">
+          <el-tag
+            :type="getTypeTagType(scope.row.types)"
+            effect="plain"
+          >
+            {{ getTypeText(scope.row.types) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="规格类型：0 单规格 1 多规格" align="center" prop="specType" /> -->
+      <!-- <el-table-column label="商品价格，单位使用：分" align="center" prop="price" /> -->
+      <!-- <el-table-column label="市场价，单位使用：分" align="center" prop="marketPrice" /> -->
+      <!-- <el-table-column label="成本价，单位： 分" align="center" prop="costPrice" /> -->
+      <!-- <el-table-column label="库存" align="center" prop="stock" /> -->
+      <!-- <el-table-column label="配送方式数组" align="center" prop="deliveryTypes" /> -->
+      <!-- <el-table-column label="物流配置模板编号" align="center" prop="deliveryTemplateId" /> -->
+      <!-- <el-table-column label="赠送积分" align="center" prop="giveIntegral" /> -->
+      <!-- <el-table-column label="分销类型" align="center" prop="subCommissionType" /> -->
+      <el-table-column label="商品销量" align="center" prop="salesCount" />
+      <!-- <el-table-column label="虚拟销量" align="center" prop="virtualSalesCount" /> -->
+      <el-table-column label="商品点击量" align="center" prop="browseCount" />
       <el-table-column
         label="创建时间"
         align="center"
@@ -204,7 +320,7 @@
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['product:summary:update']"
+            v-hasPermi="['product:spu:update']"
           >
             编辑
           </el-button>
@@ -212,7 +328,7 @@
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['product:summary:delete']"
+            v-hasPermi="['product:spu:delete']"
           >
             删除
           </el-button>
@@ -229,29 +345,27 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <SummaryForm ref="formRef" @success="getList" />
+  <SpuForm ref="formRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
-import { SummaryApi, SummaryVO } from '@/api/product/summary'
-import SummaryForm from './SummaryForm.vue'
+import { SpuApi, SpuVO } from '@/api/product/summary'
+import SpuForm from './SpuForm.vue'
 
-/** 商品汇总 列表 */
-defineOptions({ name: 'Summary' })
+/** 商品spu 列表 */
+defineOptions({ name: 'Spu' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
 const loading = ref(true) // 列表的加载中
-const list = ref<SummaryVO[]>([]) // 列表的数据
+const list = ref<SpuVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  deviceId: undefined,
-  barCode: undefined,
   name: undefined,
   keyword: undefined,
   introduction: undefined,
@@ -261,9 +375,20 @@ const queryParams = reactive({
   picUrl: undefined,
   sliderPicUrls: undefined,
   sort: undefined,
+  status: undefined,
+  types: undefined,
+  specType: undefined,
   price: undefined,
   marketPrice: undefined,
   costPrice: undefined,
+  stock: undefined,
+  deliveryTypes: undefined,
+  deliveryTemplateId: undefined,
+  giveIntegral: undefined,
+  subCommissionType: undefined,
+  salesCount: undefined,
+  virtualSalesCount: undefined,
+  browseCount: undefined,
   createTime: []
 })
 const queryFormRef = ref() // 搜索的表单
@@ -273,9 +398,10 @@ const exportLoading = ref(false) // 导出的加载中
 const getList = async () => {
   loading.value = true
   try {
-    const data = await SummaryApi.getSummaryPage(queryParams)
+    const data = await SpuApi.getSpuPage(queryParams)
     list.value = data.list
     total.value = data.total
+    console.log('汇总',data)
   } finally {
     loading.value = false
   }
@@ -305,7 +431,7 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await SummaryApi.deleteSummary(id)
+    await SpuApi.deleteSpu(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
@@ -319,8 +445,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await SummaryApi.exportSummary(queryParams)
-    download.excel(data, '商品汇总.xls')
+    const data = await SpuApi.exportSpu(queryParams)
+    download.excel(data, '商品spu.xls')
   } catch {
   } finally {
     exportLoading.value = false
@@ -331,4 +457,56 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
+
+/** 获取状态文字 */
+const getStatusText = (status: number) => {
+  switch (status) {
+    case 1:
+      return '已上架'
+    case 0:
+      return '已下架'
+    case -1:
+      return '回收'
+    default:
+      return '未知状态'
+  }
+}
+
+/** 获取状态标签类型 */
+const getStatusTagType = (status: number) => {
+  switch (status) {
+    case 1:
+      return 'success'  // 绿色
+    case 0:
+      return 'warning'  // 橙色
+    case -1:
+      return 'danger'   // 红色
+    default:
+      return 'info'     // 灰色
+  }
+}
+
+/** 获取商品类型文字 */
+const getTypeText = (types: number) => {
+  switch (types) {
+    case 0:
+      return '商城商品'
+    case 1:
+      return '提货柜商品'
+    default:
+      return '未知类型'
+  }
+}
+
+/** 获取商品类型标签类型 */
+const getTypeTagType = (types: number) => {
+  switch (types) {
+    case 0:
+      return 'primary'  // 蓝色
+    case 1:
+      return 'success'  // 绿色
+    default:
+      return 'info'     // 灰色
+  }
+}
 </script>