Merge branch 'startLogin'

public/version.json

@@ -1 +1 @@
-{"version":1693991438254}
+{ "version": 1693981261395 }

src/components/RouterError/index.tsx

@@ -1,6 +1,6 @@
 import { NButton, NModal, NSpace, useDialog } from 'naive-ui';
 import { defineComponent, onBeforeUnmount, ref } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import downBg from './images/downBg.png'
 import rocketIcon from './images/rocketIcon.png'
 import styles from './index.module.less'
@@ -12,6 +12,7 @@ export default defineComponent({
     const dialog = useDialog();
     let refreshing = false;
     const showModalMask = ref(false)
+    const route = useRoute()
     const isChromeError = (error:any)=>{
       const str = error.message + '';
       const isChunkLoadFailed = str.indexOf('imported');
@@ -19,8 +20,10 @@ export default defineComponent({
         refreshing = true;
         // console.log('onError刷新');
         sessionStorage.setItem('isRouter','true')
+
         console.log('浏览器缓存===>')
-          showModalMask.value = true;
+        reloadPage()
+          // showModalMask.value = true;
           // router.push(to.path)
 
         // setTimeout(()=>{
@@ -39,12 +42,8 @@ export default defineComponent({
         refreshing = true;
         console.log('onError刷新');
         sessionStorage.setItem('isRouter','true')
-          showModalMask.value = true;
-          router.push(to.path)
-
-        // setTimeout(()=>{
-        //   sessionStorage.removeItem('isRouter')
-        // },60000)
+          // showModalMask.value = true;
+          // router.push(to.path)
       }
     });
     router.beforeEach(async (to, from, next) => {
@@ -88,7 +87,7 @@ export default defineComponent({
 
 
         navigator.serviceWorker.addEventListener('controllerchange', () => {
-          console.log('controllerchange刷新');
+          console.log('controllerchange刷新' ,console.log(route.path));
           if (refreshing) {
             return;
           }

src/views/login/index.tsx

@@ -137,6 +137,7 @@ export default defineComponent({
         </div>
         <div class={styles['view-account-form']}>
           <img class={styles.colLogo} src={colLogo}></img>
+          20:09!
           {isForgot.value ? (
             <NTabs
               key="forgotPassword"