Merge branch 'develop'

master
taylor.dang 6 years ago
commit 6e3309768e

@ -55,7 +55,7 @@ app.agreetemplate.classic.path=https://file.royalpay.com.au/open/2017/07/10/1499
##聚合支付合同模板
#app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2017/11/10/1510280089107_D7CMUz4S1iwBI9IPj5P6ItkiGClmPK.pdf
#app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2017/11/17/1510890355946_hQt6yGc0NJ8TYeK7XCuuSAnTI31M7v.pdf
app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2019/02/12/1549943852025_DdxT22jpvrdJRaJuQR1S6OGubCXEyW.pdf
app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2019/02/12/1549950518019_vW4tU5t6D6yA0wMSDNBB9G195W3g99.pdf
app.host.main=http://192.168.0.85:9002/
app.host.regions.cn=https://mpay-cn.royalpay.com.au/

@ -49,7 +49,7 @@ $(document).ready(function () {
dataType: 'json',
success: function (pay) {
if (pay.direct_paid) {
location.href = window.redirect + (window.redirect.indexOf('?') < 0 ? '?' : '&') + 'success=true';
startCheckOrder(window.client_moniker, window.merchant_orderid);
return;
}
if (window.AlipayJSBridge) {
@ -114,7 +114,7 @@ $(document).ready(function () {
dataType: 'json',
success: function (res) {
if (res.paid) {
location.href = window.redirect + (window.redirect.indexOf('?') < 0 ? '?' : '&') + 'success=true';
location.href = window.redirect + (window.redirect.indexOf('?') < 0 ? '?' : '&') + 'success=true&time=' + res.time + '&nonce_str=' + res.nonce_str + '&sign=' + res.sign;
} else {
setTimeout(checkOrderStd, 500);
}

@ -54,7 +54,7 @@ $(document).ready(function () {
}
if (pay.direct_paid) {
dataCache.paying = false;
location.href = window.redirect + (window.redirect.indexOf('?') < 0 ? '?' : '&') + 'success=true';
startCheckOrder(window.client_moniker, window.merchant_orderid);
}
var paydata = pay.jsapi;
invokePay(paydata);
@ -109,7 +109,7 @@ $(document).ready(function () {
dataType: 'json',
success: function (res) {
if (res.paid) {
location.href = window.redirect + (window.redirect.indexOf('?') < 0 ? '?' : '&') + 'success=true';
location.href = window.redirect + (window.redirect.indexOf('?') < 0 ? '?' : '&') + 'success=true&time=' + res.time + '&nonce_str=' + res.nonce_str + '&sign=' + res.sign;;
} else {
setTimeout(checkOrderStd, 500);
}

Loading…
Cancel
Save