diff --git a/apps/web-antd/src/views/mall/promotion/point/components/table-select.vue b/apps/web-antd/src/views/mall/promotion/point/components/table-select.vue index eff545cba..d4c1a2a27 100644 --- a/apps/web-antd/src/views/mall/promotion/point/components/table-select.vue +++ b/apps/web-antd/src/views/mall/promotion/point/components/table-select.vue @@ -9,7 +9,6 @@ import { computed } from 'vue'; import { useVbenModal } from '@vben/common-ui'; import { DICT_TYPE } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; -import { dateFormatter, fenToYuanFormat } from '@vben/utils'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getPointActivityPage } from '#/api/mall/promotion/point'; @@ -92,7 +91,9 @@ const gridColumns = computed(() => { title: '原价', minWidth: 100, align: 'center', - formatter: ({ cellValue }) => fenToYuanFormat(cellValue), + formatter: ({ cellValue }) => { + return `¥${(cellValue / 100).toFixed(2)}`; + }, }, { field: 'status', @@ -128,7 +129,7 @@ const gridColumns = computed(() => { title: '创建时间', width: 180, align: 'center', - formatter: ({ cellValue }) => dateFormatter(cellValue), + formatter: 'formatDateTime', }, ); return columns; diff --git a/apps/web-ele/src/views/mall/promotion/point/activity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/point/activity/modules/form.vue index b2fb8b9ef..bf21ae078 100644 --- a/apps/web-ele/src/views/mall/promotion/point/activity/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/point/activity/modules/form.vue @@ -4,7 +4,7 @@ import type { MallPointActivityApi } from '#/api/mall/promotion/point'; import type { RuleConfig, SpuProperty, -} from '#/views/mall/product/spu/components/type'; +} from '#/views/mall/product/spu/components'; import { computed, ref } from 'vue'; @@ -23,11 +23,10 @@ import { } from '#/api/mall/promotion/point'; import { $t } from '#/locales'; import { + getPropertyList, SpuAndSkuList, SpuSkuSelect, } from '#/views/mall/product/spu/components'; -// TODO @puhui999:getPropertyList 在 antd 和 el 导入的路径不同;是不是要统一下哈; -import { getPropertyList } from '#/views/mall/product/spu/components/property-util'; import { useFormSchema } from '../data'; @@ -100,7 +99,6 @@ async function getSpuDetails( return; } - // TODO @puhui999:这里的 spuList,是不是直接放到 145 行就 ok 啦;(尾部); spuList.value = []; // 筛选指定的 SKU @@ -134,7 +132,6 @@ async function getSpuDetails( }); res.skus = selectSkus; - // TODO @puhui999:这里的逻辑,是不是放到 147 行(尾部); const spuProperties: SpuProperty[] = [ { spuId: res.id!, diff --git a/apps/web-ele/src/views/mall/promotion/point/components/showcase.vue b/apps/web-ele/src/views/mall/promotion/point/components/showcase.vue index 5aedbba54..597395ea3 100644 --- a/apps/web-ele/src/views/mall/promotion/point/components/showcase.vue +++ b/apps/web-ele/src/views/mall/promotion/point/components/showcase.vue @@ -1,5 +1,4 @@ -