@fonixtree/magic-design 1.0.107 → 1.0.109
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/utils/coreUtil.js +4 -2
- package/lib/utils/coreUtil.js +4 -2
- package/package.json +1 -1
package/es/utils/coreUtil.js
CHANGED
|
@@ -337,7 +337,7 @@ var clickUrl = function clickUrl(url, state) {
|
|
|
337
337
|
|
|
338
338
|
if ((0, _androidUtil.browserVersion)().isAshitaApp) {
|
|
339
339
|
(0, _androidUtil.sendToApp)(data);
|
|
340
|
-
} else if ((0, _androidUtil.browserVersion)().isDitoApp && params.link && params.link.startsWith('http')) {
|
|
340
|
+
} else if ((0, _androidUtil.browserVersion)().isDitoApp && params.link && params.link.startsWith('http') && !link.includes('mydito')) {
|
|
341
341
|
// pto 抽奖系统对接
|
|
342
342
|
var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "token=" + (localStorage.getItem('h5Token') || '');
|
|
343
343
|
window.location.href = urlTemp;
|
|
@@ -367,7 +367,9 @@ var clickUrl = function clickUrl(url, state) {
|
|
|
367
367
|
|
|
368
368
|
if (((_a = window === null || window === void 0 ? void 0 : window.magicDesign) === null || _a === void 0 ? void 0 : _a.projectCode) === 'pto') {
|
|
369
369
|
// 输入的是完整的跳转地址 排除掉‘https://www.baidu.com;mydito://BuyLoad’这种情况
|
|
370
|
-
|
|
370
|
+
console.log('link', link, isUrl(link) && !link.includes('mydito'));
|
|
371
|
+
|
|
372
|
+
if (isUrl(link) && !link.includes('mydito')) {
|
|
371
373
|
if (!link.includes(window.location.host)) {
|
|
372
374
|
// 跳转外链 需要把token带上
|
|
373
375
|
if (link.includes('?')) {
|
package/lib/utils/coreUtil.js
CHANGED
|
@@ -337,7 +337,7 @@ var clickUrl = function clickUrl(url, state) {
|
|
|
337
337
|
|
|
338
338
|
if ((0, _androidUtil.browserVersion)().isAshitaApp) {
|
|
339
339
|
(0, _androidUtil.sendToApp)(data);
|
|
340
|
-
} else if ((0, _androidUtil.browserVersion)().isDitoApp && params.link && params.link.startsWith('http')) {
|
|
340
|
+
} else if ((0, _androidUtil.browserVersion)().isDitoApp && params.link && params.link.startsWith('http') && !link.includes('mydito')) {
|
|
341
341
|
// pto 抽奖系统对接
|
|
342
342
|
var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "token=" + (localStorage.getItem('h5Token') || '');
|
|
343
343
|
window.location.href = urlTemp;
|
|
@@ -367,7 +367,9 @@ var clickUrl = function clickUrl(url, state) {
|
|
|
367
367
|
|
|
368
368
|
if (((_a = window === null || window === void 0 ? void 0 : window.magicDesign) === null || _a === void 0 ? void 0 : _a.projectCode) === 'pto') {
|
|
369
369
|
// 输入的是完整的跳转地址 排除掉‘https://www.baidu.com;mydito://BuyLoad’这种情况
|
|
370
|
-
|
|
370
|
+
console.log('link', link, isUrl(link) && !link.includes('mydito'));
|
|
371
|
+
|
|
372
|
+
if (isUrl(link) && !link.includes('mydito')) {
|
|
371
373
|
if (!link.includes(window.location.host)) {
|
|
372
374
|
// 跳转外链 需要把token带上
|
|
373
375
|
if (link.includes('?')) {
|