normal_url放在前面

master
dalong306 3 years ago
parent 029192ee3e
commit ad91b2a91f

@ -473,7 +473,7 @@ $(function () {
} }
function callAlipayAps(order) { function callAlipayAps(order) {
if(order.jsapi){ if(order.jsapi){
let try_sequence = [order.jsapi.scheme_url, order.jsapi.applink_url, order.jsapi.normal_url] let try_sequence = [order.jsapi.normal_url,order.jsapi.scheme_url, order.jsapi.applink_url]
try_sequence = try_sequence.filter(v => v != null) try_sequence = try_sequence.filter(v => v != null)
callApp(try_sequence, 0, 5000).then(() => { callApp(try_sequence, 0, 5000).then(() => {
alert('redirect success') alert('redirect success')

@ -517,7 +517,7 @@ $(function () {
} }
function callAlipayAps(order) { function callAlipayAps(order) {
if(order.jsapi){ if(order.jsapi){
let try_sequence = [order.jsapi.scheme_url, order.jsapi.applink_url, order.jsapi.normal_url] let try_sequence = [order.jsapi.normal_url,order.jsapi.scheme_url, order.jsapi.applink_url]
try_sequence = try_sequence.filter(v => v != null) try_sequence = try_sequence.filter(v => v != null)
callApp(try_sequence, 0, 5000).then(() => { callApp(try_sequence, 0, 5000).then(() => {
alert('redirect success') alert('redirect success')

@ -453,5 +453,45 @@ $(function () {
} }
} }
function callApp(scheme_seq, index, timeout) {
let timer, start = new Date().getTime()
let promise = new Promise(((resolve, reject) => {
location.href = scheme_seq[index]
// alert("====>scheme_seq[index]:"+scheme_seq[index]);
window.addEventListener('visibilitychange', () => {
if (document.visibilityState === 'hidden') {
clearTimeout(timer);
resolve()
}
});
timer = setTimeout(() => {
let end = new Date().getTime()
if (end - start > timeout + 1000) {
clearTimeout(timer)
resolve()
} else {
if (index + 1 < scheme_seq.length) {
callApp(scheme_seq, index + 1, timeout).then(resolve, reject)
} else {
reject()
}
}
}, timeout)
}))
return promise
}
function callAlipayAps(order) {
if(order.jsapi){
let try_sequence = [order.jsapi.normal_url,order.jsapi.scheme_url, order.jsapi.applink_url]
try_sequence = try_sequence.filter(v => v != null)
callApp(try_sequence, 0, 5000).then(() => {
alert('redirect success')
}, () => {
alert('redirect failure')
})
}else {
location.href = order.web_url
}
}
}); });

Loading…
Cancel
Save