|
@@ -62,25 +62,25 @@ export default defineComponent({
|
|
}
|
|
}
|
|
});
|
|
});
|
|
router.beforeEach(async (to, from, next) => {
|
|
router.beforeEach(async (to, from, next) => {
|
|
- const flag = await versionCheck();
|
|
|
|
- console.log('路由之前弹窗', `refreshing${refreshing},flag:${flag}`);
|
|
|
|
- if (flag && !refreshing) {
|
|
|
|
- refreshing = true;
|
|
|
|
- // console.log('修改刷新',refreshing)
|
|
|
|
- sessionStorage.setItem('isRouter', 'true');
|
|
|
|
- // reloadPage();
|
|
|
|
- // showModalMask.value = true
|
|
|
|
- // setTimeout(()=>{
|
|
|
|
- // const dom = document.getElementById('updateModel')
|
|
|
|
- // if(isError&&!dom){
|
|
|
|
- // reloadPage()
|
|
|
|
- // }
|
|
|
|
- // },1000)
|
|
|
|
|
|
+ // const flag = await versionCheck();
|
|
|
|
+ // console.log('路由之前弹窗', `refreshing${refreshing},flag:${flag}`);
|
|
|
|
+ // if (flag && !refreshing) {
|
|
|
|
+ // refreshing = true;
|
|
|
|
+ // // console.log('修改刷新',refreshing)
|
|
|
|
+ // sessionStorage.setItem('isRouter', 'true');
|
|
|
|
+ // // reloadPage();
|
|
|
|
+ // // showModalMask.value = true
|
|
|
|
+ // // setTimeout(()=>{
|
|
|
|
+ // // const dom = document.getElementById('updateModel')
|
|
|
|
+ // // if(isError&&!dom){
|
|
|
|
+ // // reloadPage()
|
|
|
|
+ // // }
|
|
|
|
+ // // },1000)
|
|
|
|
|
|
- // setTimeout(()=>{
|
|
|
|
- // sessionStorage.removeItem('isRouter')
|
|
|
|
- // },60000)
|
|
|
|
- }
|
|
|
|
|
|
+ // // setTimeout(()=>{
|
|
|
|
+ // // sessionStorage.removeItem('isRouter')
|
|
|
|
+ // // },60000)
|
|
|
|
+ // }
|
|
next();
|
|
next();
|
|
});
|
|
});
|
|
const checkNewVersion = async () => {
|
|
const checkNewVersion = async () => {
|
|
@@ -107,27 +107,27 @@ export default defineComponent({
|
|
|
|
|
|
// 尝试监听install
|
|
// 尝试监听install
|
|
|
|
|
|
- navigator.serviceWorker.addEventListener(
|
|
|
|
- 'controllerchange',
|
|
|
|
- async () => {
|
|
|
|
- console.log('controllerchange刷新', route.path, 'path');
|
|
|
|
- const flag = await versionCheck();
|
|
|
|
- if (refreshing || route.path == '/attend-class' || !flag) {
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- const isRouter = sessionStorage.getItem('isRouter');
|
|
|
|
- if (!isRouter) {
|
|
|
|
- // showModalMask.value = true
|
|
|
|
- // reloadPage();
|
|
|
|
- }
|
|
|
|
- refreshing = true;
|
|
|
|
- }
|
|
|
|
- );
|
|
|
|
|
|
+ // navigator.serviceWorker.addEventListener(
|
|
|
|
+ // 'controllerchange',
|
|
|
|
+ // async () => {
|
|
|
|
+ // console.log('controllerchange刷新', route.path, 'path');
|
|
|
|
+ // const flag = await versionCheck();
|
|
|
|
+ // if (refreshing || route.path == '/attend-class' || !flag) {
|
|
|
|
+ // return;
|
|
|
|
+ // }
|
|
|
|
+ // const isRouter = sessionStorage.getItem('isRouter');
|
|
|
|
+ // if (!isRouter) {
|
|
|
|
+ // // showModalMask.value = true
|
|
|
|
+ // // reloadPage();
|
|
|
|
+ // }
|
|
|
|
+ // refreshing = true;
|
|
|
|
+ // }
|
|
|
|
+ // );
|
|
}
|
|
}
|
|
};
|
|
};
|
|
|
|
|
|
console.log(route.path, 'route.path');
|
|
console.log(route.path, 'route.path');
|
|
- checkNewVersion();
|
|
|
|
|
|
+ // checkNewVersion();
|
|
onBeforeUnmount(() => {
|
|
onBeforeUnmount(() => {
|
|
sessionStorage.removeItem('isRouter');
|
|
sessionStorage.removeItem('isRouter');
|
|
window.removeEventListener('error', isChromeError);
|
|
window.removeEventListener('error', isChromeError);
|