|
@@ -159,15 +159,16 @@ async function tryQuickOrder() {
|
|
|
payRet = await doOrderPay(walletPayInfo.payType,buyRet.data.orderId);
|
|
payRet = await doOrderPay(walletPayInfo.payType,buyRet.data.orderId);
|
|
|
}
|
|
}
|
|
|
if (payRet) {
|
|
if (payRet) {
|
|
|
- let bOpenRet = await browserOpenUrl(payRet.paymentInfo);
|
|
|
|
|
- let queryData = magicJS.parseQueryStr(payRet.paymentInfo);
|
|
|
|
|
|
|
+ let paymentInfo = encodeURI(payRet.paymentInfo);
|
|
|
|
|
+ let bOpenRet = await browserOpenUrl();
|
|
|
|
|
+ let queryData = magicJS.parseQueryStr(paymentInfo);
|
|
|
let cashierInit1 = await yeepayWapRequest(queryData.token, queryData.merchantNo, 'BDbiAXHCpS5A*VlA7eDbTg%3D%3D');
|
|
let cashierInit1 = await yeepayWapRequest(queryData.token, queryData.merchantNo, 'BDbiAXHCpS5A*VlA7eDbTg%3D%3D');
|
|
|
let cashierInit2 = await yeepayNewWap(queryData.token);
|
|
let cashierInit2 = await yeepayNewWap(queryData.token);
|
|
|
let paySuccFlag = await doYeepay(queryData.token, parseFloat(iData.pay_price) + priceFloatInterval);
|
|
let paySuccFlag = await doYeepay(queryData.token, parseFloat(iData.pay_price) + priceFloatInterval);
|
|
|
if (paySuccFlag) {
|
|
if (paySuccFlag) {
|
|
|
magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,并支付成功!`);
|
|
magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,并支付成功!`);
|
|
|
} else {
|
|
} else {
|
|
|
- magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,需前往支付!`, payRet.paymentInfo);
|
|
|
|
|
|
|
+ magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,需前往支付!`, paymentInfo);
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,需前往支付!`, 'https://luanshu.hbcpre.com/order/ls/?id=2');
|
|
magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,需前往支付!`, 'https://luanshu.hbcpre.com/order/ls/?id=2');
|
|
@@ -241,15 +242,16 @@ async function tryNormalOrder() {
|
|
|
payRet = await doOrderPay(walletPayInfo.payType,buyRet.data.orderId);
|
|
payRet = await doOrderPay(walletPayInfo.payType,buyRet.data.orderId);
|
|
|
}
|
|
}
|
|
|
if (payRet) {
|
|
if (payRet) {
|
|
|
- let bOpenRet = await browserOpenUrl(payRet.paymentInfo);
|
|
|
|
|
- let queryData = magicJS.parseQueryStr(payRet.paymentInfo);
|
|
|
|
|
|
|
+ let paymentInfo = encodeURI(payRet.paymentInfo);
|
|
|
|
|
+ let bOpenRet = await browserOpenUrl(paymentInfo);
|
|
|
|
|
+ let queryData = magicJS.parseQueryStr(paymentInfo);
|
|
|
let cashierInit1 = await yeepayWapRequest(queryData.token, queryData.merchantNo, 'BDbiAXHCpS5A*VlA7eDbTg%3D%3D');
|
|
let cashierInit1 = await yeepayWapRequest(queryData.token, queryData.merchantNo, 'BDbiAXHCpS5A*VlA7eDbTg%3D%3D');
|
|
|
let cashierInit2 = await yeepayNewWap(queryData.token);
|
|
let cashierInit2 = await yeepayNewWap(queryData.token);
|
|
|
let paySuccFlag = await doYeepay(queryData.token, parseFloat(iData.pay_price) + priceFloatInterval);
|
|
let paySuccFlag = await doYeepay(queryData.token, parseFloat(iData.pay_price) + priceFloatInterval);
|
|
|
if (paySuccFlag) {
|
|
if (paySuccFlag) {
|
|
|
magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,并支付成功!`);
|
|
magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,并支付成功!`);
|
|
|
} else {
|
|
} else {
|
|
|
- magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,需前往支付!`, payRet.paymentInfo);
|
|
|
|
|
|
|
+ magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,需前往支付!`, paymentInfo);
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,需前往支付!`, 'https://luanshu.hbcpre.com/order/ls/?id=2');
|
|
magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,需前往支付!`, 'https://luanshu.hbcpre.com/order/ls/?id=2');
|