|
|
|
@ -2,7 +2,7 @@
|
|
|
|
|
* @Author: ch
|
|
|
|
|
* @Date: 2022-07-08 11:46:30
|
|
|
|
|
* @LastEditors: ch
|
|
|
|
|
* @LastEditTime: 2022-07-12 15:11:50
|
|
|
|
|
* @LastEditTime: 2022-07-12 15:20:50
|
|
|
|
|
* @Description: file content
|
|
|
|
|
-->
|
|
|
|
|
<template>
|
|
|
|
@ -47,13 +47,13 @@ const ENV = process.env;
|
|
|
|
|
value : 'wxpay'
|
|
|
|
|
}
|
|
|
|
|
];
|
|
|
|
|
// if(!WeixinJSBridge){
|
|
|
|
|
if(!WeixinJSBridge){
|
|
|
|
|
data.push({
|
|
|
|
|
label : '支付宝支付',
|
|
|
|
|
icon : require('@/static/ali.png'),
|
|
|
|
|
value : 'alipay'
|
|
|
|
|
})
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
@ -99,8 +99,11 @@ const ENV = process.env;
|
|
|
|
|
package: par.packageValue,
|
|
|
|
|
signType : par.signType,
|
|
|
|
|
paySign : par.paySign
|
|
|
|
|
}, res => {
|
|
|
|
|
}, async res => {
|
|
|
|
|
if(res.err_msg !== 'get_brand_wcpay_request:cancel'){
|
|
|
|
|
if(res.err_msg.includes('chooseWXPay:fail')){
|
|
|
|
|
await uni._$toast(res.err_msg);
|
|
|
|
|
}
|
|
|
|
|
if(this.orderInfo.returnUrl){
|
|
|
|
|
window.location.replace(this.orderInfo.returnUrl);
|
|
|
|
|
}else{
|
|
|
|
|