|
|
@@ -271,34 +271,47 @@ const methods = {
|
|
|
params.tradeType = carrierPay.value.tradeType
|
|
|
params.truckId = carrierPay.value.truckId
|
|
|
}
|
|
|
- webapi.pay.order_pay(params).then((res) => {
|
|
|
- if ([1, 2, 3].includes(curPay.value.payType)) {
|
|
|
- data.nativePayState = enums.ReqState.ing
|
|
|
- uni.requestPayment({
|
|
|
- ...JSON.parse(res.payInfo),
|
|
|
- success() {
|
|
|
- data.nativePayState = enums.ReqState.success
|
|
|
- methods.paySuccess()
|
|
|
- },
|
|
|
- fail() {
|
|
|
- data.nativePayState = enums.ReqState.fail
|
|
|
- func.native.showToast({
|
|
|
- icon: 'error',
|
|
|
- title: '支付失败',
|
|
|
- })
|
|
|
- // 物流支付失败跳订单详情
|
|
|
- if (data.fpayType === 1) {
|
|
|
- ay.goPage(config.pages.order_orderDetail, {
|
|
|
- params: data.paysel.gasOrder,
|
|
|
- goPageType: enums.GoPageType.redirectTo,
|
|
|
+ webapi.pay
|
|
|
+ .order_pay(params)
|
|
|
+ .then((res) => {
|
|
|
+ if ([1, 2, 3].includes(curPay.value.payType)) {
|
|
|
+ data.nativePayState = enums.ReqState.ing
|
|
|
+ uni.requestPayment({
|
|
|
+ ...JSON.parse(res.payInfo),
|
|
|
+ success() {
|
|
|
+ data.nativePayState = enums.ReqState.success
|
|
|
+ methods.paySuccess()
|
|
|
+ },
|
|
|
+ fail() {
|
|
|
+ data.nativePayState = enums.ReqState.fail
|
|
|
+ func.native.showToast({
|
|
|
+ icon: 'error',
|
|
|
+ title: '支付失败',
|
|
|
})
|
|
|
- }
|
|
|
- },
|
|
|
- })
|
|
|
- } else {
|
|
|
- methods.paySuccess()
|
|
|
- }
|
|
|
- })
|
|
|
+ // 物流支付失败跳订单详情
|
|
|
+ if (data.fpayType === 1) {
|
|
|
+ ay.goPage(config.pages.order_orderDetail, {
|
|
|
+ params: data.paysel.gasOrder,
|
|
|
+ goPageType: enums.GoPageType.redirectTo,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ methods.paySuccess()
|
|
|
+ }
|
|
|
+ })
|
|
|
+ .catch((err) => {
|
|
|
+ if ([3003, 3110].includes(err.res.code)) {
|
|
|
+ // 物流支付失败跳订单详情
|
|
|
+ if (data.fpayType === 1) {
|
|
|
+ ay.goPage(config.pages.order_orderDetail, {
|
|
|
+ params: data.paysel.gasOrder,
|
|
|
+ goPageType: enums.GoPageType.redirectTo,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
paySuccess() {
|
|
|
func.native
|