diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index 987602a..2644aef 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -1,8 +1,8 @@ +import { defineStore } from "pinia"; import { type appType, store, getConfig, - defineStore, storageLocal, deviceDetection, responsiveStorageNameSpace diff --git a/src/store/modules/epTheme.ts b/src/store/modules/epTheme.ts index 48962d1..fa73eff 100644 --- a/src/store/modules/epTheme.ts +++ b/src/store/modules/epTheme.ts @@ -1,7 +1,7 @@ +import { defineStore } from "pinia"; import { store, getConfig, - defineStore, storageLocal, responsiveStorageNameSpace } from "../utils"; diff --git a/src/store/modules/multiTags.ts b/src/store/modules/multiTags.ts index fbcfd1d..fee2234 100644 --- a/src/store/modules/multiTags.ts +++ b/src/store/modules/multiTags.ts @@ -1,3 +1,4 @@ +import { defineStore } from "pinia"; import { type multiType, type positionType, @@ -7,7 +8,6 @@ import { isNumber, isBoolean, getConfig, - defineStore, routerArrays, storageLocal, responsiveStorageNameSpace diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts index 4c69976..2ddca78 100644 --- a/src/store/modules/permission.ts +++ b/src/store/modules/permission.ts @@ -1,3 +1,4 @@ +import { defineStore } from "pinia"; import { type cacheType, store, @@ -5,7 +6,6 @@ import { ascending, getKeyList, filterTree, - defineStore, constantMenus, filterNoPermissionTree, formatFlatteningRoutes diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts index f8e275f..7f810f7 100644 --- a/src/store/modules/settings.ts +++ b/src/store/modules/settings.ts @@ -1,4 +1,5 @@ -import { type setType, store, defineStore, getConfig } from "../utils"; +import { defineStore } from "pinia"; +import { type setType, store, getConfig } from "../utils"; export const useSettingStore = defineStore({ id: "pure-setting", diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 3506cf3..9cb2636 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -1,8 +1,8 @@ +import { defineStore } from "pinia"; import { type userType, store, router, - defineStore, resetRouter, routerArrays, storageLocal diff --git a/src/store/utils.ts b/src/store/utils.ts index 581a43d..5dd8c75 100644 --- a/src/store/utils.ts +++ b/src/store/utils.ts @@ -1,5 +1,4 @@ export { store } from "@/store"; -export { defineStore } from "pinia"; export { routerArrays } from "@/layout/types"; export { router, resetRouter, constantMenus } from "@/router"; export { getConfig, responsiveStorageNameSpace } from "@/config"; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 9a9da9e..aed1563 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -45,23 +45,26 @@ const ruleForm = reactive({ }); const onLogin = async (formEl: FormInstance | undefined) => { - loading.value = true; if (!formEl) return; await formEl.validate((valid, fields) => { if (valid) { + loading.value = true; useUserStoreHook() .loginByUsername({ username: ruleForm.username, password: "admin123" }) .then(res => { if (res.success) { // 获取后端路由 - initRouter().then(() => { - router.push(getTopMenu(true).path); - message("登录成功", { type: "success" }); + return initRouter().then(() => { + router.push(getTopMenu(true).path).then(() => { + message(t("login.pureLoginSuccess"), { type: "success" }); + }); }); + } else { + message(t("login.pureLoginFail"), { type: "error" }); } - }); + }) + .finally(() => (loading.value = false)); } else { - loading.value = false; return fields; } });