Merge branch 'master' into reduction

This commit is contained in:
wangsongsole 2024-04-21 14:00:53 +08:00
commit 96de9742d6
13 changed files with 73 additions and 73 deletions

View File

@ -106,7 +106,7 @@ body {
.content .box .g-b-u li { .content .box .g-b-u li {
background-size: 100% 100%; background-size: 100% 100%;
height: 1.16rem; height: 1.16rem;
width: 2rem; width: 1rem;
margin-left: 0.1rem; margin-left: 0.1rem;
} }

View File

@ -587,7 +587,7 @@
window.location.origin + window.location.origin +
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}` `/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(); //判断用户打开链接环境 let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (isWx() || if (isWx() ||
(ua.indexOf("android") > -1 && (ua.indexOf("android") > -1 &&

View File

@ -344,7 +344,7 @@
window.location.origin + window.location.origin +
"/alipay.html?orderNumber=" + res.alipay_order_number "/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) { if (ua.indexOf("micromessenger") > -1 || ua.indexOf("baiduboxapp") > -1 || ua.indexOf("firefox") > -1) {
//在微信内置环境、百度app打开不能唤起支付宝 //在微信内置环境、百度app打开不能唤起支付宝
this.href = link; this.href = link;

View File

@ -232,7 +232,7 @@
} }
let link = let link =
"http://openapi.1688sup.com/alipay/oauth?jump=" + bankLink; "https://openapi.1688sup.com/alipay/oauth?jump=" + bankLink;
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境 let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if ( if (
ua.indexOf("micromessenger") > -1 || ua.indexOf("micromessenger") > -1 ||

View File

@ -621,7 +621,7 @@
window.location.origin + window.location.origin +
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}` `/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(); //判断用户打开链接环境 let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (isWx() || if (isWx() ||
(ua.indexOf("android") > -1 && (ua.indexOf("android") > -1 &&

View File

@ -223,7 +223,7 @@
data.order_number data.order_number
); );
let link = let link =
"http://openapi.1688sup.com/alipay/oauth?jump=" + bankLink; "https://openapi.1688sup.com/alipay/oauth?jump=" + bankLink;
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境 let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if ( if (
ua.indexOf("micromessenger") > -1 || ua.indexOf("micromessenger") > -1 ||

View File

@ -331,7 +331,7 @@
window.location.origin + window.location.origin +
"/packkey/alipay.html?orderNumber=" + this.orderId "/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(); //判断用户打开链接环境 let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (ua.indexOf("micromessenger") > -1 || ua.indexOf("baiduboxapp") > -1 || ua.indexOf("firefox") > -1) { if (ua.indexOf("micromessenger") > -1 || ua.indexOf("baiduboxapp") > -1 || ua.indexOf("firefox") > -1) {
//复制链接地址,提醒去浏览器打开 //复制链接地址,提醒去浏览器打开

View File

@ -604,7 +604,7 @@
window.location.origin + window.location.origin +
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}` `/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(); //判断用户打开链接环境 let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (isWx() || if (isWx() ||
(ua.indexOf("android") > -1 && (ua.indexOf("android") > -1 &&

View File

@ -603,7 +603,7 @@
window.location.origin + window.location.origin +
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}` `/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(); //判断用户打开链接环境 let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (isWx() || if (isWx() ||
(ua.indexOf("android") > -1 && (ua.indexOf("android") > -1 &&

View File

@ -164,7 +164,7 @@
window.location.origin + window.location.origin +
"/alipay.html?orderNumber=" + this.orderId "/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(); //判断用户打开链接环境 let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
/* 判断如果是微信浏览器或者百度浏览器 则无法拉起支付宝 */ /* 判断如果是微信浏览器或者百度浏览器 则无法拉起支付宝 */
if (ua.match(/MicroMessenger/i) == "micromessenger" || ua.indexOf("baiduboxapp") > -1 || ua.indexOf("firefox") > -1) { if (ua.match(/MicroMessenger/i) == "micromessenger" || ua.indexOf("baiduboxapp") > -1 || ua.indexOf("firefox") > -1) {

View File

@ -321,7 +321,7 @@
window.location.origin + window.location.origin +
"/alipay.html?orderNumber=" + this.orderId "/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(); //判断用户打开链接环境 let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (ua.indexOf("micromessenger") > -1 || ua.indexOf("baiduboxapp") > -1 || ua.indexOf("firefox") > -1) { if (ua.indexOf("micromessenger") > -1 || ua.indexOf("baiduboxapp") > -1 || ua.indexOf("firefox") > -1) {
//复制链接地址,提醒去浏览器打开 //复制链接地址,提醒去浏览器打开

View File

@ -566,7 +566,7 @@
window.location.origin + window.location.origin +
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}` `/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(); //判断用户打开链接环境 let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (isWx() || if (isWx() ||
(ua.indexOf("android") > -1 && (ua.indexOf("android") > -1 &&

View File

@ -566,7 +566,7 @@
window.location.origin + window.location.origin +
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}` `/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(); //判断用户打开链接环境 let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (isWx() || if (isWx() ||
(ua.indexOf("android") > -1 && (ua.indexOf("android") > -1 &&