mo hai 1 ano
pai
achega
eb271088b1

+ 1 - 4
dev-dist/registerSW.js

@@ -1,5 +1,2 @@
 if ('serviceWorker' in navigator)
-  navigator.serviceWorker.register(`/dev-sw.js?dev-sw${new Date().getTime()}`, {
-    scope: '/',
-    type: 'classic'
-  });
+  navigator.serviceWorker.register('/dev-sw.js?dev-sw');

+ 2 - 2
dev-dist/sw.js

@@ -79,10 +79,10 @@ define(['./workbox-5357ef54'], (function (workbox) { 'use strict';
    */
   workbox.precacheAndRoute([{
     "url": "registerSW.js",
-    "revision": "6137f3202e711e407da62c90631d3729"
+    "revision": "2ef9ea5f8ce5b3efb031d9c53700e57a"
   }, {
     "url": "index.html",
-    "revision": "0.78n63d427ro"
+    "revision": "0.f2qovfbkdhg"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

+ 1 - 1
src/components/layout/layoutTop.tsx

@@ -82,7 +82,7 @@ export default defineComponent({
               previewDisabled></NImage>
             <p>
               {/* {info.value.schoolInfos[0].tenantName} |{' '} */}
-              {info.value.schoolInfos[0].name}
+              {info.value?.schoolInfos[0]?.name || ''}
             </p>
           </div>
           <div class={styles.layoutRight}>

+ 0 - 1
src/views/home/index.tsx

@@ -820,7 +820,6 @@ export default defineComponent({
               // 密码更新成功
               showUpdatePassword.value = true;
               forms.showGuide = true;
-
               userStore.logout().then(() => {
                 // 移除标签页
                 router

+ 5 - 4
src/views/login/components/pwdLogin.tsx

@@ -78,11 +78,12 @@ export default defineComponent({
 
             // route.query?.redirect ||
             const toPath = decodeURIComponent('/' as string);
-
+            console.log(toPath,'toPath')
             message.success('登录成功,即将进入系统');
-            if (route.name === LOGIN_NAME) {
-              router.replace('/');
-            } else router.replace(toPath);
+            router.replace(toPath)
+            // if (route.name === LOGIN_NAME) {
+            //   router.replace('/');
+            // } else router.replace(toPath);
           } catch (e: any) {
             console.log(e, 'e');
           } finally {