diff --git a/src/views/pay/order/index.vue b/src/views/pay/order/index.vue index ba04d0d9..72e5128b 100644 --- a/src/views/pay/order/index.vue +++ b/src/views/pay/order/index.vue @@ -233,7 +233,7 @@ import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import * as MerchantApi from '@/api/pay/merchant' import * as OrderApi from '@/api/pay/order' -import OrderDetail from '@/views/pay/order/OrderDetail.vue' +import OrderDetail from './OrderDetail.vue' const message = useMessage() // 消息弹窗 import download from '@/utils/download' @@ -314,7 +314,7 @@ const handleExport = async () => { /** 预览详情 */ const detailRef = ref() -const openDetail = (id?: number) => { +const openDetail = (id: number) => { detailRef.value.open(id) } diff --git a/src/views/pay/refund/RefundDetail.vue b/src/views/pay/refund/RefundDetail.vue new file mode 100644 index 00000000..8a47c6f6 --- /dev/null +++ b/src/views/pay/refund/RefundDetail.vue @@ -0,0 +1,115 @@ + + + + {{ detailData.merchantName }} + {{ detailData.appName }} + {{ detailData.subject }} + + + + + {{ detailData.merchantRefundNo }} + + + {{ detailData.merchantOrderId }} + + {{ detailData.tradeNo }} + + + + + ¥{{ parseFloat(detailData.payAmount / 100, 2).toFixed(2) }} + + + + ¥{{ parseFloat(detailData.refundAmount / 100).toFixed(2) }} + + + + + + + + + + {{ formatDate(detailData.createTime) }} + + + {{ formatDate(detailData.successTime) }} + + + {{ formatDate(detailData.expireTime) }} + + + {{ formatDate(detailData.updateTime) }} + + + + + + {{ detailData.channelCodeName }} + + + {{ detailData.userIp }} + + {{ detailData.notifyUrl }} + + + + + {{ formatDate(detailData.notifyTime) }} + + + + + + {{ detailData.channelOrderNo }} + + + {{ detailData.channelRefundNo }} + + + {{ detailData.channelErrorCode }} + + + {{ detailData.channelErrorMsg }} + + + + + + {{ detailData.channelExtras }} + + {{ detailData.reason }} + + + + + diff --git a/src/views/pay/refund/index.vue b/src/views/pay/refund/index.vue index a17f5552..17ca2a0d 100644 --- a/src/views/pay/refund/index.vue +++ b/src/views/pay/refund/index.vue @@ -1,10 +1,10 @@ + - @@ -12,18 +12,8 @@ { - queryParams.merchantId = null - } - " - filterable - remote - reserve-keyword placeholder="请选择所属商户" - @change="handleGetAppListByMerchantId" - :remote-method="handleGetMerchantListByName" - :loading="merchantLoading" + class="!w-240px" > - + @@ -43,14 +38,10 @@ v-model="queryParams.channelCode" placeholder="请输入渠道编码" clearable - @clear=" - () => { - queryParams.channelCode = null - } - " + class="!w-240px" > - + @@ -73,15 +69,21 @@ placeholder="请输入商户退款订单号" clearable @keyup.enter="handleQuery" + class="!w-240px" /> - + @@ -90,12 +92,13 @@ v-model="queryParams.notifyStatus" placeholder="请选择通知商户退款结果的回调状态" clearable + class="!w-240px" > @@ -111,14 +114,8 @@ /> - - - 搜索 - - - - 重置 - + 搜索 + 重置 - - 导出 + 导出 - - - - - - - - - - - 退款 - {{ scope.row.merchantRefundNo }} - - - 交易 - {{ scope.row.merchantOrderId }} - - - - - - - 交易 - {{ scope.row.tradeNo }} - - - 渠道 - {{ scope.row.channelOrderNo }} - - - - - - ¥{{ parseFloat(scope.row.payAmount / 100).toFixed(2) }} - - - - - ¥{{ parseFloat(scope.row.refundAmount / 100).toFixed(2) }} - - - - - - - - - - - - - - - - - - - - - - - 查看详情 - - - - + + + + + + + + + + + + 退款 + {{ scope.row.merchantRefundNo }} + + + 交易 + {{ scope.row.merchantOrderId }} + + + + + + + 交易 + {{ scope.row.tradeNo }} + + + 渠道 + {{ scope.row.channelOrderNo }} + + + + + + ¥{{ parseFloat(scope.row.payAmount / 100).toFixed(2) }} + + + + + ¥{{ parseFloat(scope.row.refundAmount / 100).toFixed(2) }} + + + + + + + + + + + + + + + + + + + + + + + + 详情 + + + + + - + - diff --git a/src/views/pay/refund/refundForm.vue b/src/views/pay/refund/refundForm.vue deleted file mode 100644 index cc9d8726..00000000 --- a/src/views/pay/refund/refundForm.vue +++ /dev/null @@ -1,154 +0,0 @@ - - - - {{ refundDetail.merchantName }} - {{ refundDetail.appName }} - {{ refundDetail.subject }} - - - - - {{ refundDetail.merchantRefundNo }} - - {{ refundDetail.merchantOrderId }} - - {{ refundDetail.tradeNo }} - - - - - {{ parseFloat(refundDetail.payAmount / 100).toFixed(2) }} - - - - {{ parseFloat(refundDetail.refundAmount / 100).toFixed(2) }} - - - - - - - - - {{ formatDate(refundDetail.createTime) }} - - {{ formatDate(refundDetail.successTime) }} - - {{ formatDate(refundDetail.expireTime) }} - - {{ formatDate(refundDetail.updateTime) }} - - - - - - {{ refundDetail.channelCodeName }} - - - {{ refundDetail.userIp }} - - {{ refundDetail.notifyUrl }} - - - - {{ formatDate(refundDetail.notifyTime) }} - - - - - {{ refundDetail.channelOrderNo }} - - {{ refundDetail.channelRefundNo }} - - {{ refundDetail.channelErrorCode }} - - {{ refundDetail.channelErrorMsg }} - - - - - {{ refundDetail.channelExtras }} - - {{ refundDetail.reason }} - - - - - -
- 退款 - {{ scope.row.merchantRefundNo }} -
- 交易 - {{ scope.row.merchantOrderId }} -
- 交易 - {{ scope.row.tradeNo }} -
- 渠道 - {{ scope.row.channelOrderNo }} -
+ 退款 + {{ scope.row.merchantRefundNo }} +
+ 交易 + {{ scope.row.merchantOrderId }} +
+ 交易 + {{ scope.row.tradeNo }} +
+ 渠道 + {{ scope.row.channelOrderNo }} +