Skip to content

Commit 1944402

Browse files
author
xiaqing
committed
会员积分和会员签到模块todo修改
1 parent f8a4df8 commit 1944402

File tree

8 files changed

+28
-30
lines changed

8 files changed

+28
-30
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ export interface RecordVO {
1717

1818
// 查询用户积分记录列表
1919
export const getRecordPage = async (params) => {
20-
return await request.get({ url: `/point/record/page`, params })
20+
return await request.get({ url: `/member/point/record/page`, params })
2121
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,30 @@ export interface SignInConfigVO {
44
id: number
55
day: number | null
66
point: number | null
7-
isEnable: boolean | null
7+
enable: boolean | null
88
}
99

1010
// 查询积分签到规则列表
1111
export const getSignInConfigPage = async () => {
12-
return await request.get({ url: `/point/sign-in-config/list` })
12+
return await request.get({ url: `/member/point/sign-in-config/list` })
1313
}
1414

1515
// 查询积分签到规则详情
1616
export const getSignInConfig = async (id: number) => {
17-
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 })
1818
}
1919

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

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

3030
// 删除积分签到规则
3131
export const deleteSignInConfig = async (id: number) => {
32-
return await request.delete({ url: `/point/sign-in-config/delete?id=` + id })
32+
return await request.delete({ url: `/member/point/sign-in-config/delete?id=` + id })
3333
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +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 })
12+
return await request.get({ url: `/member/point/sign-in-record/page`, params })
1313
}
1414

1515
// 导出用户签到积分 Excel
1616
export const exportSignInRecord = async (params) => {
17-
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 })
1818
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
:inline="true"
99
label-width="68px"
1010
>
11-
<el-form-item label="用户" prop="nickName">
11+
<el-form-item label="用户" prop="nickname">
1212
<el-input
13-
v-model="queryParams.nickName"
13+
v-model="queryParams.nickname"
1414
placeholder="请输入用户昵称"
1515
clearable
1616
@keyup.enter="handleQuery"
@@ -79,13 +79,13 @@
7979
<ContentWrap>
8080
<el-table v-loading="loading" :data="list">
8181
<el-table-column label="编号" align="center" prop="id" />
82-
<el-table-column label="用户" align="center" prop="nickName" />
82+
<el-table-column label="用户" align="center" prop="nickname" />
8383
<el-table-column label="积分标题" align="center" prop="title" />
8484
<el-table-column label="积分描述" align="center" prop="description" />
8585
<el-table-column
8686
label="获得时间"
8787
align="center"
88-
prop="createDate"
88+
prop="createTime"
8989
:formatter="dateFormatter"
9090
/>
9191
<el-table-column label="积分" align="center" prop="point">
@@ -147,7 +147,7 @@ const list = ref([]) // 列表的数据
147147
const queryParams = reactive({
148148
pageNo: 1,
149149
pageSize: 10,
150-
nickName: null,
150+
nickname: null,
151151
bizType: null,
152152
type: null,
153153
title: null,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ const submitForm = async () => {
7171
try {
7272
const data = formData.value as unknown as SignInConfigApi.SignInConfigVO
7373
if (formType.value === 'create') {
74+
//默认新创建的自动启动
75+
data.enable = true
7476
await SignInConfigApi.createSignInConfig(data)
7577
message.success(t('common.createSuccess'))
7678
} else {

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<template #default="scope">
2626
<div>
2727
<el-switch
28-
v-model="scope.row.isEnable"
29-
@change="handleSwitchChange(scope.row.id, $event)"
28+
v-model="scope.row.enable"
29+
@change="handleSwitchChange(scope.row, $event)"
3030
inline-prompt
3131
active-text="开启"
3232
inactive-text="关闭"
@@ -105,15 +105,11 @@ const handleDelete = async (id: number) => {
105105
} catch {}
106106
}
107107
108-
const handleSwitchChange = async (id, e) => {
109-
console.log('开关状态变更，id:', id, '新状态：', e)
108+
const handleSwitchChange = async (row, e) => {
109+
console.log('开关状态变更，id:', row, '新状态：', e)
110110
// 创建对象
111-
const signInConfig: SignInConfigVO = {
112-
id: id,
113-
day: null,
114-
point: null,
115-
isEnable: e
116-
}
111+
const signInConfig: SignInConfigVO = { enable: e }
112+
;({ id: signInConfig.id, day: signInConfig.day, point: signInConfig.point, enable: e } = row)
117113
await SignInConfigApi.updateSignInConfig(signInConfig)
118114
}
119115

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
:inline="true"
99
label-width="68px"
1010
>
11-
<el-form-item label="签到用户" prop="nickName">
11+
<el-form-item label="签到用户" prop="nickname">
1212
<el-input
13-
v-model="queryParams.nickName"
13+
v-model="queryParams.nickname"
1414
placeholder="请输入签到用户"
1515
clearable
1616
@keyup.enter="handleQuery"
@@ -58,7 +58,7 @@
5858
<el-table v-loading="loading" :data="list">
5959
<el-table-column label="编号" align="center" prop="id" />
6060
<!-- TODO @xiaqing：展示用户昵称 -->
61-
<el-table-column label="签到用户" align="center" prop="nickName" />
61+
<el-table-column label="签到用户" align="center" prop="nickname" />
6262
<el-table-column
6363
label="签到天数"
6464
align="center"
@@ -101,7 +101,7 @@ const list = ref([]) // 列表的数据
101101
const queryParams = reactive({
102102
pageNo: 1,
103103
pageSize: 10,
104-
nickName: null,
104+
nickname: null,
105105
day: null,
106106
createTime: []
107107
})

0 commit comments

Comments
 (0)