diff --git a/.gitignore b/.gitignore index a3cdee0..c11b5e5 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ unpackage/ # [package-lock.json。 已放开,请添加到假定未更改文件 ] # package-lock.json +/.history/ diff --git a/jeepay-ui-merchant/src/views/division/record/Detail.vue b/jeepay-ui-merchant/src/views/division/record/Detail.vue index e903fe3..6f352a8 100644 --- a/jeepay-ui-merchant/src/views/division/record/Detail.vue +++ b/jeepay-ui-merchant/src/views/division/record/Detail.vue @@ -14,14 +14,17 @@ {{ detailData.ifCode }} {{ detailData.payOrderId }} {{ detailData.payOrderChannelOrderNo }} - {{ detailData.payOrderAmount / 100}} + {{ detailData.payOrderAmount / 100 }} {{ detailData.payOrderDivisionAmount / 100 }} (订单金额-手续费-退款金额) {{ detailData.batchOrderId }} {{ detailData.channelBatchOrderId }} - - {{ detailData.state === 0?'分账中':detailData.state === 1?'分账成功':detailData.state === 2?'分账失败' : '未知' }} - + + 分账中 + 分账成功 + 分账失败 + 已受理 + {{ detailData.receiverId }} {{ detailData.receiverGroupId }} diff --git a/jeepay-ui-merchant/src/views/division/record/DivisionRecordPage.vue b/jeepay-ui-merchant/src/views/division/record/DivisionRecordPage.vue index 0492874..6ab2c45 100644 --- a/jeepay-ui-merchant/src/views/division/record/DivisionRecordPage.vue +++ b/jeepay-ui-merchant/src/views/division/record/DivisionRecordPage.vue @@ -26,6 +26,7 @@ 待分账 分账成功 分账失败 + 已受理 @@ -49,12 +50,12 @@ >