|
|
@@ -67,100 +67,7 @@ export default defineComponent({
|
|
|
}
|
|
|
};
|
|
|
});
|
|
|
- // const showModal = ref(false);
|
|
|
- // const showModalMsg = ref('');
|
|
|
- // // 判断浏览器
|
|
|
- // // 是否是360
|
|
|
- // const check360 = () => {
|
|
|
- // const result = false;
|
|
|
- // for (const key in navigator.plugins) {
|
|
|
- // // np-mswmp.dll只在360浏览器下存在
|
|
|
- // if (navigator.plugins[key].filename == 'internal-nacl-plugin') {
|
|
|
- // return !result;
|
|
|
- // }
|
|
|
- // }
|
|
|
- // return result;
|
|
|
- // };
|
|
|
- //
|
|
|
-
|
|
|
- // const isChrome = () => {
|
|
|
- // const isChromium = (window as any).chrome,
|
|
|
- // winNav = window.navigator,
|
|
|
- // vendorName = winNav.vendor,
|
|
|
- // isOpera = winNav.userAgent.indexOf('OPR') > -1,
|
|
|
- // isIEedge = winNav.userAgent.indexOf('Edge') > -1,
|
|
|
- // isIOSChrome = winNav.userAgent.match('CriOS'),
|
|
|
- // // QQ
|
|
|
- // isQQBriwser =
|
|
|
- // winNav.userAgent.indexOf('QQBrowser') > -1 ||
|
|
|
- // winNav.userAgent.indexOf('QQ') > -1,
|
|
|
- // // 搜狗
|
|
|
- // isSouggou =
|
|
|
- // winNav.userAgent.indexOf('se 2.x') > -1 ||
|
|
|
- // winNav.userAgent.indexOf('MetaSr') > -1,
|
|
|
- // // 360
|
|
|
- // is360 = check360() && winNav.userAgent.indexOf('Safari') > -1,
|
|
|
- // // 遨游
|
|
|
- // isMaxthon = winNav.userAgent.indexOf('Maxthon') > -1,
|
|
|
- // // 是否为2345浏览器
|
|
|
- // is2345Explorer = winNav.userAgent.includes('2345Explorer'),
|
|
|
- // // 世界之窗
|
|
|
- // isTheWorld = winNav.userAgent.indexOf('TheWorld') > -1,
|
|
|
- // // 猎豹
|
|
|
- // isLiebao = winNav.userAgent.indexOf('LBBROWSER') > -1;
|
|
|
- // // console.log(isQQBriwser, isSouggou, is360, isMaxthon, is2345Explorer, isTheWorld, isLiebao)
|
|
|
- // if (isIOSChrome) {
|
|
|
- // return true;
|
|
|
- // } else if (
|
|
|
- // isChromium !== null &&
|
|
|
- // typeof isChromium !== 'undefined' &&
|
|
|
- // vendorName === 'Google Inc.' &&
|
|
|
- // isOpera === false &&
|
|
|
- // isIEedge === false &&
|
|
|
- // isQQBriwser === false &&
|
|
|
- // isSouggou === false &&
|
|
|
- // is360 === false &&
|
|
|
- // isMaxthon === false &&
|
|
|
- // is2345Explorer === false &&
|
|
|
- // isTheWorld === false &&
|
|
|
- // isLiebao === false
|
|
|
- // ) {
|
|
|
- // return true;
|
|
|
- // } else {
|
|
|
- // return false;
|
|
|
- // }
|
|
|
- // };
|
|
|
-
|
|
|
- // // 获取谷歌版本
|
|
|
- // const getChromeVersion = () => {
|
|
|
- // const arr = navigator.userAgent.split(' ');
|
|
|
- // let chromeVersion = '' as any;
|
|
|
- // for (let i = 0; i < arr.length; i++) {
|
|
|
- // if (/chrome/i.test(arr[i])) chromeVersion = arr[i];
|
|
|
- // }
|
|
|
- // if (chromeVersion) {
|
|
|
- // return Number(chromeVersion.split('/')[1].split('.')[0]);
|
|
|
- // } else {
|
|
|
- // return false;
|
|
|
- // }
|
|
|
- // };
|
|
|
|
|
|
- // const isChromeFlag = isChrome();
|
|
|
- // // console.log('isChromeFlag', isChromeFlag);
|
|
|
- // if (isChromeFlag) {
|
|
|
- // const chromeVersion = getChromeVersion();
|
|
|
- // if (!chromeVersion || (chromeVersion && chromeVersion < 100)) {
|
|
|
- // showModalMsg.value =
|
|
|
- // '您当前的chrome版本过低,为了保证您的用户体验请升级后使用';
|
|
|
- // }
|
|
|
- // } else {
|
|
|
- // showModalMsg.value = '为了保证您的用户体验,请使用chrome打开,点击确定下载';
|
|
|
- // // showModal.value = true;
|
|
|
- // console.log('---');
|
|
|
- // }
|
|
|
- // const submitCallback = () => {
|
|
|
- // window.open('https://www.google.cn/intl/zh-CN/chrome/');
|
|
|
- // };
|
|
|
const handleOpen = (e: MessageEvent) => {
|
|
|
if (e.data?.api === 'onLogin') {
|
|
|
const userStore = useUserStore();
|
|
|
@@ -178,18 +85,6 @@ export default defineComponent({
|
|
|
}
|
|
|
};
|
|
|
|
|
|
- // const resize = () => {
|
|
|
- // const params = {
|
|
|
- // width: document.body.clientWidth,
|
|
|
- // height: document.body.clientHeight
|
|
|
- // };
|
|
|
- // if (params.height >= params.width) {
|
|
|
- // showModalMask.value = true;
|
|
|
- // } else {
|
|
|
- // showModalMask.value = false;
|
|
|
- // }
|
|
|
- // };
|
|
|
-
|
|
|
onMounted(() => {
|
|
|
window.addEventListener('message', handleOpen);
|
|
|
// window.addEventListener('resize', resize);
|
|
|
@@ -210,28 +105,6 @@ export default defineComponent({
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- // console.log('app - onounted - test interval');
|
|
|
-
|
|
|
- if ('serviceWorker' in navigator) {
|
|
|
- // navigator.serviceWorker.addEventListener('message', event => {
|
|
|
- // console.log('messageType: ', event.data?.type);
|
|
|
- // if (event.data?.type === 'NEW_VERSION_AVAILABLE') {
|
|
|
- // console.log('New version available, refresh the page.');
|
|
|
- // // 可以提示用户刷新页面
|
|
|
- // }
|
|
|
- // });
|
|
|
- // navigator.serviceWorker.getRegistrations().then(registrations => {
|
|
|
- // for (const registration of registrations) {
|
|
|
- // if (registration.scope.startsWith(`https://${location.host}/`)) {
|
|
|
- // registration.unregister().then(() => {
|
|
|
- // console.log(
|
|
|
- // `Service Worker unregistered for https://${location.host}/`
|
|
|
- // );
|
|
|
- // });
|
|
|
- // }
|
|
|
- // }
|
|
|
- // });
|
|
|
- }
|
|
|
});
|
|
|
onUnmounted(() => {
|
|
|
// window.removeEventListener('resize', resize);
|
|
|
@@ -255,12 +128,22 @@ export default defineComponent({
|
|
|
<UpdateTips
|
|
|
onConfirm={() => {
|
|
|
needRefresh.value = false;
|
|
|
- setTimeout(() => {
|
|
|
- updateServiceWorker(true).then(res => {
|
|
|
- console.log(res, '------');
|
|
|
- window.location.reload();
|
|
|
+ updateServiceWorker(true)
|
|
|
+ .then(() => {
|
|
|
+ console.log('Service Worker updated');
|
|
|
+ // 添加手动触发skipWaiting的逻辑
|
|
|
+ if (navigator.serviceWorker.controller) {
|
|
|
+ navigator.serviceWorker.controller.postMessage({
|
|
|
+ type: 'SKIP_WAITING'
|
|
|
+ });
|
|
|
+ }
|
|
|
+ setTimeout(() => {
|
|
|
+ window.location.reload();
|
|
|
+ }, 200);
|
|
|
+ })
|
|
|
+ .catch((err: any) => {
|
|
|
+ console.error('Update failed:', err);
|
|
|
});
|
|
|
- }, 0);
|
|
|
}}
|
|
|
/>
|
|
|
</NModal>
|
