|
@@ -263,7 +263,7 @@
|
|
|
})
|
|
|
})
|
|
|
})
|
|
|
-
|
|
|
+ this.loading = true
|
|
|
// 校验并提示信息
|
|
|
purchaseCheck({
|
|
|
detailList:detailList,
|
|
@@ -286,6 +286,7 @@
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
+ this.loading = false
|
|
|
return
|
|
|
}
|
|
|
const successList = res.data.successList.map(item => {
|
|
@@ -322,6 +323,7 @@
|
|
|
_this.submitForm(successList,delSn)
|
|
|
}
|
|
|
}else{
|
|
|
+ this.loading = false
|
|
|
uni.showToast({
|
|
|
title: res.message,
|
|
|
icon: 'none'
|
|
@@ -364,13 +366,11 @@
|
|
|
this.payData = ret.data?ret.data.payRequestRest:null
|
|
|
}else{
|
|
|
// 余额支付
|
|
|
- this.payComplete(null,true)
|
|
|
+ this.payError()
|
|
|
}
|
|
|
}else{
|
|
|
- uni.showToast({
|
|
|
- title: ret.message,
|
|
|
- icon: 'none'
|
|
|
- })
|
|
|
+ // 支付失败
|
|
|
+ this.payError(ret.message)
|
|
|
}
|
|
|
uni.$emit("refashPayBalance")
|
|
|
})
|
|
@@ -387,6 +387,25 @@
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ // 支付失败关闭弹框并跳到订单详情页面
|
|
|
+ payError(msg){
|
|
|
+ if(msg){
|
|
|
+ uni.showModal({
|
|
|
+ title: '提示',
|
|
|
+ content: msg,
|
|
|
+ showCancel: false,
|
|
|
+ confirmText: '确定',
|
|
|
+ success: (res) => {
|
|
|
+ if (res.confirm) {
|
|
|
+ this.payComplete(null,true)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }else{
|
|
|
+ // 充值余额支付成功
|
|
|
+ this.payComplete(null,true)
|
|
|
+ }
|
|
|
+ },
|
|
|
// 订单详情页
|
|
|
payComplete(data){
|
|
|
// 创建成功,跳转到订单详情页
|