promotion：优化秒杀活动的界面

(cherry picked from commit 7c491ff62a)

src/api/mall/promotion/seckill/seckillActivity.ts

@@ -57,6 +57,11 @@ export const updateSeckillActivity = async (data: SeckillActivityVO) => {
   return await request.put({ url: '/promotion/seckill-activity/update', data })
 }
 
+// 关闭秒杀活动
+export const closeSeckillActivity = async (id: number) => {
+  return await request.put({ url: '/promotion/seckill-activity/close?id=' + id })
+}
+
 // 删除秒杀活动
 export const deleteSeckillActivity = async (id: number) => {
   return await request.delete({ url: '/promotion/seckill-activity/delete?id=' + id })

src/views/mall/promotion/seckill/activity/index.vue

@@ -1,94 +1,205 @@
 <template>
-  <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
-
-  <!-- 搜索工作栏 -->
   <ContentWrap>
-    <Search :schema="allSchemas.searchSchema" @reset="setSearchParams" @search="setSearchParams">
+    <!-- 搜索工作栏 -->
-      <!-- 新增等操作按钮 -->
+    <el-form
-      <template #actionMore>
+      class="-mb-15px"
-        <el-button
+      :model="queryParams"
-          v-hasPermi="['promotion:seckill-activity:create']"
+      ref="queryFormRef"
-          plain
+      :inline="true"
-          type="primary"
+      label-width="68px"
-          @click="openForm('create')"
+    >
+      <el-form-item label="活动名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入活动名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="活动状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择活动状态"
+          clearable
+          class="!w-240px"
         >
-          <Icon class="mr-5px" icon="ep:plus" /> 新增
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['promotion:seckill-activity:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-      </template>
+      </el-form-item>
-    </Search>
+    </el-form>
   </ContentWrap>
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      v-model:currentPage="tableObject.currentPage"
+      <el-table-column label="活动编号" prop="id" min-width="80" />
-      v-model:pageSize="tableObject.pageSize"
+      <el-table-column label="活动名称" prop="name" min-width="140" />
-      :columns="allSchemas.tableColumns"
+      <el-table-column
-      :data="tableObject.tableList"
+        label="秒杀时段"
-      :expand="true"
+        prop="configIds"
-      :loading="tableObject.loading"
+        width="220px"
-      :pagination="{
+        :show-overflow-tooltip="false"
-        total: tableObject.total
+      >
-      }"
+        <template #default="scope">
-      @expand-change="expandChange"
+          <el-tag v-for="(configId, index) in scope.row.configIds" :key="index" class="mr-5px">
-    >
+            {{ formatConfigNames(configId) }}
-      <template #expand> 展示活动商品和商品相关属性活动配置</template>
+          </el-tag>
-      <template #spuId="{ row }">
+        </template>
-        <el-image
+      </el-table-column>
-          :src="row.picUrl"
+      <el-table-column label="活动时间" min-width="210">
-          class="mr-5px h-30px w-30px align-middle"
+        <template #default="scope">
-          @click="imagePreview(row.picUrl)"
+          {{ formatDate(scope.row.startTime, 'YYYY-MM-DD') }}
-        />
+          ~ {{ formatDate(scope.row.endTime, 'YYYY-MM-DD') }}
-        <span class="align-middle">{{ row.spuName }}</span>
+        </template>
-      </template>
+      </el-table-column>
-      <template #configIds="{ row }">
+      <el-table-column label="商品图片" prop="spuName" min-width="80">
-        <el-tag v-for="(name, index) in convertSeckillConfigNames(row)" :key="index" class="mr-5px">
+        <template #default="scope">
-          {{ name }}
+          <el-image
-        </el-tag>
+            :src="scope.row.picUrl"
-      </template>
+            class="h-40px w-40px"
-      <template #action="{ row }">
+            :preview-src-list="[scope.row.picUrl]"
-        <el-button
+            preview-teleported
-          v-hasPermi="['promotion:seckill-activity:update']"
+          />
-          link
+        </template>
-          type="primary"
+      </el-table-column>
-          @click="openForm('update', row.id)"
+      <el-table-column label="商品标题" prop="spuName" min-width="300" />
-        >
+      <el-table-column
-          编辑
+        label="原价"
-        </el-button>
+        prop="marketPrice"
-        <el-button
+        min-width="100"
-          v-hasPermi="['promotion:seckill-activity:delete']"
+        :formatter="fenToYuanFormat"
-          link
+      />
-          type="danger"
+      <el-table-column label="秒杀价" prop="marketPrice" min-width="100">
-          @click="handleDelete(row.id)"
+        <template #default="scope">
-        >
+          {{ formatSeckillPrice(scope.row.products) }}
-          删除
+        </template>
-        </el-button>
+      </el-table-column>
-      </template>
+      <el-table-column label="活动状态" align="center" prop="status" min-width="100">
-    </Table>
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="库存" align="center" prop="stock" min-width="80" />
+      <el-table-column label="总库存" align="center" prop="totalStock" min-width="80" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" width="150px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['promotion:seckill-activity:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleClose(scope.row.id)"
+            v-if="scope.row.status === 0"
+            v-hasPermi="['promotion:seckill-activity:close']"
+          >
+            关闭
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-else
+            v-hasPermi="['promotion:seckill-activity:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
   <SeckillActivityForm ref="formRef" @success="getList" />
 </template>
-<script lang="ts" setup>
+
-import { allSchemas } from './seckillActivity.data'
+<script setup lang="ts">
-import { getSimpleSeckillConfigList } from '@/api/mall/promotion/seckill/seckillConfig'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
 import * as SeckillActivityApi from '@/api/mall/promotion/seckill/seckillActivity'
+import * as SeckillConfigApi from '@/api/mall/promotion/seckill/seckillConfig'
 import SeckillActivityForm from './SeckillActivityForm.vue'
-import { createImageViewer } from '@/components/ImageViewer'
+import { formatDate } from '@/utils/formatTime'
-import { sortTableColumns } from '@/hooks/web/useCrudSchemas'
+import { fenToYuanFormat } from '@/utils/formatter'
+import { fenToYuan } from '@/utils'
 
-defineOptions({ name: 'PromotionSeckillActivity' })
+defineOptions({ name: 'SeckillActivity' })
 
-// tableObject：表格的属性对象，可获得分页大小、条数等属性
+const message = useMessage() // 消息弹窗
-// tableMethods：表格的操作对象，可进行获得分页、删除记录等操作
+const { t } = useI18n() // 国际化
-// 详细可见：https://doc.iocoder.cn/vue3/crud-schema/
+
-const { tableObject, tableMethods } = useTable({
+const loading = ref(true) // 列表的加载中
-  getListApi: SeckillActivityApi.getSeckillActivityPage, // 分页接口
+const total = ref(0) // 列表的总页数
-  delListApi: SeckillActivityApi.deleteSeckillActivity // 删除接口
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: null,
+  status: null
 })
-// 获得表格的各种操作
+const queryFormRef = ref() // 搜索的表单
-const { getList, setSearchParams } = tableMethods
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await SeckillActivityApi.getSeckillActivityPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
 
 /** 添加/修改操作 */
 const formRef = ref()
@@ -96,37 +207,47 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 
-/** 删除按钮操作 */
+/** 关闭按钮操作 */
-const handleDelete = (id: number) => {
+const handleClose = async (id: number) => {
-  tableMethods.delList(id, false)
+  try {
+    // 关闭的二次确认
+    await message.confirm('确认关闭该秒杀活动吗？')
+    // 发起关闭
+    await SeckillActivityApi.closeSeckillActivity(id)
+    message.success('关闭成功')
+    // 刷新列表
+    await getList()
+  } catch {}
 }
 
-/** 商品图预览 */
+/** 删除按钮操作 */
-const imagePreview = (imgUrl: string) => {
+const handleDelete = async (id: number) => {
-  createImageViewer({
+  try {
-    urlList: [imgUrl]
+    // 删除的二次确认
-  })
+    await message.delConfirm()
+    // 发起删除
+    await SeckillActivityApi.deleteSeckillActivity(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
 }
 
 const configList = ref([]) // 时段配置精简列表
-const convertSeckillConfigNames = computed(
+const formatConfigNames = (configId) => {
-  () => (row) =>
+  const config = configList.value.find((item) => item.id === configId)
-    configList.value
+  return config != null ? `${config.name}[${config.startTime} ~ ${config.endTime}]` : ''
-      ?.filter((item) => row.configIds.includes(item.id))
+}
-      ?.map((config) => config.name)
-)
 
-const expandChange = (row, expandedRows) => {
+const formatSeckillPrice = (products) => {
-  // TODO puhui：等 CRUD 完事后弄
+  const seckillPrice = Math.min(...products.map((item) => item.seckillPrice))
-  console.log(row, expandedRows)
+  return `￥${fenToYuan(seckillPrice)}`
 }
 
 /** 初始化 **/
 onMounted(async () => {
-  // 获得活动列表
-  sortTableColumns(allSchemas.tableColumns, 'spuId')
   await getList()
   // 获得秒杀时间段
-  configList.value = await getSimpleSeckillConfigList()
+  configList.value = await SeckillConfigApi.getSimpleSeckillConfigList()
 })
 </script>