diff --git a/src/api/mall/promotion/seckill/seckillConfig.ts b/src/api/mall/promotion/seckill/seckillConfig.ts index 23ad15ca..e3d618f7 100644 --- a/src/api/mall/promotion/seckill/seckillConfig.ts +++ b/src/api/mall/promotion/seckill/seckillConfig.ts @@ -1,49 +1,48 @@ import request from '@/config/axios' +// 秒杀时段 VO export interface SeckillConfigVO { - id: number - name: string - startTime: string - endTime: string - sliderPicUrls: string[] - status: number + id: number // 编号 + name: string // 秒杀时段名称 + startTime: string // 开始时间点 + endTime: string // 结束时间点 + sliderPicUrls: string[] // 秒杀轮播图 + status: number // 活动状态 } -// 查询秒杀时段配置列表 -export const getSeckillConfigPage = async (params) => { - return await request.get({ url: '/promotion/seckill-config/page', params }) -} +// 秒杀时段 API +export const SeckillConfigApi = { + // 查询秒杀时段分页 + getSeckillConfigPage: async (params: any) => { + return await request.get({ url: `/promotion/seckill-config/page`, params }) + }, -// 查询秒杀时段配置详情 -export const getSeckillConfig = async (id: number) => { - return await request.get({ url: '/promotion/seckill-config/get?id=' + id }) -} + // 查询秒杀时段详情 + getSeckillConfig: async (id: number) => { + return await request.get({ url: `/promotion/seckill-config/get?id=` + id }) + }, -// 获得所有开启状态的秒杀时段精简列表 -export const getSimpleSeckillConfigList = async () => { - return await request.get({ url: '/promotion/seckill-config/list-all-simple' }) -} + // 新增秒杀时段 + createSeckillConfig: async (data: SeckillConfigVO) => { + return await request.post({ url: `/promotion/seckill-config/create`, data }) + }, -// 新增秒杀时段配置 -export const createSeckillConfig = async (data: SeckillConfigVO) => { - return await request.post({ url: '/promotion/seckill-config/create', data }) -} + // 修改秒杀时段 + updateSeckillConfig: async (data: SeckillConfigVO) => { + return await request.put({ url: `/promotion/seckill-config/update`, data }) + }, -// 修改秒杀时段配置 -export const updateSeckillConfig = async (data: SeckillConfigVO) => { - return await request.put({ url: '/promotion/seckill-config/update', data }) -} + // 删除秒杀时段 + deleteSeckillConfig: async (id: number) => { + return await request.delete({ url: `/promotion/seckill-config/delete?id=` + id }) + }, -// 修改时段配置状态 -export const updateSeckillConfigStatus = (id: number, status: number) => { - const data = { - id, - status + // 修改时段配置状态 + updateSeckillConfigStatus: async (id: number, status: number) => { + const data = { + id, + status + } + return request.put({ url: '/promotion/seckill-config/update-status', data: data }) } - return request.put({ url: '/promotion/seckill-config/update-status', data: data }) -} - -// 删除秒杀时段配置 -export const deleteSeckillConfig = async (id: number) => { - return await request.delete({ url: '/promotion/seckill-config/delete?id=' + id }) } diff --git a/src/components/UploadFile/src/useUpload.ts b/src/components/UploadFile/src/useUpload.ts index cadad9e9..c0465a28 100644 --- a/src/components/UploadFile/src/useUpload.ts +++ b/src/components/UploadFile/src/useUpload.ts @@ -17,7 +17,11 @@ export const useUpload = () => { // 1.2 获取文件预签名地址 const presignedInfo = await FileApi.getFilePresignedUrl(fileName) // 1.3 上传文件(不能使用 ElUpload 的 ajaxUpload 方法的原因:其使用的是 FormData 上传,Minio 不支持) - return axios.put(presignedInfo.uploadUrl, options.file).then(() => { + return axios.put(presignedInfo.uploadUrl, options.file, { + headers: { + 'Content-Type': options.file.type, + } + }).then(() => { // 1.4. 记录文件信息到后端(异步) createFile(presignedInfo, fileName, options.file) // 通知成功,数据格式保持与后端上传的返回结果一致 diff --git a/src/views/infra/webSocket/index.vue b/src/views/infra/webSocket/index.vue index dec256fe..0f0e351f 100644 --- a/src/views/infra/webSocket/index.vue +++ b/src/views/infra/webSocket/index.vue @@ -54,7 +54,7 @@