Skip to content

Commit 0e2ea39

Browse files
YunaiVYunaiV
committed
code review：会员详情
1 parent 30f0c1b commit 0e2ea39

File tree

6 files changed

+41
-49
lines changed

6 files changed

+41
-49
lines changed

‎src/api/member/experience-record/index.ts

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,3 @@ export const getExperienceRecordPage = async (params) => {
2020
export const getExperienceRecord = async (id: number) => {
2121
return await request.get({ url: `/member/experience-record/get?id=` + id })
2222
}
23-
24-
// 新增会员经验记录
25-
export const createExperienceRecord = async (data: ExperienceRecordVO) => {
26-
return await request.post({ url: `/member/experience-record/create`, data })
27-
}
28-
29-
// 修改会员经验记录
30-
export const updateExperienceRecord = async (data: ExperienceRecordVO) => {
31-
return await request.put({ url: `/member/experience-record/update`, data })
32-
}
33-
34-
// 删除会员经验记录
35-
export const deleteExperienceRecord = async (id: number) => {
36-
return await request.delete({ url: `/member/experience-record/delete?id=` + id })
37-
}
38-
39-
// 导出会员经验记录 Excel
40-
export const exportExperienceRecord = async (params) => {
41-
return await request.download({ url: `/member/experience-record/export-excel`, params })
42-
}

‎src/utils/dict.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export enum DICT_TYPE {
138138
BPM_OA_LEAVE_TYPE = 'bpm_oa_leave_type',
139139

140140
// ========== PAY 模块 ==========
141-
PAY_CHANNEL_CODE = 'pay_channel_code_type', // 支付渠道编码类型
141+
PAY_CHANNEL_CODE = 'pay_channel_code', // 支付渠道编码类型
142142
PAY_ORDER_STATUS = 'pay_order_status', // 商户支付订单状态
143143
PAY_REFUND_STATUS = 'pay_refund_status', // 退款订单状态
144144
PAY_NOTIFY_STATUS = 'pay_notify_status', // 商户支付回调状态

‎src/views/mall/trade/order/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@
267267
<template #default>
268268
<!-- TODO 权限后续补齐 -->
269269
<div class="flex justify-center items-center">
270-
<el-button link type="primary" @click="openForm(scope.row.id)">
270+
<el-button link type="primary" @click="openDetail(scope.row.id)">
271271
<Icon icon="ep:notification" />
272272
详情
273273
</el-button>
@@ -445,7 +445,7 @@ const imagePreview = (imgUrl: string) => {
445445
}
446446
447447
/** 查看订单详情 */
448-
const openForm = (id: number) => {
448+
const openDetail = (id: number) => {
449449
push({ name: 'TradeOrderDetail', params: { orderId: id } })
450450
}
451451

‎src/views/member/user/detail/UserExperienceRecord.vue renamed to ‎src/views/member/user/detail/UserExperienceRecordList.vue

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,12 @@
5454
<ContentWrap>
5555
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
5656
<el-table-column label="编号" align="center" prop="id" width="150px" />
57-
<el-table-column label="业务编号" align="center" prop="bizId" width="150px">
58-
<!-- TODO 芋艿：此处应创建对应的字典 -->
59-
<template #default="scope">
60-
<dict-tag :type="DICT_TYPE.MEMBER_EXPERIENCE_BIZ_ID" :value="scope.row.bizId" />
61-
</template>
62-
</el-table-column>
63-
<el-table-column label="业务类型" align="center" prop="bizType" width="150px">
64-
<template #default="scope">
65-
<dict-tag :type="DICT_TYPE.MEMBER_EXPERIENCE_BIZ_TYPE" :value="scope.row.bizType" />
66-
</template>
67-
</el-table-column>
68-
<el-table-column label="标题" align="center" prop="title" width="150px" />
69-
<el-table-column label="描述" align="center" prop="description" />
57+
<el-table-column
58+
label="获得时间"
59+
align="center"
60+
prop="createTime"
61+
:formatter="dateFormatter"
62+
/>
7063
<el-table-column label="经验" align="center" prop="experience" width="150px">
7164
<template #default="scope">
7265
<el-tag v-if="scope.row.experience > 0" class="ml-2" type="success" effect="dark">
@@ -77,19 +70,22 @@
7770
</el-tag>
7871
</template>
7972
</el-table-column>
80-
<el-table-column label="变更后的经验" align="center" prop="totalExperience" width="150px">
73+
<el-table-column label="总经验" align="center" prop="totalExperience" width="150px">
8174
<template #default="scope">
8275
<el-tag class="ml-2" effect="dark">
8376
{{ scope.row.totalExperience }}
8477
</el-tag>
8578
</template>
8679
</el-table-column>
87-
<el-table-column
88-
label="创建时间"
89-
align="center"
90-
prop="createTime"
91-
:formatter="dateFormatter"
92-
/>
80+
<el-table-column label="标题" align="center" prop="title" width="150px" />
81+
<el-table-column label="描述" align="center" prop="description" />
82+
<el-table-column label="业务编号" align="center" prop="bizId" width="150px" />
83+
<el-table-column label="业务类型" align="center" prop="bizType" width="150px">
84+
<!-- TODO 芋艿：此处应创建对应的字典 -->
85+
<template #default="scope">
86+
<dict-tag :type="DICT_TYPE.MEMBER_EXPERIENCE_BIZ_TYPE" :value="scope.row.bizType" />
87+
</template>
88+
</el-table-column>
9389
</el-table>
9490
<!-- 分页 -->
9591
<Pagination
@@ -106,7 +102,7 @@ import { dateFormatter } from '@/utils/formatTime'
106102
import * as ExperienceRecordApi from '@/api/member/experience-record/index'
107103
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
108104
109-
defineOptions({ name: 'UserExperienceRecord' })
105+
defineOptions({ name: 'UserExperienceRecordList' })
110106
111107
const loading = ref(true) // 列表的加载中
112108
const total = ref(0) // 列表的总页数

‎src/views/member/user/detail/UserOrder.vue renamed to ‎src/views/member/user/detail/UserOrderList.vue

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
<el-table v-loading="loading" :data="list">
140140
<el-table-column class-name="order-table-col">
141141
<template #header>
142-
<!-- TODO @phui999：小屏幕下，会有偏移，后续看看 -->
142+
<!-- TODO @puhui999：小屏幕下，会有偏移，后续看看 -->
143143
<div class="flex items-center" style="width: 100%">
144144
<div class="ml-100px mr-200px">商品信息</div>
145145
<div class="mr-60px">单价(元)/数量</div>
@@ -263,6 +263,14 @@
263263
<dict-tag :type="DICT_TYPE.TRADE_ORDER_STATUS" :value="scope.row.status" />
264264
</template>
265265
</el-table-column>
266+
<el-table-column align="center" fixed="right" label="操作" width="160">
267+
<template #default>
268+
<el-button link type="primary" @click="openDetail(scope.row.id)">
269+
<Icon icon="ep:notification" />
270+
详情
271+
</el-button>
272+
</template>
273+
</el-table-column>
266274
</el-table>
267275
</template>
268276
</el-table-column>
@@ -287,6 +295,8 @@ import { createImageViewer } from '@/components/ImageViewer'
287295
import * as TradeOrderApi from '@/api/mall/trade/order'
288296
import { FormInstance, TableColumnCtx } from 'element-plus'
289297
298+
const { push } = useRouter() // 路由跳转
299+
290300
const { userId }: { userId: number } = defineProps({
291301
userId: {
292302
type: Number,
@@ -376,6 +386,12 @@ const spanMethod = ({ row, rowIndex, columnIndex }: SpanMethodProps) => {
376386
}
377387
}
378388
}
389+
390+
/** 查看订单详情 */
391+
const openDetail = (id: number) => {
392+
push({ name: 'TradeOrderDetail', params: { orderId: id } })
393+
}
394+
379395
/** 初始化 **/
380396
onMounted(async () => {
381397
queryParams.userId = userId

‎src/views/member/user/detail/index.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@
3737
<UserSignList :user-id="id" />
3838
</el-tab-pane>
3939
<el-tab-pane label="成长值" name="experience" lazy>
40-
<UserExperienceRecord :user-id="id"
40+
<UserExperienceRecordList :user-id="id"
4141
/></el-tab-pane>
4242
<el-tab-pane label="余额" name="fourth">余额(WIP)</el-tab-pane>
4343
<el-tab-pane label="收货地址" name="address" lazy>
4444
<UserAddressList :user-id="id" />
4545
</el-tab-pane>
4646
<el-tab-pane label="订单管理" name="order" lazy>
47-
<UserOrder :user-id="id" />
47+
<UserOrderList :user-id="id" />
4848
</el-tab-pane>
4949
<el-tab-pane label="售后管理" name="fourth">售后管理(WIP)</el-tab-pane>
5050
<el-tab-pane label="收藏记录" name="fourth">收藏记录(WIP)</el-tab-pane>
@@ -66,9 +66,9 @@ import UserAccountInfo from './UserAccountInfo.vue'
6666
import UserAddressList from './UserAddressList.vue'
6767
import UserPointList from './UserPointList.vue'
6868
import UserSignList from './UserSignList.vue'
69-
import UserExperienceRecord from './UserExperienceRecord.vue'
69+
import UserExperienceRecordList from './UserExperienceRecordList.vue'
7070
import { CardTitle } from '@/components/Card/index'
71-
import UserOrder from '@/views/member/user/detail/UserOrder.vue'
71+
import UserOrderList from '@/views/member/user/detail/UserOrderList.vue'
7272
7373
defineOptions({ name: 'MemberDetail' })
7474

0 commit comments

Comments
 (0)