Skip to content

Commit 620a200

Browse files
dhb52dhb52
committed
fix: 支付管理/退款订单 对标 vue2
1 parent 19cad3b commit 620a200

File tree

4 files changed

+139
-197
lines changed

4 files changed

+139
-197
lines changed

‎src/utils/dict.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,8 @@ export enum DICT_TYPE {
131131

132132
// ========== PAY 模块 ==========
133133
PAY_CHANNEL_CODE = 'pay_channel_code', // 支付渠道编码类型
134-
PAY_CHANNEL_CODE_TYPE = 'pay_channel_code_type', // 支付渠道编码类型
135134
PAY_ORDER_STATUS = 'pay_order_status', // 商户支付订单状态
136-
PAY_ORDER_REFUND_STATUS = 'pay_order_refund_status', // 商户支付订单退款状态
137-
PAY_REFUND_ORDER_STATUS = 'pay_refund_order_status', // 退款订单状态
138-
PAY_REFUND_ORDER_TYPE = 'pay_refund_order_type', // 退款订单类别
139-
135+
PAY_REFUND_STATUS = 'pay_refund_status', // 退款订单状态
140136
PAY_NOTIFY_STATUS = 'pay_notify_status', // 商户支付回调状态
141137
PAY_NOTIFY_TYPE = 'pay_notify_type', // 商户支付回调状态
142138

‎src/views/pay/app/index.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ const queryParams = reactive({
326326
createTime: []
327327
})
328328
const queryFormRef = ref() // 搜索的表单
329-
const exportLoading = ref(false) // 导出的加载中
330329
331330
/** 查询列表 */
332331
const getList = async () => {

‎src/views/pay/refund/RefundDetail.vue

Lines changed: 62 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,81 @@
11
<template>
2-
<Dialog v-model="dialogVisible" title="详情" width="50%">
3-
<el-descriptions :column="2">
4-
<el-descriptions-item label="商户名称">{{ detailData.merchantName }}</el-descriptions-item>
5-
<el-descriptions-item label="应用名称">{{ detailData.appName }}</el-descriptions-item>
6-
<el-descriptions-item label="商品名称">{{ detailData.subject }}</el-descriptions-item>
7-
</el-descriptions>
8-
<el-divider />
9-
<el-descriptions :column="2">
2+
<Dialog v-model="dialogVisible" title="详情" width="700px">
3+
<el-descriptions :column="2" label-class-name="desc-label">
104
<el-descriptions-item label="商户退款单号">
11-
<el-tag>{{ detailData.merchantRefundNo }}</el-tag>
5+
<el-tag size="small">{{ refundDetail.merchantRefundId }}</el-tag>
126
</el-descriptions-item>
13-
<el-descriptions-item label="商户订单号">
14-
{{ detailData.merchantOrderId }}
7+
<el-descriptions-item label="渠道退款单号">
8+
<el-tag type="success" size="small" v-if="refundDetail.channelRefundNo">{{
9+
refundDetail.channelRefundNo
10+
}}</el-tag>
1511
</el-descriptions-item>
16-
<el-descriptions-item label="交易订单号">{{ detailData.tradeNo }}</el-descriptions-item>
1712
</el-descriptions>
18-
<el-divider />
19-
<el-descriptions :column="2">
13+
<el-descriptions :column="2" label-class-name="desc-label">
14+
<el-descriptions-item label="商户支付单号">
15+
<el-tag size="small">{{ refundDetail.merchantOrderId }}</el-tag>
16+
</el-descriptions-item>
17+
<el-descriptions-item label="渠道支付单号">
18+
<el-tag type="success" size="small">{{ refundDetail.channelOrderNo }}</el-tag>
19+
</el-descriptions-item>
20+
</el-descriptions>
21+
<el-descriptions :column="2" label-class-name="desc-label">
22+
<el-descriptions-item label="应用编号">{{ refundDetail.appId }}</el-descriptions-item>
23+
<el-descriptions-item label="应用名称">{{ refundDetail.appName }}</el-descriptions-item>
24+
</el-descriptions>
25+
<el-descriptions :column="2" label-class-name="desc-label">
2026
<el-descriptions-item label="支付金额">
21-
<el-tag type="success">￥{{ parseFloat(detailData.payAmount / 100, 2).toFixed(2) }}</el-tag>
27+
<el-tag type="success" size="small"
28+
>￥{{ (refundDetail.payPrice / 100.0).toFixed(2) }}</el-tag
29+
>
2230
</el-descriptions-item>
2331
<el-descriptions-item label="退款金额">
24-
<el-tag class="tag-purple">
25-
￥{{ parseFloat(detailData.refundAmount / 100).toFixed(2) }}
26-
</el-tag>
27-
</el-descriptions-item>
28-
<el-descriptions-item label="退款类型">
29-
<dict-tag :type="DICT_TYPE.PAY_REFUND_ORDER_TYPE" :value="detailData.type" />
32+
<el-tag size="mini" type="danger"
33+
>￥{{ (refundDetail.refundPrice / 100.0).toFixed(2) }}</el-tag
34+
>
3035
</el-descriptions-item>
36+
</el-descriptions>
37+
<el-descriptions :column="2" label-class-name="desc-label">
3138
<el-descriptions-item label="退款状态">
32-
<dict-tag :type="DICT_TYPE.PAY_REFUND_ORDER_STATUS" :value="detailData.status" />
33-
</el-descriptions-item>
34-
<el-descriptions-item label="创建时间">
35-
{{ formatDate(detailData.createTime) }}
36-
</el-descriptions-item>
37-
<el-descriptions-item label="退款成功时间">
38-
{{ formatDate(detailData.successTime) }}
39-
</el-descriptions-item>
40-
<el-descriptions-item label="退款失效时间">
41-
{{ formatDate(detailData.expireTime) }}
42-
</el-descriptions-item>
43-
<el-descriptions-item label="更新时间">
44-
{{ formatDate(detailData.updateTime) }}
39+
<dict-tag :type="DICT_TYPE.PAY_REFUND_STATUS" :value="refundDetail.status" />
4540
</el-descriptions-item>
41+
<el-descriptions-item label="退款时间">{{
42+
formatDate(refundDetail.successTime)
43+
}}</el-descriptions-item>
44+
</el-descriptions>
45+
<el-descriptions :column="2" label-class-name="desc-label">
46+
<el-descriptions-item label="创建时间">{{
47+
formatDate(refundDetail.createTime)
48+
}}</el-descriptions-item>
49+
<el-descriptions-item label="更新时间">{{
50+
formatDate(refundDetail.updateTime)
51+
}}</el-descriptions-item>
4652
</el-descriptions>
53+
<!-- 分割线 -->
4754
<el-divider />
48-
<el-descriptions :column="2">
49-
<el-descriptions-item label="支付渠道">
50-
{{ detailData.channelCodeName }}
51-
</el-descriptions-item>
52-
<el-descriptions-item label="支付 IP">
53-
{{ detailData.userIp }}
54-
</el-descriptions-item>
55-
<el-descriptions-item label="回调地址">{{ detailData.notifyUrl }}</el-descriptions-item>
56-
<el-descriptions-item label="回调状态">
57-
<dict-tag :type="DICT_TYPE.PAY_ORDER_NOTIFY_STATUS" :value="detailData.notifyStatus" />
58-
</el-descriptions-item>
59-
<el-descriptions-item label="回调时间">
60-
{{ formatDate(detailData.notifyTime) }}
55+
<el-descriptions :column="2" label-class-name="desc-label">
56+
<el-descriptions-item label="退款渠道">
57+
<dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="refundDetail.channelCode" />
6158
</el-descriptions-item>
59+
<el-descriptions-item label="退款原因">{{ refundDetail.reason }}</el-descriptions-item>
6260
</el-descriptions>
61+
<el-descriptions :column="2" label-class-name="desc-label">
62+
<el-descriptions-item label="退款 IP">{{ refundDetail.userIp }}</el-descriptions-item>
63+
<el-descriptions-item label="通知 URL">{{ refundDetail.notifyUrl }}</el-descriptions-item>
64+
</el-descriptions>
65+
<!-- 分割线 -->
6366
<el-divider />
64-
<el-descriptions :column="2">
65-
<el-descriptions-item label="渠道订单号">
66-
{{ detailData.channelOrderNo }}
67-
</el-descriptions-item>
68-
<el-descriptions-item label="渠道退款单号">
69-
{{ detailData.channelRefundNo }}
70-
</el-descriptions-item>
71-
<el-descriptions-item label="渠道错误码">
72-
{{ detailData.channelErrorCode }}
73-
</el-descriptions-item>
74-
<el-descriptions-item label="渠道错误码描述">
75-
{{ detailData.channelErrorMsg }}
76-
</el-descriptions-item>
67+
<el-descriptions :column="2" label-class-name="desc-label">
68+
<el-descriptions-item label="渠道错误码">{{
69+
refundDetail.channelErrorCode
70+
}}</el-descriptions-item>
71+
<el-descriptions-item label="渠道错误码描述">{{
72+
refundDetail.channelErrorMsg
73+
}}</el-descriptions-item>
7774
</el-descriptions>
78-
<br />
79-
<el-descriptions :column="1" border direction="vertical">
80-
<el-descriptions-item label="渠道额外参数">
81-
{{ detailData.channelExtras }}
75+
<el-descriptions :column="1" label-class-name="desc-label" direction="vertical" border>
76+
<el-descriptions-item label="支付通道异步回调内容">
77+
{{ refundDetail.channelNotifyData }}
8278
</el-descriptions-item>
83-
<el-descriptions-item label="退款原因">{{ detailData.reason }}</el-descriptions-item>
8479
</el-descriptions>
8580
</Dialog>
8681
</template>
@@ -93,15 +88,15 @@ defineOptions({ name: 'PayRefundDetail' })
9388
9489
const dialogVisible = ref(false) // 弹窗的是否展示
9590
const detailLoading = ref(false) // 表单的加载中
96-
const detailData = ref({})
91+
const refundDetail = ref({})
9792
9893
/** 打开弹窗 */
9994
const open = async (id: number) => {
10095
dialogVisible.value = true
10196
// 设置数据
10297
detailLoading.value = true
10398
try {
104-
detailData.value = await RefundApi.getRefund(id)
99+
refundDetail.value = await RefundApi.getRefund(id)
105100
} finally {
106101
detailLoading.value = false
107102
}

0 commit comments

Comments
 (0)