From 14f7d39b1885442de42bdd81806774151baddd4f Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期二, 22 七月 2025 15:37:03 +0800
Subject: [PATCH] 'ts报红部分解决'
---
src/views/login/index.vue | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index aebcc27..6fdd381 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -30,7 +30,7 @@
// import darkIcon from "@/assets/svg/dark.svg?component";
import Lock from "~icons/ri/lock-fill";
import User from "~icons/ri/user-3-fill";
-import { captcha, phoneNumberCode, exRole } from "@/api/register/index.ts";
+import { captcha, phoneNumberCode, exRole } from "@/api/register/index";
defineOptions({
name: "Login"
@@ -50,11 +50,8 @@
// 鑾峰彇楠岃瘉鐮�
const getCaptcha = async () => {
// if (!state.captchaEnabled) return;
-
state.ruleForm.code = "";
const res = await captcha();
- console.log(res);
-
state.captchaImage = "data:text/html;base64," + res.result?.img;
state.expirySeconds = res.result?.expirySeconds;
state.ruleForm.codeId = res.result?.id;
@@ -66,9 +63,8 @@
nickName: "",
phone: "",
phoneVCode: "",
- // tenantId: props.tenantInfo.id,
code: "",
- codeId: 0,
+ codeId: "",
email: "",
exRoleCode: ""
},
@@ -133,6 +129,7 @@
// 鑾峰彇楠岃瘉鐮�
getCaptcha();
+
exRole().then(res => {
state.roleList = res.result;
const role = route.query;
@@ -141,7 +138,7 @@
} else {
state.nowRole = state.roleList[0];
}
- state.ruleForm.exRoleCode = state.nowRole?.code;
+ state.ruleForm.exRoleCode = state.nowRole.code;
});
// 娉ㄥ唽楠岃瘉鐮佽繃鏈熻鏃跺櫒
// if (state.captchaEnabled) {
@@ -167,24 +164,25 @@
if (!formEl) return;
await formEl.validate(valid => {
if (valid) {
+ let obj = {
+ phone: state.ruleForm.phone,
+ code: state.ruleForm.phoneVCode,
+ exRuleCode: state.ruleForm.exRoleCode
+ };
loading.value = true;
useUserStoreHook()
- .loginByUsername({
- phone: state.ruleForm.phone,
- code: state.ruleForm.phoneVCode,
- exRuleCode: state.ruleForm.exRoleCode
- })
+ .loginByUsername(obj)
.then(res => {
if (res.code == 200) {
// 鑾峰彇鍚庣璺敱
return initRouter().then(() => {
- console.log(res, "=-=-=-=");
- if (!res.result.exRoles.hasFlsh) {
+ console.log(res, "=-=-=-=", res.result.exRoles[0].hasFlsh);
+ if (!res.result.exRoles[0].hasFlsh) {
disabled.value = true;
router
.replace({
name: "RegisterNav",
- query: { code: res?.result?.exRoles.code }
+ query: { code: res.result.exRoles[0].code }
})
.then(() => {
message("鐧诲綍鎴愬姛", { type: "success" });
--
Gitblit v1.9.1