Skip to content

Commit c3a8479

Browse files
committed
支付退款列表的 review
1 parent 3f90ca3 commit c3a8479

File tree

3 files changed

+22
-52
lines changed

3 files changed

+22
-52
lines changed

src/views/pay/order/OrderDetail.vue

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,14 @@
77
<el-descriptions-item label="支付单号">
88
<el-tag type="warning" size="small" v-if="detailData.no">{{ detailData.no }}</el-tag>
99
</el-descriptions-item>
10-
1110
<el-descriptions-item label="应用编号">{{ detailData.appId }}</el-descriptions-item>
1211
<el-descriptions-item label="应用名称">{{ detailData.appName }}</el-descriptions-item>
13-
1412
<el-descriptions-item label="支付状态">
1513
<dict-tag :type="DICT_TYPE.PAY_ORDER_STATUS" :value="detailData.status" size="small" />
1614
</el-descriptions-item>
1715
<el-descriptions-item label="支付金额">
1816
<el-tag type="success" size="small">¥{{ (detailData.price / 100.0).toFixed(2) }}</el-tag>
1917
</el-descriptions-item>
20-
2118
<el-descriptions-item label="手续费">
2219
<el-tag type="warning" size="small">
2320
¥{{ (detailData.channelFeePrice / 100.0).toFixed(2) }}
@@ -26,52 +23,43 @@
2623
<el-descriptions-item label="手续费比例">
2724
{{ (detailData.channelFeeRate / 100.0).toFixed(2) }}%
2825
</el-descriptions-item>
29-
3026
<el-descriptions-item label="支付时间">
3127
{{ formatDate(detailData.successTime) }}
3228
</el-descriptions-item>
3329
<el-descriptions-item label="失效时间">
3430
{{ formatDate(detailData.expireTime) }}
3531
</el-descriptions-item>
36-
3732
<el-descriptions-item label="创建时间">
3833
{{ formatDate(detailData.createTime) }}
3934
</el-descriptions-item>
4035
<el-descriptions-item label="更新时间">
4136
{{ formatDate(detailData.updateTime) }}
4237
</el-descriptions-item>
4338
</el-descriptions>
44-
4539
<!-- 分割线 -->
4640
<el-divider />
47-
4841
<el-descriptions :column="2" label-class-name="desc-label">
4942
<el-descriptions-item label="商品标题">{{ detailData.subject }}</el-descriptions-item>
5043
<el-descriptions-item label="商品描述">{{ detailData.body }}</el-descriptions-item>
51-
5244
<el-descriptions-item label="支付渠道">
5345
<dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="detailData.channelCode" />
5446
</el-descriptions-item>
5547
<el-descriptions-item label="支付 IP">{{ detailData.userIp }}</el-descriptions-item>
56-
5748
<el-descriptions-item label="渠道单号">
5849
<el-tag size="mini" type="success" v-if="detailData.channelOrderNo">
5950
{{ detailData.channelOrderNo }}
6051
</el-tag>
6152
</el-descriptions-item>
6253
<el-descriptions-item label="渠道用户">{{ detailData.channelUserId }}</el-descriptions-item>
63-
6454
<el-descriptions-item label="退款金额">
6555
<el-tag size="mini" type="danger">
6656
¥{{ (detailData.refundPrice / 100.0).toFixed(2) }}
6757
</el-tag>
6858
</el-descriptions-item>
6959
<el-descriptions-item label="通知 URL">{{ detailData.notifyUrl }}</el-descriptions-item>
7060
</el-descriptions>
71-
7261
<!-- 分割线 -->
7362
<el-divider />
74-
7563
<el-descriptions :column="1" label-class-name="desc-label" direction="vertical" border>
7664
<el-descriptions-item label="支付通道异步回调内容">
7765
{{ detailData.extension.channelNotifyData }}

src/views/pay/refund/RefundDetail.vue

Lines changed: 21 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,68 +9,57 @@
99
refundDetail.channelRefundNo
1010
}}</el-tag>
1111
</el-descriptions-item>
12-
1312
<el-descriptions-item label="商户支付单号">
1413
<el-tag size="small">{{ refundDetail.merchantOrderId }}</el-tag>
1514
</el-descriptions-item>
1615
<el-descriptions-item label="渠道支付单号">
1716
<el-tag type="success" size="small">{{ refundDetail.channelOrderNo }}</el-tag>
1817
</el-descriptions-item>
19-
2018
<el-descriptions-item label="应用编号">{{ refundDetail.appId }}</el-descriptions-item>
2119
<el-descriptions-item label="应用名称">{{ refundDetail.appName }}</el-descriptions-item>
22-
2320
<el-descriptions-item label="支付金额">
24-
<el-tag type="success" size="small"
25-
>¥{{ (refundDetail.payPrice / 100.0).toFixed(2) }}</el-tag
26-
>
21+
<el-tag type="success" size="small">
22+
¥{{ (refundDetail.payPrice / 100.0).toFixed(2) }}
23+
</el-tag>
2724
</el-descriptions-item>
2825
<el-descriptions-item label="退款金额">
29-
<el-tag size="mini" type="danger"
30-
>¥{{ (refundDetail.refundPrice / 100.0).toFixed(2) }}</el-tag
31-
>
26+
<el-tag size="mini" type="danger">
27+
¥{{ (refundDetail.refundPrice / 100.0).toFixed(2) }}
28+
</el-tag>
3229
</el-descriptions-item>
33-
3430
<el-descriptions-item label="退款状态">
3531
<dict-tag :type="DICT_TYPE.PAY_REFUND_STATUS" :value="refundDetail.status" />
3632
</el-descriptions-item>
37-
<el-descriptions-item label="退款时间">{{
38-
formatDate(refundDetail.successTime)
39-
}}</el-descriptions-item>
40-
41-
<el-descriptions-item label="创建时间">{{
42-
formatDate(refundDetail.createTime)
43-
}}</el-descriptions-item>
44-
<el-descriptions-item label="更新时间">{{
45-
formatDate(refundDetail.updateTime)
46-
}}</el-descriptions-item>
33+
<el-descriptions-item label="退款时间">
34+
{{ formatDate(refundDetail.successTime) }}
35+
</el-descriptions-item>
36+
<el-descriptions-item label="创建时间">
37+
{{ formatDate(refundDetail.createTime) }}
38+
</el-descriptions-item>
39+
<el-descriptions-item label="更新时间">
40+
{{ formatDate(refundDetail.updateTime) }}
41+
</el-descriptions-item>
4742
</el-descriptions>
48-
4943
<!-- 分割线 -->
5044
<el-divider />
51-
5245
<el-descriptions :column="2" label-class-name="desc-label">
5346
<el-descriptions-item label="退款渠道">
5447
<dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="refundDetail.channelCode" />
5548
</el-descriptions-item>
5649
<el-descriptions-item label="退款原因">{{ refundDetail.reason }}</el-descriptions-item>
57-
5850
<el-descriptions-item label="退款 IP">{{ refundDetail.userIp }}</el-descriptions-item>
5951
<el-descriptions-item label="通知 URL">{{ refundDetail.notifyUrl }}</el-descriptions-item>
6052
</el-descriptions>
61-
6253
<!-- 分割线 -->
6354
<el-divider />
64-
6555
<el-descriptions :column="2" label-class-name="desc-label">
66-
<el-descriptions-item label="渠道错误码">{{
67-
refundDetail.channelErrorCode
68-
}}</el-descriptions-item>
69-
<el-descriptions-item label="渠道错误码描述">{{
70-
refundDetail.channelErrorMsg
71-
}}</el-descriptions-item>
56+
<el-descriptions-item label="渠道错误码">
57+
{{ refundDetail.channelErrorCode }}
58+
</el-descriptions-item>
59+
<el-descriptions-item label="渠道错误码描述">
60+
{{ refundDetail.channelErrorMsg }}
61+
</el-descriptions-item>
7262
</el-descriptions>
73-
7463
<el-descriptions :column="1" label-class-name="desc-label" direction="vertical" border>
7564
<el-descriptions-item label="支付通道异步回调内容">
7665
{{ refundDetail.channelNotifyData }}
@@ -102,10 +91,3 @@ const open = async (id: number) => {
10291
}
10392
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
10493
</script>
105-
<style>
106-
.tag-purple {
107-
color: #722ed1;
108-
background: #f9f0ff;
109-
border-color: #d3adf7;
110-
}
111-
</style>

src/views/pay/refund/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
</el-form>
114114
</ContentWrap>
115115

116+
<!-- 列表 -->
116117
<ContentWrap>
117118
<el-table v-loading="loading" :data="list">
118119
<el-table-column label="编号" align="center" prop="id" />
@@ -289,7 +290,6 @@ onMounted(async () => {
289290
appList.value = await AppApi.getAppList()
290291
})
291292
</script>
292-
293293
<style>
294294
.order-font {
295295
padding: 2px 0;

0 commit comments

Comments
 (0)