注册账号
|
@@ -96,7 +89,7 @@
import { ref, onMounted, nextTick, onUnmounted } from "vue";
import { useRouter } from "vue-router";
import { useAuthStore } from "@/stores/auth";
-import { login, getOpenVerify, getGeetest4Infos, sendLoginCode, loginBySms } from "@/api/login";
+import { login, getOpenVerify, getGeetest4Infos, sendLoginCode } from "@/api/login";
import "@/assets/js/gt4.js";
import { ElMessageBox, ElMessage } from "element-plus";
@@ -105,11 +98,13 @@ const authStore = useAuthStore();
// --- 表单数据 ---
const tenant_name = ref("");
-const loginMode = ref<"password" | "sms">("password");
+const openVerifyEnabled = ref(true);
+const verifyType = ref<"captcha" | "sms" | "geetest" | "email">("captcha");
const account = ref("");
const password = ref("");
-const phone = ref("");
const smsCode = ref("");
+const captchaInput = ref("");
+const captchaText = ref("");
const passwordVisible = ref(false);
const rememberMe = ref(false);
const loading = ref(false);
@@ -150,29 +145,11 @@ const cleanCaptchaInstance = () => {
// --- 执行登录请求 ---
const performLoginRequest = async () => {
- if (loginMode.value === "sms") {
- const res = await loginBySms({
- tenant_name: tenant_name.value,
- phone: phone.value,
- sms_code: smsCode.value,
- });
- if (res && res.code === 200) {
- authStore.setLoginInfo(res.data);
- const { useTabsStore } = await import("@/stores");
- const tabsStore = useTabsStore();
- tabsStore.resetTabs();
- router.push({ path: "/home" });
- ElMessage.success("登录成功！");
- return true;
- }
- errorMsg.value = res.msg || "登录失败";
- return false;
- }
-
const res = await login({
tenant_name: tenant_name.value,
account: account.value,
- password: password.value
+ password: password.value,
+ code: smsCode.value
});
if (res && res.code === 200) {
@@ -205,9 +182,8 @@ const performLoginRequest = async () => {
}
};
-const switchMode = (mode: "password" | "sms") => {
- loginMode.value = mode;
- errorMsg.value = "";
+const generateCaptcha = () => {
+ captchaText.value = `${Math.floor(1000 + Math.random() * 9000)}`;
};
const startCountdown = () => {
@@ -228,8 +204,8 @@ const handleSendLoginCode = async () => {
errorMsg.value = "请输入租户名称";
return;
}
- if (!phone.value.trim()) {
- errorMsg.value = "请输入手机号";
+ if (!account.value.trim()) {
+ errorMsg.value = "请输入用户名";
return;
}
codeLoading.value = true;
@@ -237,7 +213,8 @@ const handleSendLoginCode = async () => {
try {
const res = await sendLoginCode({
tenant_name: tenant_name.value,
- phone: phone.value,
+ account: account.value,
+ channel: verifyType.value,
});
if (res && res.code === 200) {
ElMessage.success("验证码已发送");
@@ -366,52 +343,53 @@ const handleLogin = async () => {
errorMsg.value = "请输入租户名称";
return;
}
- if (loginMode.value === "password") {
- if (!account.value.trim()) {
- errorMsg.value = "请输入用户名";
- return;
- }
- if (!password.value.trim()) {
- errorMsg.value = "请输入密码";
- return;
- }
- } else {
- if (!phone.value.trim()) {
- errorMsg.value = "请输入手机号";
- return;
- }
- if (!smsCode.value.trim()) {
- errorMsg.value = "请输入短信验证码";
- return;
- }
+ if (!account.value.trim()) {
+ errorMsg.value = "请输入用户名";
+ return;
+ }
+ if (!password.value.trim()) {
+ errorMsg.value = "请输入密码";
+ return;
}
-
if (loading.value) return;
loading.value = true;
try {
- if (loginMode.value === "password") {
- // 先判断是否开启验证
- const verifyRes = await getOpenVerify();
- let openVerify = "0";
+ const verifyRes = await getOpenVerify();
+ let openVerify = "0";
+ let verifyTypeVal = "captcha";
+ if (verifyRes && verifyRes.code === 200 && Array.isArray(verifyRes.data)) {
+ verifyRes.data.forEach((item: any) => {
+ if (item.label === "openVerify") {
+ openVerify = item.value || "0";
+ }
+ if (item.label === "verifyType") {
+ verifyTypeVal = item.value || "captcha";
+ }
+ });
+ }
+ openVerifyEnabled.value = openVerify === "1";
+ verifyType.value = verifyTypeVal as any;
- if (verifyRes && verifyRes.code === 200 && Array.isArray(verifyRes.data)) {
- verifyRes.data.forEach((item: any) => {
- if (item.label === "openVerify") {
- openVerify = item.value || "0";
- }
- });
+ if (openVerifyEnabled.value && verifyType.value === "captcha") {
+ if (!captchaInput.value.trim()) {
+ errorMsg.value = "请输入验证码";
+ return;
}
+ if (captchaInput.value.trim() !== captchaText.value) {
+ errorMsg.value = "验证码错误";
+ generateCaptcha();
+ return;
+ }
+ }
+ if (openVerifyEnabled.value && (verifyType.value === "sms" || verifyType.value === "email") && !smsCode.value.trim()) {
+ errorMsg.value = "请输入验证码";
+ return;
+ }
- // 如果开启了验证，使用极验4.0
- if (openVerify === "1") {
- await startGeetest4();
- } else {
- // 直接登录
- await performLoginRequest();
- }
+ if (openVerifyEnabled.value && verifyType.value === "geetest") {
+ await startGeetest4();
} else {
- // 直接登录
await performLoginRequest();
}
} catch (err: any) {
@@ -451,6 +429,7 @@ onMounted(() => {
password.value = localStorage.getItem("loginPassword") || "";
rememberMe.value = true;
}
+ generateCaptcha();
});
onUnmounted(() => {