|
@@ -618,6 +618,7 @@
|
|
mask: true
|
|
mask: true
|
|
})
|
|
})
|
|
const _this = this
|
|
const _this = this
|
|
|
|
+ this.loading = false
|
|
purchaseCheck({
|
|
purchaseCheck({
|
|
useSubsidyFlag: this.hasKdk&&!this.disKdk? '1' : '0',
|
|
useSubsidyFlag: this.hasKdk&&!this.disKdk? '1' : '0',
|
|
payOnlineType: this.payType == 0 ? 'RECHARGE_BALANCE' : this.payType == 1 ? 'PAY_WECHAT_ONLINE' : '',
|
|
payOnlineType: this.payType == 0 ? 'RECHARGE_BALANCE' : this.payType == 1 ? 'PAY_WECHAT_ONLINE' : '',
|
|
@@ -680,6 +681,7 @@
|
|
_this.submitForm(successList)
|
|
_this.submitForm(successList)
|
|
}
|
|
}
|
|
}else{
|
|
}else{
|
|
|
|
+ this.loading = false
|
|
uni.showToast({
|
|
uni.showToast({
|
|
title: res.message,
|
|
title: res.message,
|
|
icon: 'none'
|
|
icon: 'none'
|
|
@@ -693,6 +695,7 @@
|
|
title: '提交中...',
|
|
title: '提交中...',
|
|
mask: true
|
|
mask: true
|
|
})
|
|
})
|
|
|
|
+ this.loading = true
|
|
purchaseSave({
|
|
purchaseSave({
|
|
detailList: detailList,
|
|
detailList: detailList,
|
|
useSubsidyFlag: this.hasKdk&&!this.disKdk? '1' : '0',
|
|
useSubsidyFlag: this.hasKdk&&!this.disKdk? '1' : '0',
|
|
@@ -721,22 +724,14 @@
|
|
this.showPay = true
|
|
this.showPay = true
|
|
this.payData = ret.data?ret.data.payRequestRest:null
|
|
this.payData = ret.data?ret.data.payRequestRest:null
|
|
}else{
|
|
}else{
|
|
- uni.showToast({
|
|
|
|
- title: '支付失败',
|
|
|
|
- icon: 'none'
|
|
|
|
- })
|
|
|
|
|
|
+ this.payError('支付失败')
|
|
}
|
|
}
|
|
}else{
|
|
}else{
|
|
// 余额支付
|
|
// 余额支付
|
|
- this.showPay = true
|
|
|
|
- this.showPopu = false
|
|
|
|
- this.submitOk = true
|
|
|
|
|
|
+ this.payError()
|
|
}
|
|
}
|
|
}else{
|
|
}else{
|
|
- uni.showToast({
|
|
|
|
- title: ret.message,
|
|
|
|
- icon: 'none'
|
|
|
|
- })
|
|
|
|
|
|
+ this.payError(ret.message)
|
|
}
|
|
}
|
|
uni.$emit("refashPayBalance")
|
|
uni.$emit("refashPayBalance")
|
|
uni.hideLoading()
|
|
uni.hideLoading()
|
|
@@ -767,6 +762,29 @@
|
|
this.cancelPay()
|
|
this.cancelPay()
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ // 支付失败关闭弹框并跳到订单详情页面
|
|
|
|
+ payError(msg){
|
|
|
|
+ if(msg){
|
|
|
|
+ uni.showModal({
|
|
|
|
+ title: '提示',
|
|
|
|
+ content: msg,
|
|
|
|
+ showCancel: false,
|
|
|
|
+ confirmText: '确定',
|
|
|
|
+ success: (res) => {
|
|
|
|
+ if (res.confirm) {
|
|
|
|
+ this.showPay = true
|
|
|
|
+ this.showPopu = false
|
|
|
|
+ this.submitOk = true
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }else{
|
|
|
|
+ // 充值余额支付成功
|
|
|
|
+ this.showPay = true
|
|
|
|
+ this.showPopu = false
|
|
|
|
+ this.submitOk = true
|
|
|
|
+ }
|
|
|
|
+ },
|
|
// 关闭确定订单弹窗后
|
|
// 关闭确定订单弹窗后
|
|
closePopu(){
|
|
closePopu(){
|
|
this.showPopu = false
|
|
this.showPopu = false
|
|
@@ -908,6 +926,7 @@
|
|
},
|
|
},
|
|
// 订单详情页
|
|
// 订单详情页
|
|
toOrderDetial(){
|
|
toOrderDetial(){
|
|
|
|
+ this.loading = false
|
|
this.resetPage()
|
|
this.resetPage()
|
|
// 跳转到订单详情页面
|
|
// 跳转到订单详情页面
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|