diff --git a/src/utils/dict.ts b/src/utils/dict.ts index d11d1d33..6ca48716 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -131,12 +131,8 @@ export enum DICT_TYPE { // ========== PAY 模块 ========== PAY_CHANNEL_CODE = 'pay_channel_code', // 支付渠道编码类型 - PAY_CHANNEL_CODE_TYPE = 'pay_channel_code_type', // 支付渠道编码类型 PAY_ORDER_STATUS = 'pay_order_status', // 商户支付订单状态 - PAY_ORDER_REFUND_STATUS = 'pay_order_refund_status', // 商户支付订单退款状态 - PAY_REFUND_ORDER_STATUS = 'pay_refund_order_status', // 退款订单状态 - PAY_REFUND_ORDER_TYPE = 'pay_refund_order_type', // 退款订单类别 - + PAY_REFUND_STATUS = 'pay_refund_status', // 退款订单状态 PAY_NOTIFY_STATUS = 'pay_notify_status', // 商户支付回调状态 PAY_NOTIFY_TYPE = 'pay_notify_type', // 商户支付回调状态 diff --git a/src/views/pay/app/index.vue b/src/views/pay/app/index.vue index e1c3ce31..41da8068 100644 --- a/src/views/pay/app/index.vue +++ b/src/views/pay/app/index.vue @@ -326,7 +326,6 @@ const queryParams = reactive({ createTime: [] }) const queryFormRef = ref() // 搜索的表单 -const exportLoading = ref(false) // 导出的加载中 /** 查询列表 */ const getList = async () => { diff --git a/src/views/pay/order/OrderDetail.vue b/src/views/pay/order/OrderDetail.vue index 3489d4a9..7fe122c2 100644 --- a/src/views/pay/order/OrderDetail.vue +++ b/src/views/pay/order/OrderDetail.vue @@ -7,20 +7,17 @@ {{ detailData.no }} - - + {{ detailData.appId }} {{ detailData.appName }} - - + ¥{{ (detailData.price / 100.0).toFixed(2) }} - - + ¥{{ (detailData.channelFeePrice / 100.0).toFixed(2) }} @@ -29,16 +26,14 @@ {{ (detailData.channelFeeRate / 100.0).toFixed(2) }}% - - + {{ formatDate(detailData.successTime) }} {{ formatDate(detailData.expireTime) }} - - + {{ formatDate(detailData.createTime) }} @@ -46,27 +41,26 @@ {{ formatDate(detailData.updateTime) }} + + {{ detailData.subject }} {{ detailData.body }} - - + {{ detailData.userIp }} - - + {{ detailData.channelOrderNo }} {{ detailData.channelUserId }} - - + ¥{{ (detailData.refundPrice / 100.0).toFixed(2) }} @@ -74,8 +68,10 @@ {{ detailData.notifyUrl }} + + {{ detailData.extension.channelNotifyData }} diff --git a/src/views/pay/refund/RefundDetail.vue b/src/views/pay/refund/RefundDetail.vue index c6a40101..04b548d5 100644 --- a/src/views/pay/refund/RefundDetail.vue +++ b/src/views/pay/refund/RefundDetail.vue @@ -1,86 +1,80 @@ @@ -93,7 +87,7 @@ defineOptions({ name: 'PayRefundDetail' }) const dialogVisible = ref(false) // 弹窗的是否展示 const detailLoading = ref(false) // 表单的加载中 -const detailData = ref({}) +const refundDetail = ref({}) /** 打开弹窗 */ const open = async (id: number) => { @@ -101,7 +95,7 @@ const open = async (id: number) => { // 设置数据 detailLoading.value = true try { - detailData.value = await RefundApi.getRefund(id) + refundDetail.value = await RefundApi.getRefund(id) } finally { detailLoading.value = false } diff --git a/src/views/pay/refund/index.vue b/src/views/pay/refund/index.vue index 58e67bad..90c3b093 100644 --- a/src/views/pay/refund/index.vue +++ b/src/views/pay/refund/index.vue @@ -10,21 +10,6 @@ :inline="true" label-width="120px" > - - - - - - + - - - - - - + + + + + + + + + + - - - - - - 搜索 - 重置 + 搜索 + 重置 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + +