diff --git a/.env.production b/.env.production index 59cfd18..39f60fb 100644 --- a/.env.production +++ b/.env.production @@ -10,5 +10,6 @@ # 邮储音视频活动(测试环境) VITE_BASE_URL = 'https://gateway.dev.cdlsxd.cn/ycav' -VITE_YCNC_MERCH_CODE = '100610100019042' +# VITE_YCNC_MERCH_CODE = '100610100019042' +VITE_YCNC_MERCH_CODE = '100310100018908' diff --git a/src/pages/ycnc/orderDetail.vue b/src/pages/ycnc/orderDetail.vue index 3f0403e..3803a5a 100644 --- a/src/pages/ycnc/orderDetail.vue +++ b/src/pages/ycnc/orderDetail.vue @@ -150,6 +150,7 @@ const goRefund = () => { icon: 'success', title: '退款成功', }); + getDetail(); }).catch(err => { console.log(err); }) diff --git a/src/pages/ycysp/hooks/usePay.js b/src/pages/ycysp/hooks/usePay.js index 063046c..2b04fe8 100644 --- a/src/pages/ycysp/hooks/usePay.js +++ b/src/pages/ycysp/hooks/usePay.js @@ -20,7 +20,7 @@ export default function usePay(){ MercUrl:notify_url, TranAmt:tranAmt, TermSsn:order_no, - BackLink:encodeURIComponent(`${window.location.origin}/#/pages/ycysp/orderDetail?order_no=${order_no}&isPayBack=true`), + BackLink:encodeURIComponent(`${window.location.origin}${window.location.pathname || ''}/#/pages/ycysp/orderDetail?order_no=${order_no}&isPayBack=true`), psbcmcc:'LSXD', TxnDt:dayjs(Date.now()).format('YYYY-MM-DD'), MercCode:MercCode, @@ -33,8 +33,8 @@ export default function usePay(){ sign:sign, Signature: '', } - console.log('handCodePay-plain',Plain); - console.log('handCodePay-params',params); + console.log('CodePay-plain',Plain); + console.log('CodePay-params',params); Fw.device.api.handCodePay(params); } return {payFunc} diff --git a/src/pages/ycysp/order.vue b/src/pages/ycysp/order.vue index 8aef422..976c2a0 100644 --- a/src/pages/ycysp/order.vue +++ b/src/pages/ycysp/order.vue @@ -165,7 +165,7 @@ function refund(orderData) { }); return; } - const params = { order_id: id }; + const params = { id: id }; refundOrder({ params }) .then((res) => { uni.showToast({ diff --git a/src/pages/ycysp/orderDetail.vue b/src/pages/ycysp/orderDetail.vue index 0bd61de..0b7526e 100644 --- a/src/pages/ycysp/orderDetail.vue +++ b/src/pages/ycysp/orderDetail.vue @@ -133,13 +133,14 @@ const goRefund = () => { }); return; } - const params = { order_id: id }; + const params = { id: id }; refundOrder({ params }) .then((res) => { uni.showToast({ icon: "success", title: "退款成功", }); + getDetail(); }) .catch((err) => { console.log(err);