Merge branch 'master' into reduction
This commit is contained in:
commit
96de9742d6
|
@ -106,7 +106,7 @@ body {
|
|||
.content .box .g-b-u li {
|
||||
background-size: 100% 100%;
|
||||
height: 1.16rem;
|
||||
width: 2rem;
|
||||
width: 1rem;
|
||||
margin-left: 0.1rem;
|
||||
}
|
||||
|
||||
|
|
|
@ -587,7 +587,7 @@
|
|||
window.location.origin +
|
||||
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}`
|
||||
);
|
||||
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
|
||||
if (isWx() ||
|
||||
(ua.indexOf("android") > -1 &&
|
||||
|
|
|
@ -344,7 +344,7 @@
|
|||
window.location.origin +
|
||||
"/alipay.html?orderNumber=" + res.alipay_order_number
|
||||
);
|
||||
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + bankLink;
|
||||
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + bankLink;
|
||||
if (ua.indexOf("micromessenger") > -1 || ua.indexOf("baiduboxapp") > -1 || ua.indexOf("firefox") > -1) {
|
||||
//在微信内置环境、百度app打开,不能唤起支付宝
|
||||
this.href = link;
|
||||
|
|
|
@ -232,7 +232,7 @@
|
|||
}
|
||||
|
||||
let link =
|
||||
"http://openapi.1688sup.com/alipay/oauth?jump=" + bankLink;
|
||||
"https://openapi.1688sup.com/alipay/oauth?jump=" + bankLink;
|
||||
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
|
||||
if (
|
||||
ua.indexOf("micromessenger") > -1 ||
|
||||
|
|
|
@ -621,7 +621,7 @@
|
|||
window.location.origin +
|
||||
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}`
|
||||
);
|
||||
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
|
||||
if (isWx() ||
|
||||
(ua.indexOf("android") > -1 &&
|
||||
|
|
|
@ -223,7 +223,7 @@
|
|||
data.order_number
|
||||
);
|
||||
let link =
|
||||
"http://openapi.1688sup.com/alipay/oauth?jump=" + bankLink;
|
||||
"https://openapi.1688sup.com/alipay/oauth?jump=" + bankLink;
|
||||
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
|
||||
if (
|
||||
ua.indexOf("micromessenger") > -1 ||
|
||||
|
|
|
@ -331,7 +331,7 @@
|
|||
window.location.origin +
|
||||
"/packkey/alipay.html?orderNumber=" + this.orderId
|
||||
);
|
||||
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
|
||||
if (ua.indexOf("micromessenger") > -1 || ua.indexOf("baiduboxapp") > -1 || ua.indexOf("firefox") > -1) {
|
||||
//复制链接地址,提醒去浏览器打开
|
||||
|
|
|
@ -604,7 +604,7 @@
|
|||
window.location.origin +
|
||||
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}`
|
||||
);
|
||||
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
|
||||
if (isWx() ||
|
||||
(ua.indexOf("android") > -1 &&
|
||||
|
|
|
@ -603,7 +603,7 @@
|
|||
window.location.origin +
|
||||
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}`
|
||||
);
|
||||
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
|
||||
if (isWx() ||
|
||||
(ua.indexOf("android") > -1 &&
|
||||
|
|
|
@ -164,7 +164,7 @@
|
|||
window.location.origin +
|
||||
"/alipay.html?orderNumber=" + this.orderId
|
||||
);
|
||||
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
|
||||
/* 判断如果是微信浏览器或者百度浏览器 则无法拉起支付宝 */
|
||||
if (ua.match(/MicroMessenger/i) == "micromessenger" || ua.indexOf("baiduboxapp") > -1 || ua.indexOf("firefox") > -1) {
|
||||
|
|
|
@ -321,7 +321,7 @@
|
|||
window.location.origin +
|
||||
"/alipay.html?orderNumber=" + this.orderId
|
||||
);
|
||||
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
|
||||
if (ua.indexOf("micromessenger") > -1 || ua.indexOf("baiduboxapp") > -1 || ua.indexOf("firefox") > -1) {
|
||||
//复制链接地址,提醒去浏览器打开
|
||||
|
|
|
@ -566,7 +566,7 @@
|
|||
window.location.origin +
|
||||
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}`
|
||||
);
|
||||
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
|
||||
if (isWx() ||
|
||||
(ua.indexOf("android") > -1 &&
|
||||
|
|
|
@ -566,7 +566,7 @@
|
|||
window.location.origin +
|
||||
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}`
|
||||
);
|
||||
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
|
||||
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
|
||||
if (isWx() ||
|
||||
(ua.indexOf("android") > -1 &&
|
||||
|
|
Loading…
Reference in New Issue