diff --git a/src/api/point/config/index.ts b/src/api/point/config/index.ts index 1bf7b094..00adc3f1 100644 --- a/src/api/point/config/index.ts +++ b/src/api/point/config/index.ts @@ -8,32 +8,12 @@ export interface ConfigVO { tradeGivePoint: number } -// 查询积分设置列表 -export const getConfigPage = async (params) => { - return await request.get({ url: `/point/config/page`, params }) -} - // 查询积分设置详情 -export const getConfig = async (id: number) => { - return await request.get({ url: `/point/config/get?id=` + id }) +export const getConfig = async () => { + return await request.get({ url: `/point/config/get` }) } -// 新增积分设置 -export const createConfig = async (data: ConfigVO) => { - return await request.post({ url: `/point/config/create`, data }) -} - -// 修改积分设置 -export const updateConfig = async (data: ConfigVO) => { - return await request.put({ url: `/point/config/update`, data }) -} - -// 删除积分设置 -export const deleteConfig = async (id: number) => { - return await request.delete({ url: `/point/config/delete?id=` + id }) -} - -// 导出积分设置 Excel -export const exportConfig = async (params) => { - return await request.download({ url: `/point/config/export-excel`, params }) +// 新增修改积分设置 +export const saveConfig = async (data: ConfigVO) => { + return await request.put({ url: `/point/config/save`, data }) } diff --git a/src/utils/dict.ts b/src/utils/dict.ts index fda02848..67a92ba6 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -146,9 +146,8 @@ export enum DICT_TYPE { MP_MESSAGE_TYPE = 'mp_message_type', // 消息类型 // ========== MALL - 会员模块 ========== - // 积分模块 TODO 芋艿:改成 member_ 前缀;包括枚举和值; - POINT_BIZ_TYPE = 'point_biz_type', - POINT_STATUS = 'point_status', + MEMBER_POINT_BIZ_TYPE = 'member_point_biz_type', // 积分的业务类型 + MEMBER_POINT_STATUS = 'member_point_status', // 积分的状态 // ========== MALL - 商品模块 ========== PRODUCT_UNIT = 'product_unit', // 商品单位 diff --git a/src/views/mall/product/spu/components/index.ts b/src/views/mall/product/spu/components/index.ts index 59c031e8..ca61ff6b 100644 --- a/src/views/mall/product/spu/components/index.ts +++ b/src/views/mall/product/spu/components/index.ts @@ -7,6 +7,7 @@ import SkuList from './SkuList.vue' import { Spu } from '@/api/mall/product/spu' +// TODO @puhui999:Properties 改成 Property 更合适? interface Properties { id: number name: string @@ -30,8 +31,10 @@ interface RuleConfig { } /** - * 商品通用函数 + * 获得商品的规格列表 + * * @param spu + * @return Property 规格列表 */ const getPropertyList = (spu: Spu): Properties[] => { // 直接拿返回的 skus 属性逆向生成出 propertyList diff --git a/src/views/mall/product/spu/index.vue b/src/views/mall/product/spu/index.vue index 7dfd484b..75bd02e0 100644 --- a/src/views/mall/product/spu/index.vue +++ b/src/views/mall/product/spu/index.vue @@ -437,6 +437,7 @@ const categoryList = ref() // 分类树 const categoryString = (categoryId) => { return treeToString(categoryList.value, categoryId) } + /** * 校验所选是否为二级及以下节点 */ @@ -446,6 +447,7 @@ const nodeClick = () => { message.warning('必须选择二级及以下节点!!') } } + /** 初始化 **/ onMounted(async () => { await getTabsCount() diff --git a/src/views/mall/promotion/components/SpuSelect.vue b/src/views/mall/promotion/components/SpuSelect.vue index 0d535dfd..94c60c9c 100644 --- a/src/views/mall/promotion/components/SpuSelect.vue +++ b/src/views/mall/promotion/components/SpuSelect.vue @@ -256,7 +256,6 @@ const imagePreview = (imgUrl: string) => { const categoryList = ref() // 分类树 -// TODO @puhui999:商品搜索的时候,可以通过一级搜二级;所以这个校验可以去掉哈;也就是说,只允许挂在二级,但是一级可搜索到 /** 初始化 **/ onMounted(async () => { await getList() diff --git a/src/views/mall/promotion/components/index.ts b/src/views/mall/promotion/components/index.ts index f3f09950..a4b4e75b 100644 --- a/src/views/mall/promotion/components/index.ts +++ b/src/views/mall/promotion/components/index.ts @@ -7,6 +7,7 @@ type SpuProperty = { spuDetail: T propertyList: Properties[] } + /** * 提供商品活动商品选择通用组件 */ diff --git a/src/views/mall/promotion/seckill/activity/index.vue b/src/views/mall/promotion/seckill/activity/index.vue index d7d69dfb..f06b855f 100644 --- a/src/views/mall/promotion/seckill/activity/index.vue +++ b/src/views/mall/promotion/seckill/activity/index.vue @@ -89,6 +89,8 @@ const openForm = (type: string, id?: number) => { const handleDelete = (id: number) => { tableMethods.delList(id, false) } + +// TODO @puhui:是不是直接叫 configList 就好啦 const seckillConfigAllSimple = ref([]) // 时段配置精简列表 const convertSeckillConfigNames = computed( () => (row) => @@ -96,6 +98,7 @@ const convertSeckillConfigNames = computed( ?.filter((item) => row.configIds.includes(item.id)) ?.map((config) => config.name) ) + const expandChange = (row, expandedRows) => { // TODO puhui:等 CRUD 完事后弄 console.log(row, expandedRows) diff --git a/src/views/mall/promotion/seckill/activity/seckillActivity.data.ts b/src/views/mall/promotion/seckill/activity/seckillActivity.data.ts index fcf48985..c858374c 100644 --- a/src/views/mall/promotion/seckill/activity/seckillActivity.data.ts +++ b/src/views/mall/promotion/seckill/activity/seckillActivity.data.ts @@ -219,7 +219,7 @@ const crudSchemas = reactive([ }, { label: '状态', - field: 'status', // TODO @puhui999:状态在 table 格式化不对;建表插入的数据状态值不对,改为 0 或 1 就好了 + field: 'status', dictType: DICT_TYPE.COMMON_STATUS, dictClass: 'number', isForm: false, diff --git a/src/views/member/point/config/index.vue b/src/views/member/point/config/index.vue new file mode 100644 index 00000000..0fd1484f --- /dev/null +++ b/src/views/member/point/config/index.vue @@ -0,0 +1,93 @@ + + diff --git a/src/views/point/record/RecordForm.vue b/src/views/member/point/record/RecordForm.vue similarity index 96% rename from src/views/point/record/RecordForm.vue rename to src/views/member/point/record/RecordForm.vue index bf162b96..a75eb9a5 100644 --- a/src/views/point/record/RecordForm.vue +++ b/src/views/member/point/record/RecordForm.vue @@ -13,7 +13,7 @@ { } } +// TODO @xiaqing:不需要更新操作哇? /** 重置表单 */ const resetForm = () => { formData.value = { diff --git a/src/views/point/record/index.vue b/src/views/member/point/record/index.vue similarity index 67% rename from src/views/point/record/index.vue rename to src/views/member/point/record/index.vue index 98591242..517410f7 100644 --- a/src/views/point/record/index.vue +++ b/src/views/member/point/record/index.vue @@ -25,7 +25,7 @@ class="!w-240px" > - + 搜索 重置 - - 新增 - - - 导出 - @@ -90,13 +78,18 @@ - - - - - + + + + + + + - - - + + + + + - - - - - import { DICT_TYPE, getStrDictOptions, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' -import download from '@/utils/download' import * as RecordApi from '@/api/point/record' import RecordForm from './RecordForm.vue' defineOptions({ name: 'PointRecord' }) -const message = useMessage() // 消息弹窗 -const { t } = useI18n() // 国际化 - const loading = ref(true) // 列表的加载中 const total = ref(0) // 列表的总页数 const list = ref([]) // 列表的数据 @@ -195,7 +161,6 @@ const queryParams = reactive({ createDate: [] }) const queryFormRef = ref() // 搜索的表单 -const exportLoading = ref(false) // 导出的加载中 /** 查询列表 */ const getList = async () => { @@ -221,40 +186,6 @@ const resetQuery = () => { handleQuery() } -/** 添加/修改操作 */ -const formRef = ref() -const openForm = (type: string, id?: number) => { - formRef.value.open(type, id) -} - -/** 删除按钮操作 */ -const handleDelete = async (id: number) => { - try { - // 删除的二次确认 - await message.delConfirm() - // 发起删除 - await RecordApi.deleteRecord(id) - message.success(t('common.delSuccess')) - // 刷新列表 - await getList() - } catch {} -} - -/** 导出按钮操作 */ -const handleExport = async () => { - try { - // 导出的二次确认 - await message.exportConfirm() - // 发起导出 - exportLoading.value = true - const data = await RecordApi.exportRecord(queryParams) - download.excel(data, '用户积分记录.xls') - } catch { - } finally { - exportLoading.value = false - } -} - /** 初始化 **/ onMounted(() => { getList() diff --git a/src/views/point/signInConfig/SignInConfigForm.vue b/src/views/member/signin/config/SignInConfigForm.vue similarity index 100% rename from src/views/point/signInConfig/SignInConfigForm.vue rename to src/views/member/signin/config/SignInConfigForm.vue diff --git a/src/views/point/signInConfig/index.vue b/src/views/member/signin/config/index.vue similarity index 91% rename from src/views/point/signInConfig/index.vue rename to src/views/member/signin/config/index.vue index 6068c39c..ca4db158 100644 --- a/src/views/point/signInConfig/index.vue +++ b/src/views/member/signin/config/index.vue @@ -8,6 +8,7 @@ :inline="true" label-width="68px" > + + 导出 @@ -44,15 +46,10 @@ - + - - + +