Skip to content

Commit 4571f89

Browse files
YunaiVYunaiV
committed
review 积分配置
1 parent 032d5a0 commit 4571f89

File tree

6 files changed

+38
-49
lines changed

6 files changed

+38
-49
lines changed

‎src/utils/dict.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,8 @@ export enum DICT_TYPE {
146146
MP_MESSAGE_TYPE = 'mp_message_type', // 消息类型
147147

148148
// ========== MALL - 会员模块 ==========
149-
// 积分模块 TODO 芋艿：改成 member_ 前缀；包括枚举和值；
150-
MEMBER_POINT_BIZ_TYPE = 'member_point_biz_type',
151-
MEMBER_POINT_STATUS = 'member_point_status',
149+
MEMBER_POINT_BIZ_TYPE = 'member_point_biz_type', // 积分的业务类型
150+
MEMBER_POINT_STATUS = 'member_point_status', // 积分的状态
152151

153152
// ========== MALL - 商品模块 ==========
154153
PRODUCT_UNIT = 'product_unit', // 商品单位

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
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积分抵多少金额)单位：元 -->
1314
<el-form-item label="积分抵扣" prop="tradeDeductEnable">
1415
<el-switch v-model="formData.tradeDeductEnable" />
1516
</el-form-item>
17+
<!-- TODO @xiaqing：用户看到的是元，最多 2 位；分是后端的存储哈 -->
1618
<el-form-item label="抵扣单位(分)" prop="tradeDeductUnitPrice">
1719
<el-input-number
1820
v-model="formData.tradeDeductUnitPrice"
@@ -27,10 +29,10 @@
2729
style="width: 300px"
2830
/>
2931
</el-form-item>
30-
<el-form-item label="1元赠送多少分" prop="tradeGivePoint">
32+
<el-form-item label="1 元赠送多少分" prop="tradeGivePoint">
3133
<el-input-number
3234
v-model="formData.tradeGivePoint"
33-
placeholder="请输入1元赠送多少积分"
35+
placeholder="请输入 1 元赠送多少积分"
3436
style="width: 300px"
3537
/>
3638
</el-form-item>
@@ -58,6 +60,7 @@ const formData = ref({
5860
const formRules = reactive({})
5961
const formRef = ref() // 表单 Ref
6062
63+
/** 修改积分配置 */
6164
const onSubmit = async () => {
6265
// 校验表单
6366
if (!formRef) return
@@ -75,13 +78,15 @@ const onSubmit = async () => {
7578
}
7679
}
7780
81+
/** 获得积分配置 */
7882
const getConfig = async () => {
7983
try {
8084
const data = await ConfigApi.getConfig()
8185
formData.value = data
8286
} finally {
8387
}
8488
}
89+
8590
onMounted(() => {
8691
getConfig()
8792
})

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ const submitForm = async () => {
157157
}
158158
}
159159
160+
// TODO @xiaqing：不需要更新操作哇？
160161
/** 重置表单 */
161162
const resetForm = () => {
162163
formData.value = {

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

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
/>
5858
</el-select>
5959
</el-form-item>
60-
<el-form-item label="发生时间" prop="createDate">
60+
<el-form-item label="获得时间" prop="createDate">
6161
<el-date-picker
6262
v-model="queryParams.createDate"
6363
value-format="YYYY-MM-DD HH:mm:ss"
@@ -78,13 +78,18 @@
7878
<!-- 列表 -->
7979
<ContentWrap>
8080
<el-table v-loading="loading" :data="list">
81-
<el-table-column label="序号" align="center" prop="id" />
82-
<el-table-column label="业务编码" align="center" prop="bizId" />
83-
<el-table-column label="业务类型" align="center" prop="bizType">
84-
<template #default="scope">
85-
<dict-tag :type="DICT_TYPE.MEMBER_POINT_BIZ_TYPE" :value="scope.row.bizType" />
86-
</template>
87-
</el-table-column>
81+
<el-table-column label="编号" align="center" prop="id" />
82+
<!-- TODO @xiaqing：展示用户的昵称哈； -->
83+
<el-table-column label="用户" align="center" prop="userId" />
84+
<el-table-column label="积分标题" align="center" prop="title" />
85+
<el-table-column label="积分描述" align="center" prop="description" />
86+
<el-table-column
87+
label="获得时间"
88+
align="center"
89+
prop="createDate"
90+
:formatter="dateFormatter"
91+
/>
92+
<!-- todo @xiaqing：可以参考 crmeb 的展示，把积分和增加减少放一起，用红色和绿色展示 -->
8893
<el-table-column
8994
label="操作类型"
9095
align="center"
@@ -95,16 +100,19 @@
95100
}
96101
"
97102
/>
98-
<el-table-column label="积分标题" align="center" prop="title" />
99-
<el-table-column label="积分描述" align="center" prop="description" />
100103
<el-table-column label="积分" align="center" prop="point" />
101104
<el-table-column label="变动后的积分" align="center" prop="totalPoint" />
105+
<el-table-column label="业务编码" align="center" prop="bizId" />
106+
<el-table-column label="业务类型" align="center" prop="bizType">
107+
<template #default="scope">
108+
<dict-tag :type="DICT_TYPE.MEMBER_POINT_BIZ_TYPE" :value="scope.row.bizType" />
109+
</template>
110+
</el-table-column>
102111
<el-table-column label="状态" align="center" prop="status">
103112
<template #default="scope">
104113
<dict-tag :type="DICT_TYPE.MEMBER_POINT_STATUS" :value="scope.row.status" />
105114
</template>
106115
</el-table-column>
107-
<el-table-column label="用户id" align="center" prop="userId" />
108116
<el-table-column
109117
label="冻结时间"
110118
align="center"
@@ -117,12 +125,6 @@
117125
prop="thawingTime"
118126
:formatter="dateFormatter"
119127
/>
120-
<el-table-column
121-
label="发生时间"
122-
align="center"
123-
prop="createDate"
124-
:formatter="dateFormatter"
125-
/>
126128
</el-table>
127129
<!-- 分页 -->
128130
<Pagination

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
:inline="true"
99
label-width="68px"
1010
>
11+
<!-- TODO @xiaqing：搜索可以去掉，因为一共就没几条配置哈 -->
1112
<el-form-item label="签到天数" prop="day">
1213
<el-input
1314
v-model="queryParams.day"
@@ -35,6 +36,7 @@
3536
:loading="exportLoading"
3637
v-hasPermi="['point:sign-in-config:export']"
3738
>
39+
<!-- TODO @xiaqing：四个功能的导出都可以去掉 -->
3840
<Icon icon="ep:download" class="mr-5px" /> 导出
3941
</el-button>
4042
</el-form-item>
@@ -44,15 +46,10 @@
4446
<!-- 列表 -->
4547
<ContentWrap>
4648
<el-table v-loading="loading" :data="list">
47-
<el-table-column label="序号" align="center" prop="id" v-if="false" />
49+
<!-- TODO @xiaqing：展示优化下，改成第 1 天、第 2 天这种 -->
4850
<el-table-column label="签到天数" align="center" prop="day" />
49-
<el-table-column label="签到分数" align="center" prop="point" />
50-
<el-table-column
51-
label="创建时间"
52-
align="center"
53-
prop="createTime"
54-
:formatter="dateFormatter"
55-
/>
51+
<el-table-column label="获得积分" align="center" prop="point" />
52+
<!-- TODO @xiaqing：展示一个是否开启 -->
5653
<el-table-column label="操作" align="center">
5754
<template #default="scope">
5855
<el-button
@@ -88,7 +85,6 @@
8885
</template>
8986

9087
<script lang="ts" setup>
91-
import { dateFormatter } from '@/utils/formatTime'
9288
import download from '@/utils/download'
9389
import * as SignInConfigApi from '@/api/point/signInConfig'
9490
import SignInConfigForm from './SignInConfigForm.vue'
@@ -109,6 +105,7 @@ const queryParams = reactive({
109105
const queryFormRef = ref() // 搜索的表单
110106
const exportLoading = ref(false) // 导出的加载中
111107
108+
// TODO @xiaqing：可以不分页；
112109
/** 查询列表 */
113110
const getList = async () => {
114111
loading.value = true

‎src/views/member/signin/record/index.vue

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,6 @@
4040
<el-form-item>
4141
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
4242
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
43-
<!-- <el-button-->
44-
<!-- type="primary"-->
45-
<!-- plain-->
46-
<!-- @click="openForm('create')"-->
47-
<!-- v-hasPermi="['point:sign-in-record:create']"-->
48-
<!-- >-->
49-
<!-- <Icon icon="ep:plus" class="mr-5px" /> 新增-->
50-
<!-- </el-button>-->
5143
<el-button
5244
type="success"
5345
plain
@@ -64,10 +56,11 @@
6456
<!-- 列表 -->
6557
<ContentWrap>
6658
<el-table v-loading="loading" :data="list">
67-
<el-table-column label="序号" align="center" prop="id" />
59+
<el-table-column label="编号" align="center" prop="id" />
60+
<!-- TODO @xiaqing：展示用户昵称 -->
6861
<el-table-column label="签到用户" align="center" prop="userId" />
6962
<el-table-column label="签到天数" align="center" prop="day" />
70-
<el-table-column label="签到的分数" align="center" prop="point" />
63+
<el-table-column label="获得积分" align="center" prop="point" />
7164
<el-table-column
7265
label="签到时间"
7366
align="center"
@@ -76,14 +69,6 @@
7669
/>
7770
<el-table-column label="操作" align="center">
7871
<template #default="scope">
79-
<!-- <el-button-->
80-
<!-- link-->
81-
<!-- type="primary"-->
82-
<!-- @click="openForm('update', scope.row.id)"-->
83-
<!-- v-hasPermi="['point:sign-in-record:update']"-->
84-
<!-- >-->
85-
<!-- 编辑-->
86-
<!-- </el-button>-->
8772
<el-button
8873
link
8974
type="danger"

0 commit comments

Comments
 (0)