diff --git a/.env.dev b/.env.dev
index 9200ece2d72e4162593064b4b5f055e4fc6cb15d..2244bf7493d7f7e28c0fa04d006773a89c7ef99b 100644
--- a/.env.dev
+++ b/.env.dev
@@ -29,3 +29,9 @@ VITE_SOURCEMAP=false
# 输出路径
VITE_OUT_DIR=dist
+
+# 多租户开关(不配置默认true)
+# VITE_APP_TENANT_ENABLE= false
+
+# 验证码开关(不配置默认true)
+# VITE_APP_CAPTCHA_ENABLE = false
diff --git a/src/views/Login/SocialLogin.vue b/src/views/Login/SocialLogin.vue
index 6bbfc1dfad2506db5a5e316f70a9e5cae1c7fbe6..33b3f2971629f887cc2ea911f0baedbf04e4528f 100644
--- a/src/views/Login/SocialLogin.vue
+++ b/src/views/Login/SocialLogin.vue
@@ -64,7 +64,7 @@
-
+
{
// 情况一,未开启:则直接登录
- if (loginData.captchaEnable === 'false') {
+ if (loginData.captchaEnabled) {
await handleLogin({})
} else {
// 情况二,已开启:则展示验证码;只有完成验证码的情况,才进行登录
@@ -217,7 +217,7 @@ const getCode = async () => {
}
//获取租户ID
const getTenantId = async () => {
- if (loginData.tenantEnable === 'true') {
+ if (loginData.tenantEnabled) {
const res = await LoginApi.getTenantIdByName(loginData.loginForm.tenantName)
authUtil.setTenantId(res)
}
diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue
index 9bee25237a4dfe58909b2da96fc24ec23537df2c..85a6190a29c54214520bcae04c0268c3ed4968c0 100644
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@@ -16,7 +16,7 @@
-
+
{
// 情况一,未开启:则直接登录
- if (loginData.captchaEnable === 'false') {
+ if (loginData.captchaEnabled) {
await handleLogin({})
} else {
// 情况二,已开启:则展示验证码;只有完成验证码的情况,才进行登录
@@ -212,7 +212,7 @@ const getCode = async () => {
}
//获取租户ID
const getTenantId = async () => {
- if (loginData.tenantEnable === 'true') {
+ if (loginData.tenantEnabled) {
const res = await LoginApi.getTenantIdByName(loginData.loginForm.tenantName)
authUtil.setTenantId(res)
}