Skip to content

Commit 10c121d

Browse files
dhb52dhb52
committed
fix: 修复ElDescriptions对齐问题
1 parent 620a200 commit 10c121d

File tree

2 files changed

+23
-28
lines changed

2 files changed

+23
-28
lines changed

‎src/views/pay/order/OrderDetail.vue

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,17 @@
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-
</el-descriptions>
11-
<el-descriptions :column="2" label-class-name="desc-label">
10+
1211
<el-descriptions-item label="应用编号">{{ detailData.appId }}</el-descriptions-item>
1312
<el-descriptions-item label="应用名称">{{ detailData.appName }}</el-descriptions-item>
14-
</el-descriptions>
15-
<el-descriptions :column="2" label-class-name="desc-label">
13+
1614
<el-descriptions-item label="支付状态">
1715
<dict-tag :type="DICT_TYPE.PAY_ORDER_STATUS" :value="detailData.status" size="small" />
1816
</el-descriptions-item>
1917
<el-descriptions-item label="支付金额">
2018
<el-tag type="success" size="small">￥{{ (detailData.price / 100.0).toFixed(2) }}</el-tag>
2119
</el-descriptions-item>
22-
</el-descriptions>
23-
<el-descriptions :column="2" label-class-name="desc-label">
20+
2421
<el-descriptions-item label="手续费">
2522
<el-tag type="warning" size="small">
2623
￥{{ (detailData.channelFeePrice / 100.0).toFixed(2) }}
@@ -29,53 +26,52 @@
2926
<el-descriptions-item label="手续费比例">
3027
{{ (detailData.channelFeeRate / 100.0).toFixed(2) }}%
3128
</el-descriptions-item>
32-
</el-descriptions>
33-
<el-descriptions :column="2" label-class-name="desc-label">
29+
3430
<el-descriptions-item label="支付时间">
3531
{{ formatDate(detailData.successTime) }}
3632
</el-descriptions-item>
3733
<el-descriptions-item label="失效时间">
3834
{{ formatDate(detailData.expireTime) }}
3935
</el-descriptions-item>
40-
</el-descriptions>
41-
<el-descriptions :column="2" label-class-name="desc-label">
36+
4237
<el-descriptions-item label="创建时间">
4338
{{ formatDate(detailData.createTime) }}
4439
</el-descriptions-item>
4540
<el-descriptions-item label="更新时间">
4641
{{ formatDate(detailData.updateTime) }}
4742
</el-descriptions-item>
4843
</el-descriptions>
44+
4945
<!-- 分割线 -->
5046
<el-divider />
47+
5148
<el-descriptions :column="2" label-class-name="desc-label">
5249
<el-descriptions-item label="商品标题">{{ detailData.subject }}</el-descriptions-item>
5350
<el-descriptions-item label="商品描述">{{ detailData.body }}</el-descriptions-item>
54-
</el-descriptions>
55-
<el-descriptions :column="2" label-class-name="desc-label">
51+
5652
<el-descriptions-item label="支付渠道">
5753
<dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="detailData.channelCode" />
5854
</el-descriptions-item>
5955
<el-descriptions-item label="支付 IP">{{ detailData.userIp }}</el-descriptions-item>
60-
</el-descriptions>
61-
<el-descriptions :column="2" label-class-name="desc-label">
56+
6257
<el-descriptions-item label="渠道单号">
6358
<el-tag size="mini" type="success" v-if="detailData.channelOrderNo">
6459
{{ detailData.channelOrderNo }}
6560
</el-tag>
6661
</el-descriptions-item>
6762
<el-descriptions-item label="渠道用户">{{ detailData.channelUserId }}</el-descriptions-item>
68-
</el-descriptions>
69-
<el-descriptions :column="2" label-class-name="desc-label">
63+
7064
<el-descriptions-item label="退款金额">
7165
<el-tag size="mini" type="danger">
7266
￥{{ (detailData.refundPrice / 100.0).toFixed(2) }}
7367
</el-tag>
7468
</el-descriptions-item>
7569
<el-descriptions-item label="通知 URL">{{ detailData.notifyUrl }}</el-descriptions-item>
7670
</el-descriptions>
71+
7772
<!-- 分割线 -->
7873
<el-divider />
74+
7975
<el-descriptions :column="1" label-class-name="desc-label" direction="vertical" border>
8076
<el-descriptions-item label="支付通道异步回调内容">
8177
{{ detailData.extension.channelNotifyData }}

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,17 @@
99
refundDetail.channelRefundNo
1010
}}</el-tag>
1111
</el-descriptions-item>
12-
</el-descriptions>
13-
<el-descriptions :column="2" label-class-name="desc-label">
12+
1413
<el-descriptions-item label="商户支付单号">
1514
<el-tag size="small">{{ refundDetail.merchantOrderId }}</el-tag>
1615
</el-descriptions-item>
1716
<el-descriptions-item label="渠道支付单号">
1817
<el-tag type="success" size="small">{{ refundDetail.channelOrderNo }}</el-tag>
1918
</el-descriptions-item>
20-
</el-descriptions>
21-
<el-descriptions :column="2" label-class-name="desc-label">
19+
2220
<el-descriptions-item label="应用编号">{{ refundDetail.appId }}</el-descriptions-item>
2321
<el-descriptions-item label="应用名称">{{ refundDetail.appName }}</el-descriptions-item>
24-
</el-descriptions>
25-
<el-descriptions :column="2" label-class-name="desc-label">
22+
2623
<el-descriptions-item label="支付金额">
2724
<el-tag type="success" size="small"
2825
>￥{{ (refundDetail.payPrice / 100.0).toFixed(2) }}</el-tag
@@ -33,37 +30,38 @@
3330
>￥{{ (refundDetail.refundPrice / 100.0).toFixed(2) }}</el-tag
3431
>
3532
</el-descriptions-item>
36-
</el-descriptions>
37-
<el-descriptions :column="2" label-class-name="desc-label">
33+
3834
<el-descriptions-item label="退款状态">
3935
<dict-tag :type="DICT_TYPE.PAY_REFUND_STATUS" :value="refundDetail.status" />
4036
</el-descriptions-item>
4137
<el-descriptions-item label="退款时间">{{
4238
formatDate(refundDetail.successTime)
4339
}}</el-descriptions-item>
44-
</el-descriptions>
45-
<el-descriptions :column="2" label-class-name="desc-label">
40+
4641
<el-descriptions-item label="创建时间">{{
4742
formatDate(refundDetail.createTime)
4843
}}</el-descriptions-item>
4944
<el-descriptions-item label="更新时间">{{
5045
formatDate(refundDetail.updateTime)
5146
}}</el-descriptions-item>
5247
</el-descriptions>
48+
5349
<!-- 分割线 -->
5450
<el-divider />
51+
5552
<el-descriptions :column="2" label-class-name="desc-label">
5653
<el-descriptions-item label="退款渠道">
5754
<dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="refundDetail.channelCode" />
5855
</el-descriptions-item>
5956
<el-descriptions-item label="退款原因">{{ refundDetail.reason }}</el-descriptions-item>
60-
</el-descriptions>
61-
<el-descriptions :column="2" label-class-name="desc-label">
57+
6258
<el-descriptions-item label="退款 IP">{{ refundDetail.userIp }}</el-descriptions-item>
6359
<el-descriptions-item label="通知 URL">{{ refundDetail.notifyUrl }}</el-descriptions-item>
6460
</el-descriptions>
61+
6562
<!-- 分割线 -->
6663
<el-divider />
64+
6765
<el-descriptions :column="2" label-class-name="desc-label">
6866
<el-descriptions-item label="渠道错误码">{{
6967
refundDetail.channelErrorCode
@@ -72,6 +70,7 @@
7270
refundDetail.channelErrorMsg
7371
}}</el-descriptions-item>
7472
</el-descriptions>
73+
7574
<el-descriptions :column="1" label-class-name="desc-label" direction="vertical" border>
7675
<el-descriptions-item label="支付通道异步回调内容">
7776
{{ refundDetail.channelNotifyData }}

0 commit comments

Comments
 (0)