Skip to content

Commit 55772cb

Browse files
committed
code review:用户详情
1 parent 746bf86 commit 55772cb

File tree

12 files changed

+117
-70
lines changed

12 files changed

+117
-70
lines changed

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,9 @@ export interface RecordVO {
88
description: string
99
point: number
1010
totalPoint: number
11-
status: number
1211
userId: number
13-
freezingTime: Date
14-
thawingTime: Date
1512
createDate: Date
1613
}
17-
export interface RecordQueryVO {
18-
bizType: string | null | undefined
19-
title: string | null | undefined
20-
pageNo: number
21-
pageSize: number
22-
userId: number | null | undefined
23-
createDate: string[]
24-
}
2514

2615
// 查询用户积分记录列表
2716
export const getRecordPage = async (params) => {

src/api/member/signin/record/index.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@ export interface SignInRecordVO {
66
day: number
77
point: number
88
}
9-
export interface SignInRecordQueryVO {
10-
pageNo: number
11-
pageSize: number
12-
userId?: number
13-
nickname: number | undefined | null
14-
day?: number | null | undefined
15-
point?: number | null | undefined
16-
createTime: string[] | null | undefined
17-
}
189

1910
// 查询用户签到积分列表
2011
export const getSignInRecordPage = async (params) => {

src/api/member/user/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ export interface UserVO {
1717
mark: string
1818
createTime: Date
1919
}
20+
21+
// TODO @梦:和 UserVO 搞成一个把。
2022
export interface UserBaseInfoVO {
2123
id: number | undefined | null
2224
mobile: string
@@ -34,6 +36,7 @@ export interface UserBaseInfoVO {
3436
mark: string | null | undefined
3537
createTime: Date | null | undefined
3638
}
39+
3740
// 查询会员用户列表
3841
export const getUserPage = async (params) => {
3942
return await request.get({ url: `/member/user/page`, params })

src/router/modules/remaining.ts

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
347347
]
348348
},
349349
{
350-
path: '/property',
350+
path: '/property', // TODO @puhui999:这里的 path 有问题,应该是 /product/property
351351
component: Layout,
352352
name: 'Property',
353353
meta: {
@@ -427,6 +427,24 @@ const remainingRouter: AppRouteRecordRaw[] = [
427427
}
428428
]
429429
},
430+
{
431+
path: '/member',
432+
component: Layout,
433+
name: 'member',
434+
meta: { hidden: true },
435+
children: [
436+
{
437+
path: 'user/detail',
438+
name: 'MemberUserDetail',
439+
meta: {
440+
title: '会员详情',
441+
noCache: true,
442+
hidden: true
443+
},
444+
component: () => import('@/views/member/user/detail/index.vue')
445+
}
446+
]
447+
},
430448
{
431449
path: '/pay',
432450
component: Layout,

src/views/member/user/components/account-info.vue

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,52 @@
11
<template>
22
<el-descriptions :column="2">
3+
<!-- TODO @梦:要不 icon 也给加下? -->
4+
<!-- TODO @梦:积分、成长值、等级,已经可以读取了,可以看下 -->
35
<el-descriptions-item>
46
<template #label>
5-
<div class="cell-item"> 储值余额 </div>
7+
<div class="cell-item"> 等级 </div>
68
</template>
79
{{ 0 }}
810
</el-descriptions-item>
911
<el-descriptions-item>
1012
<template #label>
11-
<div class="cell-item"> 现金余额 </div>
13+
<div class="cell-item"> 成长值 </div>
1214
</template>
1315
{{ 0 }}
1416
</el-descriptions-item>
1517
<el-descriptions-item>
1618
<template #label>
17-
<div class="cell-item"> 积分 </div>
19+
<div class="cell-item"> 当前积分 </div>
1820
</template>
1921
{{ 0 }}
2022
</el-descriptions-item>
2123
<el-descriptions-item>
2224
<template #label>
23-
<div class="cell-item"> 成长值 </div>
25+
<div class="cell-item"> 总积分 </div>
26+
</template>
27+
{{ 0 }}
28+
</el-descriptions-item>
29+
<el-descriptions-item>
30+
<template #label>
31+
<div class="cell-item"> 当前余额 </div>
32+
</template>
33+
{{ 0 }}
34+
</el-descriptions-item>
35+
<el-descriptions-item>
36+
<template #label>
37+
<div class="cell-item"> 支出金额 </div>
38+
</template>
39+
{{ 0 }}
40+
</el-descriptions-item>
41+
<el-descriptions-item>
42+
<template #label>
43+
<div class="cell-item"> 充值金额 </div>
2444
</template>
2545
{{ 0 }}
2646
</el-descriptions-item>
2747
</el-descriptions>
2848
</template>
2949
<script lang="ts" setup>
30-
import { defineComponent } from 'vue'
31-
3250
defineComponent({
3351
name: 'AccountInfo'
3452
})

src/views/member/user/components/address-list.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export default defineComponent({
66
})
77
</script>
88

9+
<!-- TODO @梦:可以读 address 表 -->
910
<template>
1011
<div>收货地址列表</div>
1112
</template>

src/views/member/user/components/balance-list.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export default defineComponent({
66
})
77
</script>
88

9+
<!-- TODO @芋艿:未来实现,等周建的 -->
910
<template>
1011
<div>余额列表</div>
1112
</template>

src/views/member/user/components/card-title.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<script lang="ts" setup>
2-
import { defineComponent } from 'vue'
32
defineComponent({
43
name: 'CardTitle'
54
})
5+
66
const { title } = defineProps({
77
title: {
88
type: String,

src/views/member/user/components/growth-list.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export default defineComponent({
66
})
77
</script>
88

9+
<!-- TODO @梦:可以读取 member_experience_log 表 -->
910
<template>
1011
<div>成长值列表</div>
1112
</template>

src/views/member/user/components/point-list.vue

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@
100100
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
101101
import { dateFormatter } from '@/utils/formatTime'
102102
import * as RecordApi from '@/api//member/point/record'
103-
import { RecordQueryVO } from '@/api//member/point/record'
104103
105104
defineOptions({ name: 'PointList' })
105+
106106
const loading = ref(true) // 列表的加载中
107107
const total = ref(0) // 列表的总页数
108108
const list = ref([]) // 列表的数据
109-
const queryParams = reactive<RecordQueryVO>({
109+
const queryParams = reactive({
110110
pageNo: 1,
111111
pageSize: 10,
112112
bizType: undefined,
@@ -139,12 +139,15 @@ const resetQuery = () => {
139139
queryFormRef.value.resetFields()
140140
handleQuery()
141141
}
142+
143+
// TODO @梦:改成 userId 哈
142144
const { memberId } = defineProps({
143145
memberId: {
144146
type: Number,
145147
required: true
146148
}
147149
})
150+
148151
/** 初始化 **/
149152
onMounted(() => {
150153
queryParams.userId = memberId

0 commit comments

Comments
 (0)