Skip to content

Commit cbd3d6c

Browse files
YunaiVgitee-org
YunaiV
authored and
gitee-org
committed
!204 会员积分和会员签到模块todo修改
Merge pull request !204 from QingX/dev
2 parents a99a125 + f96882c commit cbd3d6c

File tree

11 files changed

+128
-510
lines changed

11 files changed

+128
-510
lines changed

‎src/api/point/config/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ export interface ConfigVO {
1010

1111
// 查询积分设置详情
1212
export const getConfig = async () => {
13-
return await request.get({ url: `/point/config/get` })
13+
return await request.get({ url: `/member/point/config/get` })
1414
}
1515

1616
// 新增修改积分设置
1717
export const saveConfig = async (data: ConfigVO) => {
18-
return await request.put({ url: `/point/config/save`, data })
18+
return await request.put({ url: `/member/point/config/save`, data })
1919
}

‎src/api/point/record/index.ts

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ export interface RecordVO {
44
id: number
55
bizId: string
66
bizType: string
7-
type: string
87
title: string
98
description: string
109
point: number
@@ -18,30 +17,5 @@ export interface RecordVO {
1817

1918
// 查询用户积分记录列表
2019
export const getRecordPage = async (params) => {
21-
return await request.get({ url: `/point/record/page`, params })
22-
}
23-
24-
// 查询用户积分记录详情
25-
export const getRecord = async (id: number) => {
26-
return await request.get({ url: `/point/record/get?id=` + id })
27-
}
28-
29-
// 新增用户积分记录
30-
export const createRecord = async (data: RecordVO) => {
31-
return await request.post({ url: `/point/record/create`, data })
32-
}
33-
34-
// 修改用户积分记录
35-
export const updateRecord = async (data: RecordVO) => {
36-
return await request.put({ url: `/point/record/update`, data })
37-
}
38-
39-
// 删除用户积分记录
40-
export const deleteRecord = async (id: number) => {
41-
return await request.delete({ url: `/point/record/delete?id=` + id })
42-
}
43-
44-
// 导出用户积分记录 Excel
45-
export const exportRecord = async (params) => {
46-
return await request.download({ url: `/point/record/export-excel`, params })
20+
return await request.get({ url: `/member/point/record/page`, params })
4721
}

‎src/api/point/signInConfig/index.ts

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,32 @@ import request from '@/config/axios'
22

33
export interface SignInConfigVO {
44
id: number
5-
day: number
6-
point: number
5+
day: number | null
6+
point: number | null
7+
enable: boolean | null
78
}
89

910
// 查询积分签到规则列表
10-
export const getSignInConfigPage = async (params) => {
11-
return await request.get({ url: `/point/sign-in-config/page`, params })
11+
export const getSignInConfigPage = async () => {
12+
return await request.get({ url: `/member/point/sign-in-config/list` })
1213
}
1314

1415
// 查询积分签到规则详情
1516
export const getSignInConfig = async (id: number) => {
16-
return await request.get({ url: `/point/sign-in-config/get?id=` + id })
17+
return await request.get({ url: `/member/point/sign-in-config/get?id=` + id })
1718
}
1819

1920
// 新增积分签到规则
2021
export const createSignInConfig = async (data: SignInConfigVO) => {
21-
return await request.post({ url: `/point/sign-in-config/create`, data })
22+
return await request.post({ url: `/member/point/sign-in-config/create`, data })
2223
}
2324

2425
// 修改积分签到规则
2526
export const updateSignInConfig = async (data: SignInConfigVO) => {
26-
return await request.put({ url: `/point/sign-in-config/update`, data })
27+
return await request.put({ url: `/member/point/sign-in-config/update`, data })
2728
}
2829

2930
// 删除积分签到规则
3031
export const deleteSignInConfig = async (id: number) => {
31-
return await request.delete({ url: `/point/sign-in-config/delete?id=` + id })
32-
}
33-
34-
// 导出积分签到规则 Excel
35-
export const exportSignInConfig = async (params) => {
36-
return await request.download({ url: `/point/sign-in-config/export-excel`, params })
32+
return await request.delete({ url: `/member/point/sign-in-config/delete?id=` + id })
3733
}

‎src/api/point/signInRecord/index.ts

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,10 @@ export interface SignInRecordVO {
99

1010
// 查询用户签到积分列表
1111
export const getSignInRecordPage = async (params) => {
12-
return await request.get({ url: `/point/sign-in-record/page`, params })
13-
}
14-
15-
// 查询用户签到积分详情
16-
export const getSignInRecord = async (id: number) => {
17-
return await request.get({ url: `/point/sign-in-record/get?id=` + id })
18-
}
19-
20-
// 新增用户签到积分
21-
export const createSignInRecord = async (data: SignInRecordVO) => {
22-
return await request.post({ url: `/point/sign-in-record/create`, data })
23-
}
24-
25-
// 修改用户签到积分
26-
export const updateSignInRecord = async (data: SignInRecordVO) => {
27-
return await request.put({ url: `/point/sign-in-record/update`, data })
28-
}
29-
30-
// 删除用户签到积分
31-
export const deleteSignInRecord = async (id: number) => {
32-
return await request.delete({ url: `/point/sign-in-record/delete?id=` + id })
12+
return await request.get({ url: `/member/point/sign-in-record/page`, params })
3313
}
3414

3515
// 导出用户签到积分 Excel
3616
export const exportSignInRecord = async (params) => {
37-
return await request.download({ url: `/point/sign-in-record/export-excel`, params })
17+
return await request.download({ url: `/member/point/sign-in-record/export-excel`, params })
3818
}

‎src/views/member/point/config/index.vue

Lines changed: 44 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,49 @@
1010
<el-form-item label="hideId" v-show="false">
1111
<el-input v-model="formData.id" />
1212
</el-form-item>
13-
<!-- TODO @xiaqing：展示给用户的字段名，可以和 crmeb 保持一直，然后每一个表单都有类似 crmeb 的 tip；例如说：积分抵用比例(1积分抵多少金额)单位：元 -->
14-
<el-form-item label="积分抵扣" prop="tradeDeductEnable">
15-
<el-switch v-model="formData.tradeDeductEnable" />
13+
<el-form-item label="积分抵扣" prop="tradeDeductEnable" class="item-bottom">
14+
<el-switch v-model="formData.tradeDeductEnable" style="user-select: none" />
1615
</el-form-item>
17-
<!-- TODO @xiaqing：用户看到的是元，最多 2 位；分是后端的存储哈 -->
18-
<el-form-item label="抵扣单位(分)" prop="tradeDeductUnitPrice">
16+
<el-form-item>
17+
<el-text class="mx-1" size="small" type="info">下单积分是否抵用订单金额</el-text>
18+
</el-form-item>
19+
<el-form-item label="积分抵扣" prop="tradeDeductUnitPrice" class="item-bottom">
1920
<el-input-number
20-
v-model="formData.tradeDeductUnitPrice"
21-
placeholder="请输入抵扣单位(分)"
21+
v-model="computedTradeDeductUnitPrice"
22+
placeholder="请输入积分抵扣金额"
2223
style="width: 300px"
24+
:precision="2"
2325
/>
2426
</el-form-item>
25-
<el-form-item label="积分抵扣最大值" prop="tradeDeductMaxPrice">
27+
<el-form-item>
28+
<el-text class="mx-1" size="small" type="info"
29+
>积分抵用比例(1积分抵多少金额)单位：元
30+
</el-text>
31+
</el-form-item>
32+
<el-form-item label="积分抵扣最大值" prop="tradeDeductMaxPrice" class="item-bottom">
2633
<el-input-number
2734
v-model="formData.tradeDeductMaxPrice"
2835
placeholder="请输入积分抵扣最大值"
2936
style="width: 300px"
3037
/>
3138
</el-form-item>
32-
<el-form-item label="1 元赠送多少分" prop="tradeGivePoint">
39+
<el-form-item>
40+
<el-text class="mx-1" size="small" type="info">单次下单积分使用上限,0不限制</el-text>
41+
</el-form-item>
42+
<el-form-item label="1 元赠送多少分" prop="tradeGivePoint" class="item-bottom">
3343
<el-input-number
3444
v-model="formData.tradeGivePoint"
3545
placeholder="请输入 1 元赠送多少积分"
3646
style="width: 300px"
3747
/>
3848
</el-form-item>
3949
<el-form-item>
40-
<el-button type="primary" @click="onSubmit">提交</el-button>
50+
<el-text class="mx-1" size="small" type="info"
51+
>下单支付金额按比例赠送积分（实际支付1元赠送多少积分）</el-text
52+
>
53+
</el-form-item>
54+
<el-form-item>
55+
<el-button type="primary" @click="onSubmit">保存</el-button>
4156
</el-form-item>
4257
</el-form>
4358
</ContentWrap>
@@ -52,11 +67,19 @@ const dialogVisible = ref(false) // 弹窗的是否展示
5267
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
5368
const formData = ref({
5469
id: undefined,
55-
tradeDeductEnable: undefined,
56-
tradeDeductUnitPrice: undefined,
57-
tradeDeductMaxPrice: undefined,
58-
tradeGivePoint: undefined
70+
tradeDeductEnable: true,
71+
tradeDeductUnitPrice: 0,
72+
tradeDeductMaxPrice: 0,
73+
tradeGivePoint: 0
74+
})
75+
// 创建一个计算属性，用于将 tradeDeductUnitPrice 显示为带两位小数的形式
76+
const computedTradeDeductUnitPrice = computed({
77+
get: () => (formData.value.tradeDeductUnitPrice / 100).toFixed(2),
78+
set: (newValue) => {
79+
formData.value.tradeDeductUnitPrice = Math.round(newValue * 100)
80+
}
5981
})
82+
6083
const formRules = reactive({})
6184
const formRef = ref() // 表单 Ref
6285
@@ -82,6 +105,7 @@ const onSubmit = async () => {
82105
const getConfig = async () => {
83106
try {
84107
const data = await ConfigApi.getConfig()
108+
if (data === null) return
85109
formData.value = data
86110
} finally {
87111
}
@@ -91,3 +115,9 @@ onMounted(() => {
91115
getConfig()
92116
})
93117
</script>
118+
119+
<style scoped>
120+
.item-bottom {
121+
margin-bottom: 0px;
122+
}
123+
</style>

0 commit comments

Comments
 (0)