From 4b2c984f257b232b911b4dada3f9782feb2d012f Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期三, 07 八月 2024 17:06:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web
---
src/router/guard/userLoginInfo.ts | 62 ++++++++++----------
src/views/login/components/login-form.vue | 60 ++++++++-----------
2 files changed, 57 insertions(+), 65 deletions(-)
diff --git a/src/router/guard/userLoginInfo.ts b/src/router/guard/userLoginInfo.ts
index 8facaf8..876976d 100644
--- a/src/router/guard/userLoginInfo.ts
+++ b/src/router/guard/userLoginInfo.ts
@@ -9,36 +9,36 @@
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,
+ // });
+ // }
});
}
diff --git a/src/views/login/components/login-form.vue b/src/views/login/components/login-form.vue
index 5519dfd..0b874fe 100644
--- a/src/views/login/components/login-form.vue
+++ b/src/views/login/components/login-form.vue
@@ -133,44 +133,36 @@
<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;
+ }
-&
--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;
+ }
-&
--sub-title {
- color: var(--color-text-3);
- font-size: 16px;
- line-height: 24px;
-}
+&-error-msg {
+ height: 32px;
+ color: rgb(var(--red-6));
+ line-height: 32px;
+ }
-&
--error-msg {
- height: 32px;
- color: rgb(var(--red-6));
- line-height: 32px;
-}
+&-password-actions {
+ display: flex;
+ justify-content: space-between;
+ }
-&
--password-actions {
- display: flex;
- justify-content: space-between;
-}
-
-&
--register-btn {
- color: var(--color-text-3) !important;
-}
-
+&-register-btn {
+ color: var(--color-text-3) !important;
+ }
}
</style>
--
Gitblit v1.8.0