diff --git a/jeepay-ui-uapp-merchant/pages/order/refund.vue b/jeepay-ui-uapp-merchant/pages/order/refund.vue index cd081a5..2b4b860 100644 --- a/jeepay-ui-uapp-merchant/pages/order/refund.vue +++ b/jeepay-ui-uapp-merchant/pages/order/refund.vue @@ -90,12 +90,17 @@ const refundPost = (payPassword) => { console.log('payPassword', payPassword); $payOrderRefund(vdata.orderInfo.payOrderId, vdata.refundAmount, vdata.refundRemark, payPassword, vdata.refundModel) .then(({ bizData }) => { - infoBox.showSuccessToast('退款已申请').then(() => { - // 刷新订单数据 - emit.pageEmit(emit.ENAME_REF_PAY_ORDER); - refundPopup.value.close(); - go.back(); - }); + console.log('bizData', bizData); + if (bizData.state == 0 || bizData.state == 1 || bizData.state == 2) { + infoBox.showSuccessToast('退款已申请').then(() => { + // 刷新订单数据 + emit.pageEmit(emit.ENAME_REF_PAY_ORDER); + refundPopup.value.close(); + go.back(); + }); + } else { + infoBox.showErrorToast(bizData.errMsg); + } }) .catch((err) => { refundPopup.value.clearInput(); diff --git a/jeepay-ui-uapp-merchant/pages/statPage/statPage.vue b/jeepay-ui-uapp-merchant/pages/statPage/statPage.vue index 5b4a8df..e1f6611 100644 --- a/jeepay-ui-uapp-merchant/pages/statPage/statPage.vue +++ b/jeepay-ui-uapp-merchant/pages/statPage/statPage.vue @@ -224,7 +224,7 @@ const getStatList = () => { bizData.fee = cal.cert2Dollar(bizData.fee); vdata.totalFinalAmt = cal.cert2Dollar(bizData.totalSuccAmt - bizData.totalFeeAmt - bizData.totalRefundAmt) < 0 - ? 0 + ? '0.00' : cal.cert2Dollar(bizData.totalSuccAmt - bizData.totalFeeAmt - bizData.totalRefundAmt); bizData.round = bizData.round + '%'; vdata.infoList.forEach((v) => {