Skip to content

Commit de941ec

Browse files
author
xiaqing
committed
会员积分针对代码格式、功能优化
1.优化todo建议 2.删除无用代码
1 parent f310f65 commit de941ec

File tree

5 files changed

+51
-243
lines changed

5 files changed

+51
-243
lines changed

src/api/point/record/index.ts

Lines changed: 0 additions & 26 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
@@ -20,28 +19,3 @@ export interface RecordVO {
2019
export const getRecordPage = async (params) => {
2120
return await request.get({ url: `/point/record/page`, params })
2221
}
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 })
47-
}

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

Lines changed: 29 additions & 8 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" />
15+
</el-form-item>
16+
<el-form-item>
17+
<el-text class="mx-1" size="small" type="info">下单积分是否抵用订单金额</el-text>
1618
</el-form-item>
1719
<!-- TODO @xiaqing:用户看到的是元,最多 2 位;分是后端的存储哈 -->
18-
<el-form-item label="抵扣单位(分)" prop="tradeDeductUnitPrice">
20+
<el-form-item label="积分抵扣" prop="tradeDeductUnitPrice" class="item-bottom">
1921
<el-input-number
2022
v-model="formData.tradeDeductUnitPrice"
21-
placeholder="请输入抵扣单位(分)"
23+
placeholder="请输入积分抵扣金额"
2224
style="width: 300px"
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>
@@ -91,3 +106,9 @@ onMounted(() => {
91106
getConfig()
92107
})
93108
</script>
109+
110+
<style scoped>
111+
.item-bottom {
112+
margin-bottom: 0px;
113+
}
114+
</style>

src/views/member/point/record/RecordForm.vue

Lines changed: 0 additions & 180 deletions
This file was deleted.

src/views/member/point/record/index.vue

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
:inline="true"
99
label-width="68px"
1010
>
11-
<el-form-item label="业务编码" prop="bizId">
11+
<el-form-item label="用户" prop="nickName">
1212
<el-input
13-
v-model="queryParams.bizId"
14-
placeholder="请输入业务编码"
13+
v-model="queryParams.nickName"
14+
placeholder="请输入用户昵称"
1515
clearable
1616
@keyup.enter="handleQuery"
1717
class="!w-240px"
@@ -32,12 +32,6 @@
3232
/>
3333
</el-select>
3434
</el-form-item>
35-
<el-form-item label="操作类型" prop="type">
36-
<el-select v-model="queryParams.type" placeholder="操作类型" clearable class="!w-240px">
37-
<el-option label="增加" value="1" />
38-
<el-option label="扣减" value="0" />
39-
</el-select>
40-
</el-form-item>
4135
<el-form-item label="积分标题" prop="title">
4236
<el-input
4337
v-model="queryParams.title"
@@ -85,8 +79,7 @@
8579
<ContentWrap>
8680
<el-table v-loading="loading" :data="list">
8781
<el-table-column label="编号" align="center" prop="id" />
88-
<!-- TODO @xiaqing:展示用户的昵称哈; -->
89-
<el-table-column label="用户" align="center" prop="userId" />
82+
<el-table-column label="用户" align="center" prop="nickName" />
9083
<el-table-column label="积分标题" align="center" prop="title" />
9184
<el-table-column label="积分描述" align="center" prop="description" />
9285
<el-table-column
@@ -95,18 +88,14 @@
9588
prop="createDate"
9689
:formatter="dateFormatter"
9790
/>
98-
<!-- todo @xiaqing:可以参考 crmeb 的展示,把积分和增加减少放一起,用红色和绿色展示 -->
99-
<el-table-column
100-
label="操作类型"
101-
align="center"
102-
prop="type"
103-
:formatter="
104-
(_, __, c) => {
105-
return c === '1' ? '增加' : '扣减'
106-
}
107-
"
108-
/>
109-
<el-table-column label="积分" align="center" prop="point" />
91+
<el-table-column label="积分" align="center" prop="point">
92+
<template #default="scope">
93+
<el-tag v-if="scope.row.point > 0" class="ml-2" type="success" effect="dark">
94+
{{ scope.row.point }}
95+
</el-tag>
96+
<el-tag v-else class="ml-2" type="danger" effect="dark"> {{ scope.row.point }} </el-tag>
97+
</template>
98+
</el-table-column>
11099
<el-table-column label="变动后的积分" align="center" prop="totalPoint" />
111100
<el-table-column label="业务编码" align="center" prop="bizId" />
112101
<el-table-column label="业务类型" align="center" prop="bizType">
@@ -149,7 +138,6 @@
149138
import { DICT_TYPE, getStrDictOptions, getIntDictOptions } from '@/utils/dict'
150139
import { dateFormatter } from '@/utils/formatTime'
151140
import * as RecordApi from '@/api/point/record'
152-
import RecordForm from './RecordForm.vue'
153141
154142
defineOptions({ name: 'PointRecord' })
155143
@@ -159,7 +147,7 @@ const list = ref([]) // 列表的数据
159147
const queryParams = reactive({
160148
pageNo: 1,
161149
pageSize: 10,
162-
bizId: null,
150+
nickName: null,
163151
bizType: null,
164152
type: null,
165153
title: null,

0 commit comments

Comments
 (0)