From 5b99b0fd7528cd6df97545c9766d1f968ef99006 Mon Sep 17 00:00:00 2001 From: bootx Date: Sun, 31 Aug 2025 00:29:32 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=B8=80=E4=BA=9B=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E9=94=99=E8=AF=AF=E5=92=8C=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/daxpay.ts | 8 ++ .../h5/aggregate/wechat/WechatAggregate.vue | 2 +- .../h5/code/wechat/WechatCashierCode.vue | 2 +- .../h5/onboarded/common/OnbMchApply.api.ts | 2 +- .../daxpay/h5/onboarded/hkrt/HkrtApply.api.ts | 2 +- .../daxpay/h5/onboarded/hkrt/HkrtApply.vue | 11 +- .../h5/onboarded/leshua/LeshuaApply.vue | 12 ++- .../daxpay/h5/onboarded/vbill/VbillApply.vue | 12 ++- src/views/daxpay/h5/result/SuccessResult.vue | 101 ++++++++++++++++++ 9 files changed, 142 insertions(+), 10 deletions(-) create mode 100644 src/views/daxpay/h5/result/SuccessResult.vue diff --git a/src/router/daxpay.ts b/src/router/daxpay.ts index 6ddf815..38a157a 100644 --- a/src/router/daxpay.ts +++ b/src/router/daxpay.ts @@ -90,6 +90,14 @@ export const DaxPayH5Route: RouteRecordRaw = { title: '成功提示', }, }, + { + path: '/success', + name: 'SuccessResult', + component: () => import('@/views/daxpay/h5/result/SuccessResult.vue'), + meta: { + title: '操作成功', + }, + }, { path: '/payFail', name: 'payFail', diff --git a/src/views/daxpay/h5/aggregate/wechat/WechatAggregate.vue b/src/views/daxpay/h5/aggregate/wechat/WechatAggregate.vue index 1be6856..9f672d2 100644 --- a/src/views/daxpay/h5/aggregate/wechat/WechatAggregate.vue +++ b/src/views/daxpay/h5/aggregate/wechat/WechatAggregate.vue @@ -287,7 +287,7 @@ function jsapiPay(data: WxJsapiSignResult) { if (res.err_msg === 'get_brand_wcpay_request:ok') { // 跳转到成功页面 router.replace({ - path: '/paySuccess', + name: 'PaySuccess', query: { title: '支付成功', orderNo }, }) } diff --git a/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue b/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue index 32868ef..cc8ac92 100644 --- a/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue +++ b/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue @@ -232,7 +232,7 @@ function jsapiPay(data: WxJsapiSignResult) { if (res.err_msg === 'get_brand_wcpay_request:ok') { // 跳转到成功页面 router.replace({ - path: '/paySuccess', + name: 'PaySuccess', query: { title: '支付成功' }, }) } diff --git a/src/views/daxpay/h5/onboarded/common/OnbMchApply.api.ts b/src/views/daxpay/h5/onboarded/common/OnbMchApply.api.ts index ac5da55..79a1fe2 100644 --- a/src/views/daxpay/h5/onboarded/common/OnbMchApply.api.ts +++ b/src/views/daxpay/h5/onboarded/common/OnbMchApply.api.ts @@ -15,7 +15,7 @@ export function findAllProvinceAndCityAndArea() { */ export function submit(id, sign, headers) { return http.request({ - url: '/onb/mch/apply/submit', + url: '/onb/mch/apply/h5/submit', method: 'post', params: { id, sign }, headers, diff --git a/src/views/daxpay/h5/onboarded/hkrt/HkrtApply.api.ts b/src/views/daxpay/h5/onboarded/hkrt/HkrtApply.api.ts index 9426362..0c0151c 100644 --- a/src/views/daxpay/h5/onboarded/hkrt/HkrtApply.api.ts +++ b/src/views/daxpay/h5/onboarded/hkrt/HkrtApply.api.ts @@ -40,7 +40,7 @@ export function save(param: MerchantApply, sign, headers) { export function mccTree() { return http.request>({ method: 'get', - url: '/leshua/mcc/tree', + url: '/hkrt/mcc/tree', }) } diff --git a/src/views/daxpay/h5/onboarded/hkrt/HkrtApply.vue b/src/views/daxpay/h5/onboarded/hkrt/HkrtApply.vue index 4ed5637..8fb0908 100644 --- a/src/views/daxpay/h5/onboarded/hkrt/HkrtApply.vue +++ b/src/views/daxpay/h5/onboarded/hkrt/HkrtApply.vue @@ -719,8 +719,15 @@ function saveTemp() { function submitClick() { formRef.value .validate() - .then(() => { + .then(async () => { + loading.value = true // 执行下一步操作 + await save(form.value, sign, headers).then(({ code, msg }) => { + if (code !== 0) { + showNotify({ type: 'danger', message: msg }) + loading.value = false + } + }) submit(form.value.applyId, sign, headers).then(({ code, data }) => { if (code !== 0) { showNotify({ type: 'danger', message: data }) @@ -728,7 +735,7 @@ function submitClick() { loading.value = false // 跳转到成功页面 router.replace({ - path: '/paySuccess', + name: 'SuccessResult', query: { title: '提交申请成功' }, }) }) diff --git a/src/views/daxpay/h5/onboarded/leshua/LeshuaApply.vue b/src/views/daxpay/h5/onboarded/leshua/LeshuaApply.vue index 25f9bad..24874aa 100644 --- a/src/views/daxpay/h5/onboarded/leshua/LeshuaApply.vue +++ b/src/views/daxpay/h5/onboarded/leshua/LeshuaApply.vue @@ -686,7 +686,15 @@ function saveTemp() { function submitClick() { formRef.value .validate() - .then(() => { + .then(async () => { + loading.value = true + // 执行下一步操作 + await save(form.value, sign, headers).then(({ code, msg }) => { + if (code !== 0) { + showNotify({ type: 'danger', message: msg }) + loading.value = false + } + }) // 执行下一步操作 submit(form.value.applyId, sign, headers).then(({ code, data }) => { if (code !== 0) { @@ -695,7 +703,7 @@ function submitClick() { loading.value = false // 跳转到成功页面 router.replace({ - path: '/paySuccess', + name: 'SuccessResult', query: { title: '提交申请成功' }, }) }) diff --git a/src/views/daxpay/h5/onboarded/vbill/VbillApply.vue b/src/views/daxpay/h5/onboarded/vbill/VbillApply.vue index a1e1580..80fc18c 100644 --- a/src/views/daxpay/h5/onboarded/vbill/VbillApply.vue +++ b/src/views/daxpay/h5/onboarded/vbill/VbillApply.vue @@ -808,7 +808,15 @@ function saveTemp() { function submitClick() { formRef.value .validate() - .then(() => { + .then(async () => { + loading.value = true + // 执行下一步操作 + await save(form.value, sign, headers).then(({ code, msg }) => { + if (code !== 0) { + showNotify({ type: 'danger', message: msg }) + loading.value = false + } + }) // 执行下一步操作 submit(form.value.applyId, sign, headers).then(({ code, data }) => { if (code !== 0) { @@ -817,7 +825,7 @@ function submitClick() { loading.value = false // 跳转到成功页面 router.replace({ - path: '/paySuccess', + name: 'SuccessResult', query: { title: '提交申请成功' }, }) }) diff --git a/src/views/daxpay/h5/result/SuccessResult.vue b/src/views/daxpay/h5/result/SuccessResult.vue new file mode 100644 index 0000000..a3877f1 --- /dev/null +++ b/src/views/daxpay/h5/result/SuccessResult.vue @@ -0,0 +1,101 @@ + + + + +