|
|
@@ -381,39 +381,39 @@ export default defineComponent({
|
|
|
this.orderNo = orderStatus.orderObject.orderNo
|
|
|
const paymentChannel = this.orderInfo.paymentConfig.paymentChannel
|
|
|
// 判断是否为原生支付
|
|
|
- if (
|
|
|
- this.orderInfo.paymentVendor?.indexOf('wxpay') > -1 ||
|
|
|
- this.orderInfo.paymentVendor?.indexOf('alipay') > -1
|
|
|
- ) {
|
|
|
- this.paymentStatus = true
|
|
|
- } else {
|
|
|
- if (paymentChannel) {
|
|
|
- const payCode = beforeSubmit(paymentChannel)
|
|
|
- this.onConfirm({
|
|
|
- payCode,
|
|
|
- pay_channel: paymentChannel
|
|
|
- })
|
|
|
- } else {
|
|
|
- this.paymentStatus = true
|
|
|
- }
|
|
|
- }
|
|
|
- // if (paymentChannel) {
|
|
|
- // // 判断是否为原生支付
|
|
|
- // if (
|
|
|
- // this.orderInfo.paymentVendor?.indexOf('wxpay') > -1 ||
|
|
|
- // this.orderInfo.paymentVendor?.indexOf('alipay') > -1
|
|
|
- // ) {
|
|
|
- // this.submitNativePay()
|
|
|
- // } else {
|
|
|
+ // if (
|
|
|
+ // this.orderInfo.paymentVendor?.indexOf('wxpay') > -1 ||
|
|
|
+ // this.orderInfo.paymentVendor?.indexOf('alipay') > -1
|
|
|
+ // ) {
|
|
|
+ // this.paymentStatus = true
|
|
|
+ // } else {
|
|
|
+ // if (paymentChannel) {
|
|
|
// const payCode = beforeSubmit(paymentChannel)
|
|
|
// this.onConfirm({
|
|
|
// payCode,
|
|
|
// pay_channel: paymentChannel
|
|
|
// })
|
|
|
+ // } else {
|
|
|
+ // this.paymentStatus = true
|
|
|
// }
|
|
|
- // } else {
|
|
|
- // this.paymentStatus = true
|
|
|
// }
|
|
|
+ if (paymentChannel) {
|
|
|
+ // 判断是否为原生支付
|
|
|
+ if (
|
|
|
+ this.orderInfo.paymentVendor?.indexOf('wxpay') > -1 ||
|
|
|
+ this.orderInfo.paymentVendor?.indexOf('alipay') > -1
|
|
|
+ ) {
|
|
|
+ this.submitNativePay()
|
|
|
+ } else {
|
|
|
+ const payCode = beforeSubmit(paymentChannel)
|
|
|
+ this.onConfirm({
|
|
|
+ payCode,
|
|
|
+ pay_channel: paymentChannel
|
|
|
+ })
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ this.paymentStatus = true
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
return
|
