Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm

puhui999 · puhui999 · commit bcf2f7a5dc04 · 2024-05-06T02:12:39.000+08:00
diff --git 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
-}
-
-// 查询秒杀时段配置列表
-export const getSeckillConfigPage = async (params) => {
-  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 })
-}
-
-// 获得所有开启状态的秒杀时段精简列表
-export const getSimpleSeckillConfigList = async () => {
-  return await request.get({ url: '/promotion/seckill-config/list-all-simple' })
-}
-
-// 新增秒杀时段配置
-export const createSeckillConfig = async (data: SeckillConfigVO) => {
-  return await request.post({ url: '/promotion/seckill-config/create', data })
-}
-
-// 修改秒杀时段配置
-export const updateSeckillConfig = async (data: SeckillConfigVO) => {
-  return await request.put({ url: '/promotion/seckill-config/update', data })
-}
-
-// 修改时段配置状态
-export const updateSeckillConfigStatus = (id: number, status: number) => {
-  const data = {
-    id,
-    status
+  id: number // 编号
+  name: string // 秒杀时段名称
+  startTime: string // 开始时间点
+  endTime: string // 结束时间点
+  sliderPicUrls: string[] // 秒杀轮播图
+  status: number // 活动状态
+}
+
+// 秒杀时段 API
+export const SeckillConfigApi = {
+  // 查询秒杀时段分页
+  getSeckillConfigPage: async (params: any) => {
+    return await request.get({ url: `/promotion/seckill-config/page`, params })
+  },
+
+  // 查询秒杀时段详情
+  getSeckillConfig: async (id: number) => {
+    return await request.get({ url: `/promotion/seckill-config/get?id=` + id })
+  },
+
+  // 新增秒杀时段
+  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 })
+  },
+
+  // 删除秒杀时段
+  deleteSeckillConfig: async (id: number) => {
+    return await request.delete({ url: `/promotion/seckill-config/delete?id=` + id })
+  },
+
+  // 修改时段配置状态
+  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
@@ -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
@@ -54,7 +54,7 @@
       </template>
       <div class="max-h-80 overflow-auto">
         <ul>
-          <li v-for="msg in messageList.reverse()" :key="msg.time" class="mt-2">
+          <li v-for="msg in messageReverseList" :key="msg.time" class="mt-2">
             <div class="flex items-center">
               <span class="text-primary mr-2 font-medium">收到消息:</span>
               <span>{{ formatDate(msg.time) }}</span>
@@ -92,6 +92,7 @@ const { status, data, send, close, open } = useWebSocket(server.value, {
 
 /** 监听接收到的数据 */
 const messageList = ref([] as { time: number; text: string }[]) // 消息列表
+const messageReverseList = computed(() => messageList.value.slice().reverse())
 watchEffect(() => {
   if (!data.value) {
     return
diff --git a/src/views/mall/home/index.vue b/src/views/mall/home/index.vue
@@ -9,7 +9,7 @@
           tag="今日"
           title="销售额"
           prefix="￥"
-          ::decimals="2"
+          :decimals="2"
           :value="fenToYuan(orderComparison?.value?.orderPayPrice || 0)"
           :reference="fenToYuan(orderComparison?.reference?.orderPayPrice || 0)"
         />
@@ -26,8 +26,8 @@
         <ComparisonCard
           tag="今日"
           title="订单量"
-          :value="fenToYuan(orderComparison?.value?.orderPayCount || 0)"
-          :reference="fenToYuan(orderComparison?.reference?.orderPayCount || 0)"
+          :value="orderComparison?.value?.orderPayCount || 0"
+          :reference="orderComparison?.reference?.orderPayCount || 0"
         />
       </el-col>
       <el-col :md="6" :sm="12" :xs="24" :loading="loading">
diff --git a/src/views/mall/promotion/seckill/config/SeckillConfigForm.vue b/src/views/mall/promotion/seckill/config/SeckillConfigForm.vue
@@ -1,15 +1,57 @@
 <template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle">
-    <Form ref="formRef" v-loading="formLoading" :rules="rules" :schema="allSchemas.formSchema" />
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="120px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="秒杀时段名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入秒杀时段名称" />
+      </el-form-item>
+      <el-form-item label="开始时间点" prop="startTime">
+        <el-time-picker
+          v-model="formData.startTime"
+          value-format="HH:mm:ss"
+          placeholder="选择开始时间点"
+        />
+      </el-form-item>
+      <el-form-item label="结束时间点" prop="endTime">
+        <el-time-picker
+          v-model="formData.endTime"
+          value-format="HH:mm:ss"
+          placeholder="选择结束时间点"
+        />
+      </el-form-item>
+      <el-form-item label="秒杀轮播图" prop="sliderPicUrls">
+        <UploadImgs v-model="formData.sliderPicUrls" placeholder="请输入秒杀轮播图" />
+      </el-form-item>
+      <el-form-item label="活动状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
     <template #footer>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SeckillConfigForm" setup>
-import * as SeckillConfigApi from '@/api/mall/promotion/seckill/seckillConfig'
-import { allSchemas, rules } from './seckillConfig.data'
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { SeckillConfigApi, SeckillConfigVO } from '@/api/mall/promotion/seckill/seckillConfig.ts'
+import { CommonStatusEnum } from '@/utils/constants'
+
+/** 秒杀时段 表单 */
+defineOptions({ name: 'SeckillConfigForm' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -18,22 +60,33 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  startTime: undefined,
+  endTime: undefined,
+  sliderPicUrls: undefined,
+  status: undefined
+})
+const formRules = reactive({
+  name: [{ required: true, message: '秒杀时段名称不能为空', trigger: 'blur' }],
+  startTime: [{ required: true, message: '开始时间点不能为空', trigger: 'blur' }],
+  endTime: [{ required: true, message: '结束时间点不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '活动状态不能为空', trigger: 'blur' }]
+})
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
+  resetForm()
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
     try {
-      const data = await SeckillConfigApi.getSeckillConfig(id)
-      data.sliderPicUrls = data['sliderPicUrls']?.map((item) => ({
-        url: item
-      }))
-      formRef.value.setValues(data)
+      formData.value = await SeckillConfigApi.getSeckillConfig(id)
     } finally {
       formLoading.value = false
     }
@@ -45,24 +98,11 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
-  if (!formRef) return
-  const valid = await formRef.value.getElFormRef().validate()
-  if (!valid) return
+  await formRef.value.validate()
   // 提交请求
   formLoading.value = true
   try {
-    // 处理轮播图列表
-    const sliderPicUrls = []
-    formRef.value.formModel.sliderPicUrls.forEach((item) => {
-      // 如果是前端选的图
-      typeof item === 'object' ? sliderPicUrls.push(item.url) : sliderPicUrls.push(item)
-    })
-
-    // 真正提交
-    const data = {
-      ...formRef.value.formModel,
-      sliderPicUrls
-    } as SeckillConfigApi.SeckillConfigVO
+    const data = formData.value as unknown as SeckillConfigVO
     if (formType.value === 'create') {
       await SeckillConfigApi.createSeckillConfig(data)
       message.success(t('common.createSuccess'))
@@ -77,4 +117,17 @@ const submitForm = async () => {
     formLoading.value = false
   }
 }
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    startTime: undefined,
+    endTime: undefined,
+    sliderPicUrls: [],
+    status: CommonStatusEnum.ENABLE
+  }
+  formRef.value?.resetFields()
+}
 </script>
diff --git a/src/views/mall/promotion/seckill/config/index.vue b/src/views/mall/promotion/seckill/config/index.vue
diff --git a/src/views/mall/promotion/seckill/config/seckillConfig.data.ts b/src/views/mall/promotion/seckill/config/seckillConfig.data.ts
