增加用户中心、用户注册登录

src/pages/user/register/index.tsx

@@ -6,6 +6,8 @@ import { useEffect, useState } from 'react';
 import type { StateType } from './service';
 import { fakeRegister } from './service';
 import useStyles from './style.style';
+import { registerUser } from '@/services/user/api';
+import { CommonResponse } from '@/types/common';
 
 const FormItem = Form.Item;
 const { Option } = Select;
@@ -74,21 +76,36 @@ const Register: FC = () => {
     }
     return 'poor';
   };
-  const { loading: submitting, run: register } = useRequest<{
-    data: StateType;
-  }>(fakeRegister, {
-    manual: true,
-    onSuccess: (data, params) => {
-      if (data.status === 'ok') {
-        message.success('注册成功！');
-        history.push({
-          pathname: `/user/register-result?account=${params[0].email}`,
-        });
-      }
+  const { loading: submitting, run: register } = useRequest(
+    (params) => registerUser(params, { skipErrorHandler: true }),
+    {
+      manual: true,
+      onSuccess: (data, params) => {
+        console.log('注册成功 - data:', data, 'params:', params);
+        const response = data as CommonResponse<string>;
+        if (response?.code === 200) {
+          message.success('注册成功！');
+          const formValues = params[0] as any;
+          history.push({
+            pathname: `/user/register-result?account=${formValues?.email || formValues?.username || ''}`,
+          });
+        } else {
+          message.error(response?.message || '注册失败，请重试');
+        }
+      },
     },
-  });
+  );
+  
   const onFinish = (values: Store) => {
-    register(values);
+    // 将表单数据映射为后端需要的格式
+    const registerParams = {
+      username: values.username,
+      nickname: values.nickname,
+      password: values.password,
+      email: values.email || '',
+      phone: values.phone || '',
+    };
+    register(registerParams);
   };
   const checkConfirm = (_: any, value: string) => {
     const promise = Promise;
@@ -139,19 +156,22 @@ const Register: FC = () => {
       <h3>注册</h3>
       <Form form={form} name="UserRegister" onFinish={onFinish}>
         <FormItem
-          name="email"
+          name="username"
           rules={[
-            {
-              required: true,
-              message: '请输入邮箱地址!',
-            },
-            {
-              type: 'email',
-              message: '邮箱地址格式错误!',
-            },
+            { required: true, message: '请输入用户名!' },
+            { max: 50, message: '用户名过长' },
           ]}
         >
-          <Input size="large" placeholder="邮箱" />
+          <Input size="large" placeholder="用户名" />
+        </FormItem>
+        <FormItem
+          name="nickname"
+          rules={[
+            { required: true, message: '请输入昵称!' },
+            { max: 50, message: '昵称过长' },
+          ]}
+        >
+          <Input size="large" placeholder="昵称" />
         </FormItem>
         <Popover
           getPopupContainer={(node) => {
@@ -216,8 +236,23 @@ const Register: FC = () => {
           <Input size="large" type="password" placeholder="确认密码" />
         </FormItem>
         <FormItem
-          name="mobile"
-          rules={[
+          name="email"
+          /* rules={[
+            {
+              required: true,
+              message: '请输入邮箱地址!',
+            },
+            {
+              type: 'email',
+              message: '邮箱地址格式错误!',
+            },
+          ]} */
+        >
+          <Input size="large" placeholder="邮箱" />
+        </FormItem>
+        <FormItem
+          name="phone"
+          /* rules={[
             {
               required: true,
               message: '请输入手机号!',
@@ -226,7 +261,7 @@ const Register: FC = () => {
               pattern: /^\d{11}$/,
               message: '手机号格式错误!',
             },
-          ]}
+          ]} */
         >
           <Space.Compact style={{ width: '100%' }}>
             <Select
@@ -244,7 +279,7 @@ const Register: FC = () => {
             <Input size="large" placeholder="手机号" />
           </Space.Compact>
         </FormItem>
-        <Row gutter={8}>
+        {/* <Row gutter={8}>
           <Col span={16}>
             <FormItem
               name="captcha"
@@ -268,7 +303,7 @@ const Register: FC = () => {
               {count ? `${count} s` : '获取验证码'}
             </Button>
           </Col>
-        </Row>
+        </Row> */}
         <FormItem>
           <div className={styles.footer}>
             <Button