Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web

src/router/guard/userLoginInfo.ts

@@ -9,36 +9,36 @@ export default function setupUserLoginInfoGuard(router: Router) {
     NProgress.start();
     const userStore = useUserStore();
     next();
-    if (isLogin()) {
-      if (userStore.role) {
-        next();
-      } else {
-        try {
-          await userStore.info();
-          next();
-        } catch (error) {
-          await userStore.logout();
-          next({
-            name: 'login',
-            query: {
-              redirect: to.name,
-              ...to.query,
-            } as LocationQueryRaw,
-          });
-        }
-      }
-    } else {
-      if (to.name === 'login') {
-        next();
-        return;
-      }
-      next({
-        name: 'login',
-        query: {
-          redirect: to.name,
-          ...to.query,
-        } as LocationQueryRaw,
-      });
-    }
+    // if (isLogin()) {
+    //   if (userStore.role) {
+    //     next();
+    //   } else {
+    //     try {
+    //       await userStore.info();
+    //       next();
+    //     } catch (error) {
+    //       await userStore.logout();
+    //       next({
+    //         name: 'login',
+    //         query: {
+    //           redirect: to.name,
+    //           ...to.query,
+    //         } as LocationQueryRaw,
+    //       });
+    //     }
+    //   }
+    // } else {
+    //   if (to.name === 'login') {
+    //     next();
+    //     return;
+    //   }
+    //   next({
+    //     name: 'login',
+    //     query: {
+    //       redirect: to.name,
+    //       ...to.query,
+    //     } as LocationQueryRaw,
+    //   });
+    // }
   });
 }

src/views/login/components/login-form.vue

@@ -133,44 +133,36 @@ const setRememberPassword = (value: boolean) => {
 
 <style lang="less" scoped>
 .login-form {
+&-wrapper {
+   width: 320px;
+ }
 
-&
--wrapper {
-  width: 320px;
-}
-
-&
--title {
-  color: var(--color-text-1);
-  font-weight: 500;
-  font-size: 24px;
-  line-height: 32px;
-}
-
-&
--sub-title {
-  color: var(--color-text-3);
-  font-size: 16px;
-  line-height: 24px;
-}
+&-title {
+   color: var(--color-text-1);
+   font-weight: 500;
+   font-size: 24px;
+   line-height: 32px;
+ }
 
-&
--error-msg {
-  height: 32px;
-  color: rgb(var(--red-6));
-  line-height: 32px;
-}
+&-sub-title {
+   color: var(--color-text-3);
+   font-size: 16px;
+   line-height: 24px;
+ }
 
-&
--password-actions {
-  display: flex;
-  justify-content: space-between;
-}
+&-error-msg {
+   height: 32px;
+   color: rgb(var(--red-6));
+   line-height: 32px;
+ }
 
-&
--register-btn {
-  color: var(--color-text-3) !important;
-}
+&-password-actions {
+   display: flex;
+   justify-content: space-between;
+ }
 
+&-register-btn {
+   color: var(--color-text-3) !important;
+ }
 }
 </style>