diff --git a/.gitignore b/.gitignore index a976911..f721f6a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,13 @@ coverage # Editor directories and files # .vscode/* +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json !.vscode/extensions.json +!.vscode/*.code-snippets + .idea *.suo *.ntvs* diff --git a/src/views/login/components/phone/index.vue b/src/views/login/components/phone/index.vue index 0e4afae..6181f9c 100644 --- a/src/views/login/components/phone/index.vue +++ b/src/views/login/components/phone/index.vue @@ -12,7 +12,7 @@ - + - 立即登录 + 立即登录 import { type FormInstance, Message } from '@arco-design/web-vue' -import type { BehaviorCaptchaReq } from '@/apis' -// import { type BehaviorCaptchaReq, getSmsCaptcha } from '@/apis' +// import type { BehaviorCaptchaReq } from '@/apis' +import { type BehaviorCaptchaReq, getSmsCaptcha } from '@/apis' import { useTabsStore, useUserStore } from '@/stores' import * as Regexp from '@/utils/regexp' @@ -113,12 +113,12 @@ const resetCaptcha = () => { } // 获取验证码 -// eslint-disable-next-line unused-imports/no-unused-vars + const getCaptcha = async (captchaReq: BehaviorCaptchaReq) => { try { captchaLoading.value = true captchaBtnName.value = '发送中...' - // await getSmsCaptcha(form.phone, captchaReq) + await getSmsCaptcha(form.phone, captchaReq) captchaLoading.value = false captchaDisable.value = true captchaBtnName.value = `获取验证码(${(captchaTime.value -= 1)}s)` diff --git a/src/views/system/config/sms/SmsConfigAddModal.vue b/src/views/system/config/sms/SmsConfigAddModal.vue index 070b0ed..58354cf 100644 --- a/src/views/system/config/sms/SmsConfigAddModal.vue +++ b/src/views/system/config/sms/SmsConfigAddModal.vue @@ -31,7 +31,7 @@ const visible = ref(false) const isUpdate = computed(() => !!dataId.value) const title = computed(() => (isUpdate.value ? '修改短信配置' : '新增短信配置')) const formRef = ref>() -const { dis_enable_status_enum, sms_supplier_enum } = useDict('dis_enable_status_enum', 'sms_supplier_enum') +const { dis_enable_status_enum, sms_supplier_type } = useDict('dis_enable_status_enum', 'sms_supplier_type') const [form, resetForm] = useResetReactive({ status: 1, @@ -55,7 +55,7 @@ const columns: ColumnItem[] = reactive([ span: 12, required: true, props: { - options: sms_supplier_enum, + options: sms_supplier_type, }, }, { diff --git a/src/views/system/config/sms/index.vue b/src/views/system/config/sms/index.vue index 6bfa907..8ec87d3 100644 --- a/src/views/system/config/sms/index.vue +++ b/src/views/system/config/sms/index.vue @@ -16,7 +16,7 @@