mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-04-19 06:27:27 +00:00
Merge pull request #2696 from Bliod-Cook/email-verification-fix
This commit is contained in:
@@ -31,7 +31,15 @@ import {
|
|||||||
onDiscordOAuthClicked,
|
onDiscordOAuthClicked,
|
||||||
} from '../../helpers';
|
} from '../../helpers';
|
||||||
import Turnstile from 'react-turnstile';
|
import Turnstile from 'react-turnstile';
|
||||||
import { Button, Card, Checkbox, Divider, Form, Icon, Modal } from '@douyinfe/semi-ui';
|
import {
|
||||||
|
Button,
|
||||||
|
Card,
|
||||||
|
Checkbox,
|
||||||
|
Divider,
|
||||||
|
Form,
|
||||||
|
Icon,
|
||||||
|
Modal,
|
||||||
|
} from '@douyinfe/semi-ui';
|
||||||
import Title from '@douyinfe/semi-ui/lib/es/typography/title';
|
import Title from '@douyinfe/semi-ui/lib/es/typography/title';
|
||||||
import Text from '@douyinfe/semi-ui/lib/es/typography/text';
|
import Text from '@douyinfe/semi-ui/lib/es/typography/text';
|
||||||
import {
|
import {
|
||||||
@@ -121,7 +129,7 @@ const RegisterForm = () => {
|
|||||||
setTurnstileEnabled(true);
|
setTurnstileEnabled(true);
|
||||||
setTurnstileSiteKey(status.turnstile_site_key);
|
setTurnstileSiteKey(status.turnstile_site_key);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 从 status 获取用户协议和隐私政策的启用状态
|
// 从 status 获取用户协议和隐私政策的启用状态
|
||||||
setHasUserAgreement(status.user_agreement_enabled || false);
|
setHasUserAgreement(status.user_agreement_enabled || false);
|
||||||
setHasPrivacyPolicy(status.privacy_policy_enabled || false);
|
setHasPrivacyPolicy(status.privacy_policy_enabled || false);
|
||||||
@@ -235,7 +243,7 @@ const RegisterForm = () => {
|
|||||||
setVerificationCodeLoading(true);
|
setVerificationCodeLoading(true);
|
||||||
try {
|
try {
|
||||||
const res = await API.get(
|
const res = await API.get(
|
||||||
`/api/verification?email=${inputs.email}&turnstile=${turnstileToken}`,
|
`/api/verification?email=${encodeURIComponent(inputs.email)}&turnstile=${turnstileToken}`,
|
||||||
);
|
);
|
||||||
const { success, message } = res.data;
|
const { success, message } = res.data;
|
||||||
if (success) {
|
if (success) {
|
||||||
@@ -405,7 +413,15 @@ const RegisterForm = () => {
|
|||||||
theme='outline'
|
theme='outline'
|
||||||
className='w-full h-12 flex items-center justify-center !rounded-full border border-gray-200 hover:bg-gray-50 transition-colors'
|
className='w-full h-12 flex items-center justify-center !rounded-full border border-gray-200 hover:bg-gray-50 transition-colors'
|
||||||
type='tertiary'
|
type='tertiary'
|
||||||
icon={<SiDiscord style={{ color: '#5865F2', width: '20px', height: '20px' }} />}
|
icon={
|
||||||
|
<SiDiscord
|
||||||
|
style={{
|
||||||
|
color: '#5865F2',
|
||||||
|
width: '20px',
|
||||||
|
height: '20px',
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
}
|
||||||
onClick={handleDiscordClick}
|
onClick={handleDiscordClick}
|
||||||
loading={discordLoading}
|
loading={discordLoading}
|
||||||
>
|
>
|
||||||
@@ -619,7 +635,9 @@ const RegisterForm = () => {
|
|||||||
htmlType='submit'
|
htmlType='submit'
|
||||||
onClick={handleSubmit}
|
onClick={handleSubmit}
|
||||||
loading={registerLoading}
|
loading={registerLoading}
|
||||||
disabled={(hasUserAgreement || hasPrivacyPolicy) && !agreedToTerms}
|
disabled={
|
||||||
|
(hasUserAgreement || hasPrivacyPolicy) && !agreedToTerms
|
||||||
|
}
|
||||||
>
|
>
|
||||||
{t('注册')}
|
{t('注册')}
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
Reference in New Issue
Block a user