diff --git a/kinit-admin/src/views/Login/components/LoginForm.vue b/kinit-admin/src/views/Login/components/LoginForm.vue index b5664f3..f8b01b0 100644 --- a/kinit-admin/src/views/Login/components/LoginForm.vue +++ b/kinit-admin/src/views/Login/components/LoginForm.vue @@ -74,6 +74,7 @@ const schema = reactive([ field: 'method', label: '登录类型', value: '0', + component: 'Input', ifshow: () => false }, { @@ -143,7 +144,7 @@ const signIn = async () => { } else { loading.value = false } - } finally { + } catch (e: any) { loading.value = false } } diff --git a/kinit-admin/src/views/Login/components/TelephoneCodeForm.vue b/kinit-admin/src/views/Login/components/TelephoneCodeForm.vue index e9131de..4b1c811 100644 --- a/kinit-admin/src/views/Login/components/TelephoneCodeForm.vue +++ b/kinit-admin/src/views/Login/components/TelephoneCodeForm.vue @@ -56,6 +56,7 @@ const schema = reactive([ field: 'method', label: '登录类型', value: '1', + component: 'Input', ifshow: () => false }, { @@ -111,7 +112,7 @@ const telephoneCodeLogin = async () => { } else { loading.value = false } - } finally { + } catch (e: any) { loading.value = false } } @@ -129,21 +130,17 @@ const getSMSCode = async () => { SMSCodeNumber.value = 60 const { getFormData } = methods const formData = await getFormData() - try { - const res = await postSMSCodeApi({ telephone: formData.telephone }) - if (res?.data) { - let timer = setInterval(() => { - SMSCodeNumber.value-- - if (SMSCodeNumber.value < 1) { - SMSCodeStatus.value = true - clearInterval(timer) - } - }, 1000) - } else { - ElMessage.error('发送失败,请联系管理员') - SMSCodeStatus.value = true - } - } finally { + const res = await postSMSCodeApi({ telephone: formData.telephone }) + if (res?.data) { + let timer = setInterval(() => { + SMSCodeNumber.value-- + if (SMSCodeNumber.value < 1) { + SMSCodeStatus.value = true + clearInterval(timer) + } + }, 1000) + } else { + ElMessage.error('发送失败,请联系管理员') SMSCodeStatus.value = true } } diff --git a/kinit-admin/src/views/Reset/Reset.vue b/kinit-admin/src/views/Reset/Reset.vue index dac37d6..bb5b130 100644 --- a/kinit-admin/src/views/Reset/Reset.vue +++ b/kinit-admin/src/views/Reset/Reset.vue @@ -110,7 +110,7 @@ const save = async () => { } else { loading.value = false } - } finally { + } catch (e: any) { loading.value = false } } diff --git a/kinit-admin/src/views/vadmin/auth/menu/components/menu.data.ts b/kinit-admin/src/views/vadmin/auth/menu/components/menu.data.ts index 5790ca5..1db6ce5 100644 --- a/kinit-admin/src/views/vadmin/auth/menu/components/menu.data.ts +++ b/kinit-admin/src/views/vadmin/auth/menu/components/menu.data.ts @@ -122,6 +122,7 @@ export const schema = reactive([ colProps: { span: 24 }, + component: 'Input', ifshow: (values) => values.menu_type !== '2' }, {