Skip to content

Commit 2e9f6bd

Browse files
committed
chore(login): add report error msg in login()
1 parent 1d97330 commit 2e9f6bd

2 files changed

Lines changed: 22 additions & 6 deletions

File tree

src/stores/user-store.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,17 @@ export const useUserStore = defineStore('user', () => {
138138
message: '登录成功',
139139
})
140140
} else {
141+
console.error('Login failed:', msg)
141142
return Promise.reject({
142143
success: false,
143-
messagge: msg,
144+
message: msg,
144145
})
145146
}
146147
} catch (error) {
148+
console.error('Login error:', error)
147149
return Promise.reject({
148150
success: false,
149-
message: error,
151+
message: error instanceof Error ? error.message : String((error as { msg?: unknown }).msg),
150152
})
151153
} finally {
152154
loginBtnLoading.value = false

src/views/login/index.vue

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,32 @@ const rules = ref<FormRules>({
8686
],
8787
})
8888
89+
const getErrorMessage = (error: unknown) => {
90+
if (typeof error === 'string') return error
91+
if (error && typeof error === 'object' && 'message' in error) {
92+
const message = (error as { message?: unknown }).message
93+
if (typeof message === 'string') return message
94+
}
95+
return '登录失败,请稍后重试'
96+
}
97+
8998
const submitForm = async () => {
9099
if (!ruleFormRef.value) return
91-
await ruleFormRef.value.validate(async (valid) => {
100+
try {
101+
const valid = await ruleFormRef.value.validate()
92102
if (!valid) return
103+
93104
const { success, message } = await login()
94105
if (success) {
95106
ElMessage.success('登录成功')
96107
router.push('/framework')
97-
} else {
98-
ElMessage.error(message)
108+
return
99109
}
100-
})
110+
111+
ElMessage.error(message)
112+
} catch (error) {
113+
ElMessage.error(getErrorMessage(error))
114+
}
101115
}
102116
</script>
103117

0 commit comments

Comments
 (0)