diff --git a/src/api/models/forum.ts b/src/api/models/forum.ts index b1184ee..768b710 100644 --- a/src/api/models/forum.ts +++ b/src/api/models/forum.ts @@ -49,6 +49,7 @@ export type ForumModel = { createAt: number isAdmin: boolean + isMember: boolean } export type ForumSectionModel = { id: number diff --git a/src/components/RegisterAndLogin.vue b/src/components/RegisterAndLogin.vue index 694d413..97621eb 100644 --- a/src/components/RegisterAndLogin.vue +++ b/src/components/RegisterAndLogin.vue @@ -3,7 +3,24 @@ import { AccountInfo } from '@/api/api-models' import { QueryGetAPI, QueryPostAPI } from '@/api/query' import { ACCOUNT_API_URL, TURNSTILE_KEY } from '@/data/constants' import { useLocalStorage } from '@vueuse/core' -import { FormInst, FormItemInst, FormItemRule, FormRules, NAlert, NButton, NCard, NCountdown, NDivider, NForm, NFormItem, NInput, NSpace, NTabPane, NTabs, useMessage } from 'naive-ui' +import { + FormInst, + FormItemInst, + FormItemRule, + FormRules, + NAlert, + NButton, + NCard, + NCountdown, + NDivider, + NForm, + NFormItem, + NInput, + NSpace, + NTabPane, + NTabs, + useMessage, +} from 'naive-ui' import { onUnmounted, ref } from 'vue' import VueTurnstile from 'vue-turnstile' @@ -87,7 +104,11 @@ const loginRules: FormRules = { ], } function validatePasswordStartWith(rule: FormItemRule, value: string): boolean { - return !!registerModel.value.password && registerModel.value.password.startsWith(value) && registerModel.value.password.length >= value.length + return ( + !!registerModel.value.password && + registerModel.value.password.startsWith(value) && + registerModel.value.password.length >= value.length + ) } function validatePasswordSame(rule: FormItemRule, value: string): boolean { return value === registerModel.value.password @@ -157,7 +178,9 @@ function onLoginButtonClick() { } async function onForgetPassword() { canSendForgetPassword.value = false - await QueryGetAPI(ACCOUNT_API_URL + 'reset-password', { email: inputForgetPasswordValue.value }, [['Turnstile', token.value]]) + await QueryGetAPI(ACCOUNT_API_URL + 'reset-password', { email: inputForgetPasswordValue.value }, [ + ['Turnstile', token.value], + ]) .then(async (data) => { if (data.code == 200) { message.success('已发送密码重置链接到你的邮箱, 请检查') @@ -193,17 +216,31 @@ onUnmounted(() => { 你已经登录