Merge branch 'feature-main' into test
This commit is contained in:
commit
9dbe5f385f
|
@ -30,7 +30,7 @@ export async function channelJudge (channel: number, mode: number, judgeData?: a
|
|||
if (channel === 1 && mode === 1) { // 支付宝-官方领取 区分商品类型:1 红包 支付宝小程序;3 立减金 支付宝授权
|
||||
const ua = navigator.userAgent.toLowerCase();
|
||||
if (type === 1) {
|
||||
const aliPaysUrl = `${zfbAuthMiniUrl}&page=pages/exchange/exchange?key=${encodeURIComponent(window.btoa(localStorage.getItem('key') || ''))}?ids=${encodeURIComponent(window.btoa(JSON.stringify(idNew)))}`;
|
||||
const aliPaysUrl = `${zfbAuthMiniUrl}&page=pages/exchange/exchange?key=${encodeURIComponent(window.btoa(localStorage.getItem('key') || ''))}&ids=${encodeURIComponent(window.btoa(JSON.stringify(idNew)))}`;
|
||||
if (isWx|| (ua.indexOf("android") > -1 && ua.indexOf("baiduboxapp") > -1) || ua.indexOf("windows") > -1) {
|
||||
showConfirmDialog({
|
||||
confirmButtonText: '复制',
|
||||
|
|
Loading…
Reference in New Issue