From a72d12227ece9882eb5b0f8ccc378eae814fbeac Mon Sep 17 00:00:00 2001 From: Charles7c Date: Mon, 21 Jul 2025 22:23:58 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=20useTenantStore?= =?UTF-8?q?=20=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/stores/index.ts | 1 + src/views/login/components/account/index.vue | 7 ++----- src/views/login/components/email/index.vue | 6 ++---- src/views/login/components/phone/index.vue | 6 ++---- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/stores/index.ts b/src/stores/index.ts index 875abe8..2ec60fa 100644 --- a/src/stores/index.ts +++ b/src/stores/index.ts @@ -6,6 +6,7 @@ export * from './modules/route' export * from './modules/tabs' export * from './modules/dict' export * from './modules/user' +export * from './modules/tenant' const pinia = createPinia() pinia.use(piniaPluginPersistedstate) diff --git a/src/views/login/components/account/index.vue b/src/views/login/components/account/index.vue index a89ff49..396a571 100644 --- a/src/views/login/components/account/index.vue +++ b/src/views/login/components/account/index.vue @@ -44,11 +44,8 @@ import { type FormInstance, Message } from '@arco-design/web-vue' import { useStorage } from '@vueuse/core' import { getImageCaptcha } from '@/apis/common' -import { useTabsStore, useUserStore } from '@/stores' +import { useTabsStore, useTenantStore, useUserStore } from '@/stores' import { encryptByRsa } from '@/utils/encrypt' -import { useTenantStore } from '@/stores/modules/tenant' - -const tenantStore = useTenantStore() const loginConfig = useStorage('login-config', { rememberMe: true, @@ -61,7 +58,6 @@ const loginConfig = useStorage('login-config', { const isCaptchaEnabled = ref(true) // 验证码图片 const captchaImgBase64 = ref() -// 租户编号 const tenantCode = ref() const formRef = ref() const form = reactive({ @@ -112,6 +108,7 @@ const getCaptcha = () => { }) } +const tenantStore = useTenantStore() const userStore = useUserStore() const tabsStore = useTabsStore() const router = useRouter() diff --git a/src/views/login/components/email/index.vue b/src/views/login/components/email/index.vue index a3575d4..4f2791e 100644 --- a/src/views/login/components/email/index.vue +++ b/src/views/login/components/email/index.vue @@ -45,11 +45,8 @@ import { type FormInstance, Message } from '@arco-design/web-vue' import type { BehaviorCaptchaReq } from '@/apis' // import { type BehaviorCaptchaReq, getEmailCaptcha } from '@/apis' -import { useTabsStore, useUserStore } from '@/stores' +import { useTabsStore, useTenantStore, useUserStore } from '@/stores' import * as Regexp from '@/utils/regexp' -import { useTenantStore } from '@/stores/modules/tenant' - -const tenantStore = useTenantStore() const formRef = ref() const form = reactive({ @@ -66,6 +63,7 @@ const rules: FormInstance['rules'] = { captcha: [{ required: true, message: '请输入验证码' }], } +const tenantStore = useTenantStore() const userStore = useUserStore() const tabsStore = useTabsStore() const router = useRouter() diff --git a/src/views/login/components/phone/index.vue b/src/views/login/components/phone/index.vue index c91cf3a..09e7161 100644 --- a/src/views/login/components/phone/index.vue +++ b/src/views/login/components/phone/index.vue @@ -45,11 +45,8 @@ import { type FormInstance, Message } from '@arco-design/web-vue' // import type { BehaviorCaptchaReq } from '@/apis' import { type BehaviorCaptchaReq, getSmsCaptcha } from '@/apis' -import { useTabsStore, useUserStore } from '@/stores' +import { useTabsStore, useTenantStore, useUserStore } from '@/stores' import * as Regexp from '@/utils/regexp' -import { useTenantStore } from '@/stores/modules/tenant' - -const tenantStore = useTenantStore() const formRef = ref() const form = reactive({ @@ -66,6 +63,7 @@ const rules: FormInstance['rules'] = { captcha: [{ required: true, message: '请输入验证码' }], } +const tenantStore = useTenantStore() const userStore = useUserStore() const tabsStore = useTabsStore() const router = useRouter()