|
|
|
|
@ -237,11 +237,6 @@
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
|
// return uni.showModal({
|
|
|
|
|
// title: '提示',
|
|
|
|
|
// content: '请使用支付宝扫码',
|
|
|
|
|
// showCancel: false
|
|
|
|
|
// })
|
|
|
|
|
// #ifndef MP
|
|
|
|
|
await this.wechatPayNow({
|
|
|
|
|
payType,
|
|
|
|
|
@ -316,6 +311,7 @@
|
|
|
|
|
if (res.data == -1) {
|
|
|
|
|
return this.successSubmit();
|
|
|
|
|
}
|
|
|
|
|
let that = this
|
|
|
|
|
wxConfig.init(["chooseWXPay"]).then(wx => {
|
|
|
|
|
wx.chooseWXPay({
|
|
|
|
|
// 支付签名时间戳,注意微信jssdk中的所有使用timestamp字段均为小写。
|
|
|
|
|
@ -326,20 +322,22 @@
|
|
|
|
|
signType: res.data.signType, // 签名算法
|
|
|
|
|
paySign: res.data.paySign, // 签名
|
|
|
|
|
success: function(res) {
|
|
|
|
|
console.log(res, 'success')
|
|
|
|
|
if (res.err_msg == "get_brand_wcpay_request:ok" || res.err_Info ==
|
|
|
|
|
"success" || res.errMsg == "chooseWXPay:ok") {
|
|
|
|
|
this.successSubmit();
|
|
|
|
|
that.successSubmit();
|
|
|
|
|
} else {
|
|
|
|
|
this.failSubmit();
|
|
|
|
|
that.failSubmit();
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
complete: function(err) {
|
|
|
|
|
console.log(res, 'complete')
|
|
|
|
|
if (res.err_msg == "get_brand_wcpay_request:ok" || res.err_Info ==
|
|
|
|
|
"success" || res.errMsg == "chooseWXPay:ok" || res.errMsg ==
|
|
|
|
|
"getBrandWCPayRequest:ok") {
|
|
|
|
|
this.successSubmit();
|
|
|
|
|
that.successSubmit();
|
|
|
|
|
} else {
|
|
|
|
|
this.failSubmit();
|
|
|
|
|
that.failSubmit();
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
})
|
|
|
|
|
@ -473,7 +471,7 @@
|
|
|
|
|
|
|
|
|
|
setTimeout(() => {
|
|
|
|
|
this.toUrl('/subPackages/inPersonToPay/result/index?price=' + this.total_price + '&mch_id=' +
|
|
|
|
|
this.mch_id)
|
|
|
|
|
this.mch_id, 'reLaunch')
|
|
|
|
|
uni.removeStorageSync("支付" + this.mch_id)
|
|
|
|
|
this.total_price = ""
|
|
|
|
|
this.payCurrent = false
|
|
|
|
|
|