Merge remote-tracking branch 'origin/1.0.0_RBAC' into 1.0.0_RBAC

src/layout/components/NavBar/NavRight.vue

@@ -35,7 +35,8 @@
           <el-dropdown-item>{{ $t("navbar.document") }}</el-dropdown-item>
         </a>
         <el-dropdown-item divided @click="logout">
-          {{ $t("navbar.logout") }}
+          <!--          {{ $t("navbar.logout") }}-->
+          退出
         </el-dropdown-item>
       </el-dropdown-menu>
     </template>

src/store/modules/user.ts

@@ -9,7 +9,7 @@ import { store } from "@/store";
 import { LoginData } from "@/api/auth/types";
 import { UserInfo } from "@/api/user/types";
 
-import { getToken, setToken } from "@/utils/auth";
+import { getToken, setToken, removeToken } from "@/utils/auth";
 import { ref } from "vue";
 import { isBoolean } from "lodash";
 const Layout = () => import("@/layout/index.vue");
@@ -82,6 +82,7 @@ export const useUserStore = defineStore("user", () => {
     return new Promise<void>((resolve) => {
       // logoutApi()
       //   .then(() => {
+      removeToken();
       user.token = "";
       user.roles = [];
       user.permissions = [];

src/views/login/index.vue

@@ -358,6 +358,8 @@ function successLogin() {
       router.push({ path: "/system/user", query: otherQueryParams });
     })
     .catch(() => {
+      loading.value = false;
+      verifyFlag.value = false;
       // 验证失败，重新生成验证码
       getCaptcha();
     })