瀏覽代碼

Revert "feat: 用户登录使用mock api, 可以使用test用户登录 (#233)"

xiaoxian521 3 年之前
父節點
當前提交
91df7349f4
共有 5 個文件被更改,包括 14 次插入48 次删除
  1. 0 23
      mock/user.ts
  2. 2 2
      src/layout/hooks/nav.ts
  3. 1 4
      src/store/modules/permission.ts
  4. 5 5
      src/store/modules/user.ts
  5. 6 14
      src/views/login.vue

+ 0 - 23
mock/user.ts

@@ -1,23 +0,0 @@
-import { MockMethod } from "vite-plugin-mock";
-
-export default [
-  {
-    url: "/login",
-    method: "post",
-    response: ({ body }) => {
-      if (body.username === "admin") {
-        return {
-          username: "admin",
-          expires: 24 * 60 * 60,
-          accessToken: "eyJhbGciOiJIUzUxMiJ9.admin"
-        };
-      } else {
-        return {
-          username: "test",
-          expires: 24 * 60 * 60,
-          accessToken: "eyJhbGciOiJIUzUxMiJ9.test"
-        };
-      }
-    }
-  }
-] as MockMethod[];

+ 2 - 2
src/layout/hooks/nav.ts

@@ -7,7 +7,6 @@ import { remainingPaths } from "/@/router";
 import { transformI18n } from "/@/plugins/i18n";
 import { storageSession } from "/@/utils/storage";
 import { useAppStoreHook } from "/@/store/modules/app";
-import { useUserStoreHook } from "/@/store/modules/user";
 import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
 
 export function useNav() {
@@ -39,7 +38,8 @@ export function useNav() {
 
   // 退出登录
   function logout() {
-    useUserStoreHook().logOut();
+    storageSession.removeItem("info");
+    router.push("/login");
   }
 
   function backHome() {

+ 1 - 4
src/store/modules/permission.ts

@@ -61,11 +61,8 @@ export const usePermissionStore = defineStore({
           break;
       }
     },
-    // 清空缓存
+    // 清空缓存页面
     clearAllCachePage() {
-      this.wholeMenus = [];
-      this.menusTree = [];
-      this.buttonAuth = [];
       this.cachePageList = [];
     }
   }

+ 5 - 5
src/store/modules/user.ts

@@ -33,12 +33,12 @@ export const useUserStore = defineStore({
     },
     // 登入
     async loginByUsername(data) {
-      return new Promise((resolve, reject) => {
+      return new Promise<void>((resolve, reject) => {
         getLogin(data)
-          .then(res => {
-            if (res) {
-              setToken(res);
-              resolve(res);
+          .then(data => {
+            if (data) {
+              setToken(data);
+              resolve();
             }
           })
           .catch(error => {

+ 6 - 14
src/views/login.vue

@@ -14,9 +14,6 @@ import illustration4 from "/@/assets/login/illustration4.svg?component";
 import illustration5 from "/@/assets/login/illustration5.svg?component";
 import illustration6 from "/@/assets/login/illustration6.svg?component";
 
-import { useUserStoreHook } from "/@/store/modules/user";
-import { usePermissionStoreHook } from "/@/store/modules/permission";
-
 const router = useRouter();
 
 // eslint-disable-next-line vue/return-in-computed-property
@@ -45,17 +42,12 @@ let user = ref("admin");
 let pwd = ref("123456");
 
 const onLogin = (): void => {
-  useUserStoreHook()
-    .loginByUsername({ username: user.value, password: pwd.value })
-    .then(async (res: any) => {
-      storageSession.setItem("info", {
-        username: res.username,
-        accessToken: res.accessToken
-      });
-      usePermissionStoreHook().clearAllCachePage();
-      initRouter(res.username);
-      router.push("/");
-    });
+  storageSession.setItem("info", {
+    username: "admin",
+    accessToken: "eyJhbGciOiJIUzUxMiJ9.test"
+  });
+  initRouter("admin").then(() => {});
+  router.push("/");
 };
 
 function onUserFocus() {