Merge branch 'startLogin' into jenkins

public/version.json

@@ -1 +1 @@
-{"version":1694154475102}
+{"version":1694154439627}

src/components/RouterError/index.tsx

@@ -44,33 +44,34 @@ export default defineComponent({
     const showModalMask = ref(false)
     const route = useRoute()
 
-    router.onError((error, to, form) => {
-      const str = error.message + '';
-      const isChunkLoadFailed = str.indexOf('imported');
-      console.log(error, to)
-      // const targetPath = router.history.pending.fullPath
-      if (isChunkLoadFailed != -1 && !refreshing) {
-        refreshing = true;
-        console.log('onError刷新');
-        sessionStorage.setItem('isRouter','true')
-          // showModalMask.value = true;
-          // router.push(to.path)
-      }
-    });
+    // router.onError((error, to, form) => {
+    //   const str = error.message + '';
+    //   const isChunkLoadFailed = str.indexOf('imported');
+    //   console.log(error, to)
+    //   // const targetPath = router.history.pending.fullPath
+    //   if (isChunkLoadFailed != -1 && !refreshing) {
+    //     refreshing = true;
+    //     console.log('onError刷新');
+    //     sessionStorage.setItem('isRouter','true')
+    //       // showModalMask.value = true;
+    //       // router.push(to.path)
+    //   }
+    // });
     router.beforeEach(async (to, from, next) => {
       const flag =  await versionCheck()
       console.log('路由之前弹窗',`refreshing${refreshing},flag:${flag}`)
         if(flag&&!refreshing){
           refreshing = true;
-          console.log('修改刷新',refreshing)
+          // console.log('修改刷新',refreshing)
             sessionStorage.setItem('isRouter','true')
-            showModalMask.value = true
-          setTimeout(()=>{
-            if(isError){
-              console.log('二次')
-              reloadPage()
-            }
-          },1000)
+            reloadPage()
+          //   showModalMask.value = true
+          // setTimeout(()=>{
+          //   const dom = document.getElementById('updateModel')
+          //   if(isError&&!dom){
+          //     reloadPage()
+          //   }
+          // },1000)
 
           //   setTimeout(()=>{
           //    sessionStorage.removeItem('isRouter')
@@ -116,7 +117,8 @@ export default defineComponent({
           }
           const isRouter = sessionStorage.getItem('isRouter')
           if(!isRouter){
-            showModalMask.value = true
+            // showModalMask.value = true
+            reloadPage()
           }
           refreshing = true;
 
@@ -152,8 +154,8 @@ const versionCheck = async () => {
 }
 
     return () => <div>
-              <NModal v-model:show={showModalMask.value} mask-closable={false}>
-          <div class={styles.downMove}>
+         <NModal v-model:show={showModalMask.value} mask-closable={false}>
+          <div class={styles.downMove} id='updateModel'>
             <img src={rocketIcon} class={styles.dingPng} alt="" />
             <img src={downBg} class={styles.downMoveBg} alt="" />
             <h2>发现新版本</h2>