Merge branch 'master' of http://git.ycjcjy.com/kypay/global_funding-pc-merchant

src/components/Upload/UploadFile.jsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { LoadingOutlined, PlusOutlined } from '@ant-design/icons';
+import { LoadingOutlined, PlusOutlined, CloudUploadOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 import Upload from './Upload';
 
@@ -10,9 +10,9 @@ export default (props) => {
   const [loading, setLoading] = useState(false);
 
   const UploadButton = (props) => (
-    <div style={{ textAlign: 'center' }}>
-      {props.loading ? <LoadingOutlined /> : <PlusOutlined />}
-      <div style={{ marginTop: 8 }}>{t('authentication.uploadText')}</div>
+    <div style={{ textAlign: 'center', width: '260px' }}>
+      {props.loading ? <LoadingOutlined /> : <CloudUploadOutlined style={{ fontSize: '30px', color: '#1890ff' }} />}
+      <div style={{ marginTop: 8, fontSize: '16px', color: '#1890ff', fontWeight: 600 }}>{t('authentication.uploadText')}</div>
     </div>
   );
 

src/layouts/AuthLayout/RequireLogin.jsx

@@ -22,7 +22,7 @@ export default (props) => {
 
   useEffect(() => {
     if (userStatus === -1) {
-      navigate("/login");
+      navigate("/qLogin");
       return;
     }
   }, [userStatus]);

src/layouts/AuthLayout/components/Header/Exit.jsx

@@ -18,7 +18,7 @@ export default (props) => {
         logout(); // 调用接口
         localStorage.removeItem("token");
         // setUser();
-        navigate("/login");
+        navigate("/qLogin");
       },
     });
   };

src/layouts/AuthLayout/components/Header/User.jsx

@@ -1,17 +1,7 @@
 import React, {
   useState,
-  forwardRef,
-  useRef,
-  useImperativeHandle,
 } from "react";
 import { Avatar, Dropdown } from "antd";
-import {
-  ModalForm,
-  ProFormText,
-  ProFormDependency,
-} from "@ant-design/pro-components";
-import md5 from "md5";
-import { changePassword } from "@/services/login";
 import { useNavigate } from "react-router-dom";
 
 const DefaultAvatar = ({ color = "#1296db" }) => (
@@ -29,92 +19,41 @@ const DefaultAvatar = ({ color = "#1296db" }) => (
   </svg>
 );
 
-const ChangePassword = forwardRef((props, ref) => {
-  const [visible, setVisible] = useState(false);
-  const navigate = useNavigate();
-  const onFinish = async (values) => {
-    const data = {
-      originPassword: md5(values.password),
-      newPassword: md5(values.newPassword),
-    };
-    await changePassword(data);
-    navigate(`/login`);
-
-    return true;
-  };
-
-  useImperativeHandle(ref, () => {
-    return {
-      show: () => setVisible(true),
-    };
-  });
-
-  return (
-    <ModalForm
-      title="修改密码"
-      width="480px"
-      open={visible}
-      onOpenChange={setVisible}
-      onFinish={onFinish}
-    >
-      <ProFormText.Password
-        label="原始密码"
-        name="password"
-        rules={[{ required: true, message: "请输入原始密码!" }]}
-      />
-      <ProFormText.Password
-        label="新密码"
-        name="newPassword"
-        rules={[{ required: true, message: "请输入新密码!" }]}
-      />
-
-      <ProFormDependency name={["newPassword"]}>
-        {({ newPassword }) => (
-          <ProFormText.Password
-            label="确认新密码"
-            name="newPassword2"
-            rules={[
-              { required: true, message: "请输入新密码!" },
-              () => ({
-                validator(_, value) {
-                  if (!value || value == newPassword) {
-                    return Promise.resolve();
-                  }
+export default (props) => {
 
-                  return Promise.reject("两次输入密码不一致");
-                },
-              }),
-            ]}
-          />
-        )}
-      </ProFormDependency>
-    </ModalForm>
-  );
-});
+  const navigate = useNavigate();
 
-export default (props) => {
   const items = [
     {
-      key: "changePassword",
-      label: "修改密码",
+      key: "log",
+      label: "操作日志",
+    },
+    {
+      key: "accountManage",
+      label: "账号管理",
+    },
+    {
+      key: "toggleManage",
+      label: "切换账号",
     },
   ];
 
-  const passRef = useRef();
   const { user = {} } = props;
 
   const onClick = ({ key }) => {
-    if (key === "changePassword") {
-      passRef.current.show();
+    if (key === "toggleManage") {
+      navigate(`/qLogin`);
     }
   };
+
   return (
-    <Dropdown menu={{ items, onClick }}>
-      <div className="user-info">
-        <Avatar size={24} src={<DefaultAvatar />} />
-        <span className="font">{user?.user?.userName}</span>
-        <ChangePassword user={user} ref={passRef} />
-      </div>
-    </Dropdown>
+    <>
+      <Dropdown menu={{ items, onClick }}>
+        <div className="user-info">
+          <Avatar size={24} src={<DefaultAvatar />} />
+          <span className="font">{user?.user?.userName || '----'}</span>
+        </div>
+      </Dropdown>
+    </>
   );
 };

src/locale/zh.json

@@ -7,6 +7,7 @@
   "authentication": {
     "titleLeft": "实名认证流程",
     "titleRight": "填写企业基础信息",
+    "stepsTitle": "实名认证",
     "stepsTitle1": "填写企业基础信息",
     "stepsTitle2": "填写企业董事信息",
     "stepsTitle3": "填写企业受益所有人信息",
@@ -69,6 +70,93 @@
     "directorInfoInputPlaceholder1": "请输入董事姓氏",
     "directorInfoInputPlaceholder2": "请输入董事名称",
     "directorInfoInputPlaceholder3": "请输入董事证件号码",
-    "directorInfoOtherDirectors": "其他董事"
+    "directorInfoOtherDirectors": "其他董事",
+
+    "everyoneInfoTitle": "填写企业受益所有人信息",
+    "everyoneInfoContent1": "根据所适用法律规定，我们需要向贵公司收集受益所有人信息。",
+    "everyoneInfoContent2": "受益所有人：实际管控、管理公司并享有公司最终收益的自然人。具体是指，直接或间接通过股权、授权或其他形式法律安排拥有公司25%以上股权、投票权的自然人。",
+    "everyoneInfoInputLabel1": "董事【刘凡】是否为受益所有人？",
+    "everyoneInfoInputLabel2": "贵公司是否还有其他的受益所有人？",
+    "everyoneInfoInputRadioValue1": "是",
+    "everyoneInfoInputRadioValue2": "否",
+    "everyoneInfoUploadTitle": "股权架构图(选填)",
+    "everyoneInfoUploadText1": "1.若IN01或最新NAR1文件中股权信息未穿透到自然人则需要上传股权架构图",
+    "everyoneInfoUploadText2": "2.支持PDF、JPG、JPEG、PNG、ZIP、RAR、XLSX、XLS格式",
+    "everyoneInfoUploadText3": "3.多份文件请打包压缩上传，文件大小不超过20MB",
+    "everyoneInfoRadioTip": "若持股比例<25%,则非受益所有人",
+    "everyoneInfoAgreement": "我确认以上信息填写准确无误，我已知悉且同意",
+    "everyoneInfoAgreementTitle1": "《快云用卡协议》",
+    "everyoneInfoAgreementEnd": "和",
+    "everyoneInfoAgreementTitle2": "《快云用户协议》",
+    "everyoneInfoBack": "上一步",
+    "everyoneInfoSubmit": "提交",
+
+    "FaceRecognitionTitle": "人脸识别",
+    "FaceRecognitionContent1": "根据所适用法律规定，我们需要向贵公司的相关个人采集人脸信息",
+    "FaceRecognitionContent2": "在人脸识别完成后，系统将自动提交。若识别多次未通过，请联系客服或您的客户经理。",
+    "FaceRecognitionSubTitle": "董事",
+    "FaceRecognitionName": "姓名",
+    "FaceRecognitionState": "识别状态",
+    "FaceRecognitionBtn1": "进行人脸识别",
+    "FaceRecognitionBtn2": "寻求帮助",
+    "FaceRecognitionTag1": "待识别",
+
+    "FaceRecognitionModalTitle": "人脸识别",
+    "FaceRecognitionModalContent1": "请用手机扫描以下二维码，或用手机打开分享链接，按页面提示完成人脸识别认证，认证完成后，您的信息将被自动提交。",
+    "FaceRecognitionModalTip1": "此二维码",
+    "FaceRecognitionModalTip2": "分钟后失效",
+    "FaceRecognitionDirector": "董事",
+    "FaceRecognitionBtn": "复制分享链接",
+
+    "AuthenticationTitle": "实名认证",
+    "AuthenticationContent1": "请进一步完善信息，让快云更了解您！",
+    "AuthenticationLabel1": "企业注册地",
+    "AuthenticationLabel2": "企业中文名称",
+    "AuthenticationLabel3": "企业英文名称（如有）",
+    "AuthenticationLabel4": "是否为上市公司",
+    "AuthenticationPlaceholder1": "请填写企业中文名称",
+    "AuthenticationPlaceholder2": "请填写企业英文名称",
+    "AuthenticationBtn": "开始实名认证",
+    "AuthenticationTip": "请确保您的企业名称与企业文件上的注册名称一致，开始认证流程后无法修改",
+    "AuthenticationYes": "是",
+    "AuthenticationNo": "否"
+  },
+  "accountsettings": {
+    "title1": "修改登录密码",
+    "btnText1": "修改密码",
+    "text1": "密码最少8位，至少包括1个大写英文字母，1个小写英文字母，1个数字或符号",
+
+    "title2": "修改手机号",
+    "btnText2": "修改手机号",
+    "text2": "您已绑定手机号：",
+
+    "title3": "修改邮箱",
+    "btnText3": "修改邮箱",
+    "text3": "您已绑定邮箱：",
+    "sumTitle": "合规材料递交",
+    "title4": "新增业务场景",
+    "btnText4": "去提交",
+    "text4": "请结合您的实际业务运营情况及时提交新的业务场景",
+
+    "emailTitle": "修改邮箱",
+    "emailInput1": "原始邮箱",
+    "emailInput2": "新邮箱",
+    "emailInputLabel": "确认新邮箱",
+    "emailInputLabelRule": "请输入新邮箱!",
+    "emailInputPromiseText": "两次输入邮箱不一致",
+
+    "passwordTitle": "修改密码",
+    "passwordInput1": "原始密码",
+    "passwordInput2": "新密码",
+    "passwordInputLabel": "确认新密码",
+    "passwordInputLabelRule": "请输入新密码!",
+    "passwordInputPromiseText": "两次输入密码不一致",
+
+    "phoneTitle": "修改手机号",
+    "phoneInput1": "原始手机号",
+    "phoneInput2": "新手机号",
+    "phoneInputLabel": "确认新手机号",
+    "phoneInputLabelRule": "请输入新手机号!",
+    "phoneInputPromiseText": "两次输入手机号不一致"
   }
 }

src/pages/accountsettings/components/ChangeModalEmail.jsx

@@ -0,0 +1,71 @@
+import React, { useEffect, useState } from "react";
+import {
+  ModalForm,
+  ProFormText,
+  ProFormDependency,
+} from "@ant-design/pro-components";
+import md5 from "md5";
+import { changeEmail } from "@/services/login";
+import { useNavigate } from "react-router-dom";
+import { useTranslation } from 'react-i18next';
+
+export default (props) => {
+  const { opEmail, setOpEmail } = props;
+  const navigate = useNavigate();
+  const { t } = useTranslation();
+
+  const onFinish = async (values) => {
+    const data = {
+      originEmail: md5(values.email),
+      newEmail: md5(values.newEmail),
+    };
+    await changeEmail(data);
+    navigate(`/login`);
+
+    return true;
+  };
+
+  return (
+    <ModalForm
+      title={t('accountsettings.emailTitle')}
+      width="480px"
+      open={opEmail}
+      modalProps={{
+        onCancel: () => setOpEmail(false),
+      }}
+      onFinish={onFinish}
+    >
+      <ProFormText.Password
+        label={t('accountsettings.emailInput1')}
+        name="email"
+        rules={[{ required: true }]}
+      />
+      <ProFormText.Password
+        label={t('accountsettings.emailInput2')}
+        name="newEmail"
+        rules={[{ required: true }]}
+      />
+
+      <ProFormDependency name={["newEmail"]}>
+        {({ newEmail }) => (
+          <ProFormText.Password
+            label={t('accountsettings.emailInputLabel')}
+            name="newEmail2"
+            rules={[
+              { required: true, message: t('accountsettings.emailInputLabelRule') },
+              () => ({
+                validator (_, value) {
+                  if (!value || value == newEmail) {
+                    return Promise.resolve();
+                  }
+
+                  return Promise.reject(t('accountsettings.emailInputPromiseText'));
+                },
+              }),
+            ]}
+          />
+        )}
+      </ProFormDependency>
+    </ModalForm>
+  )
+}

src/pages/accountsettings/components/ChangeModalPassword.jsx

@@ -0,0 +1,71 @@
+import React, { useEffect, useState } from "react";
+import {
+  ModalForm,
+  ProFormText,
+  ProFormDependency,
+} from "@ant-design/pro-components";
+import md5 from "md5";
+import { changePassword } from "@/services/login";
+import { useNavigate } from "react-router-dom";
+import { useTranslation } from 'react-i18next';
+
+export default (props) => {
+  const { visible, setVisible } = props;
+  const navigate = useNavigate();
+  const { t } = useTranslation();
+
+  const onFinish = async (values) => {
+    const data = {
+      originPassword: md5(values.password),
+      newPassword: md5(values.newPassword),
+    };
+    await changePassword(data);
+    navigate(`/login`);
+
+    return true;
+  };
+
+  return (
+    <ModalForm
+      title={t('accountsettings.passwordTitle')}
+      width="480px"
+      open={visible}
+      modalProps={{
+        onCancel: () => setVisible(false),
+      }}
+      onFinish={onFinish}
+    >
+      <ProFormText.Password
+        label={t('accountsettings.passwordInput1')}
+        name="password"
+        rules={[{ required: true }]}
+      />
+      <ProFormText.Password
+        label={t('accountsettings.passwordInput2')}
+        name="newPassword"
+        rules={[{ required: true }]}
+      />
+
+      <ProFormDependency name={["newPassword"]}>
+        {({ newPassword }) => (
+          <ProFormText.Password
+            label={t('accountsettings.passwordInputLabel')}
+            name="newPassword2"
+            rules={[
+              { required: true, message: t('accountsettings.passwordInputLabelRule') },
+              () => ({
+                validator (_, value) {
+                  if (!value || value == newPassword) {
+                    return Promise.resolve();
+                  }
+
+                  return Promise.reject(t('accountsettings.passwordInputPromiseText'));
+                },
+              }),
+            ]}
+          />
+        )}
+      </ProFormDependency>
+    </ModalForm>
+  )
+}

src/pages/accountsettings/components/ChangeModalPhone.jsx

@@ -0,0 +1,71 @@
+import React, { useEffect, useState } from "react";
+import {
+  ModalForm,
+  ProFormText,
+  ProFormDependency,
+} from "@ant-design/pro-components";
+import md5 from "md5";
+import { changePhone } from "@/services/login";
+import { useNavigate } from "react-router-dom";
+import { useTranslation } from 'react-i18next';
+
+export default (props) => {
+  const { opPhone, setOpPhone } = props;
+  const navigate = useNavigate();
+  const { t } = useTranslation();
+
+  const onFinish = async (values) => {
+    const data = {
+      originPhone: md5(values.phone),
+      newPhone: md5(values.newPhone),
+    };
+    await changePhone(data);
+    navigate(`/login`);
+
+    return true;
+  };
+
+  return (
+    <ModalForm
+      title={t('accountsettings.emailTitle')}
+      width="480px"
+      open={opPhone}
+      modalProps={{
+        onCancel: () => setOpPhone(false),
+      }}
+      onFinish={onFinish}
+    >
+      <ProFormText.Password
+        label={t('accountsettings.phoneInput1')}
+        name="phone"
+        rules={[{ required: true }]}
+      />
+      <ProFormText.Password
+        label={t('accountsettings.phoneInput2')}
+        name="newPhone"
+        rules={[{ required: true }]}
+      />
+
+      <ProFormDependency name={["newPhone"]}>
+        {({ newPhone }) => (
+          <ProFormText.Password
+            label={t('accountsettings.phoneInputLabel')}
+            name="newPhone2"
+            rules={[
+              { required: true, message: t('accountsettings.phoneInputLabelRule') },
+              () => ({
+                validator (_, value) {
+                  if (!value || value == newPhone) {
+                    return Promise.resolve();
+                  }
+
+                  return Promise.reject(t('accountsettings.phoneInputPromiseText'));
+                },
+              }),
+            ]}
+          />
+        )}
+      </ProFormDependency>
+    </ModalForm>
+  )
+}

src/pages/accountsettings/index.jsx

@@ -1,6 +1,102 @@
-import React from 'react'
+import React, { useState } from 'react'
+import Page from "@/components/Page";
+import { Col, Row, Card, Button } from 'antd';
+import { useTranslation } from 'react-i18next';
+import ChangeModalPhone from "./components/ChangeModalPhone";
+import ChangeModalPassword from "./components/ChangeModalPassword";
+import ChangeModalEmail from "./components/ChangeModalEmail";
+import { useNavigate } from "react-router-dom";
+
 export default (props) => {
+  const [visible, setVisible] = useState(false);
+  const [opPhone, setOpPhone] = useState(false);
+  const [opEmail, setOpEmail] = useState(false);
+
+  const navigate = useNavigate();
+
+  const { t } = useTranslation();
+
+  const onOpenPhone = () => {
+    setOpPhone(true);
+  }
+  const onOpenPassword = () => {
+    setVisible(true);
+  }
+  const onOpenEmail = () => {
+    setOpEmail(true);
+  }
   return (
-    <div></div>
+    <Page>
+      <div style={{ width: '460px', display: 'inline-block', marginRight: '24px' }}>
+        <Card>
+          <div style={{ display: "flex", alignItems: "stretch" }}>
+            <div style={{ flex: 0.5 }}>
+              <img src="https://qbitnetwork.com/app/img/password-qbit.957e234a.png" alt={t('accountsettings.title1')} width="100" />
+            </div>
+            <div style={{ flex: 1.5 }}>
+              <div style={{ display: "flex", justifyContent: "space-between", paddingTop: '10px' }}>
+                <div style={{ fontSize: "16px", fontWeight: "bold" }}>{t('accountsettings.title1')}</div>
+                <Button type="primary" onClick={onOpenPassword}>{t('accountsettings.btnText1')}</Button>
+              </div>
+              <div style={{ paddingTop: '1em', color: '#bfbfbf' }}>{t('accountsettings.text1')}</div>
+            </div>
+          </div>
+        </Card>
+      </div>
+      <div style={{ width: '460px', display: 'inline-block' }}>
+        <Card>
+          <div style={{ display: "flex", alignItems: "stretch" }}>
+            <div style={{ flex: 0.5 }}>
+              <img src="https://qbitnetwork.com/app/img/phone-qbit.5eab89b2.png" alt={t('accountsettings.title2')} width="100" />
+            </div>
+            <div style={{ flex: 1.5 }}>
+              <div style={{ display: "flex", justifyContent: "space-between", paddingTop: '10px' }}>
+                <div style={{ fontSize: "16px", fontWeight: "bold" }}>{t('accountsettings.title2')}</div>
+                <Button type="primary" onClick={onOpenPhone}>{t('accountsettings.btnText2')}</Button>
+              </div>
+              <div style={{ paddingTop: '1em', color: '#bfbfbf' }}>{t('accountsettings.text2')}+8***77</div>
+            </div>
+          </div>
+        </Card>
+      </div>
+
+      <div style={{ width: '460px', marginTop: '24px' }}>
+        <Card>
+          <div style={{ display: "flex", alignItems: "stretch" }}>
+            <div style={{ flex: 0.5 }}>
+              <img src="/img/email.png" alt={t('accountsettings.title3')} width="100" />
+            </div>
+            <div style={{ flex: 1.5 }}>
+              <div style={{ display: "flex", justifyContent: "space-between", paddingTop: '10px' }}>
+                <div style={{ fontSize: "16px", fontWeight: "bold" }}>{t('accountsettings.title3')}</div>
+                <Button type="primary" onClick={onOpenEmail}>{t('accountsettings.btnText3')}</Button>
+              </div>
+              <div style={{ paddingTop: '1em', color: '#bfbfbf' }}>{t('accountsettings.text3')}99****qq.com</div>
+            </div>
+          </div>
+        </Card>
+      </div>
+
+      <div style={{ margin: '24px 0', fontWeight: '400', fontSize: '24px' }}>{t('accountsettings.sumTitle')}</div>
+      <div style={{ width: '460px', marginTop: '24px' }}>
+        <Card>
+          <div style={{ display: "flex", alignItems: "stretch" }}>
+            <div style={{ flex: 0.5 }}>
+              <img src="	https://qbitnetwork.com/app/img/business-report-qbit.99ec4666.png" alt={t('accountsettings.title4')} width="100" />
+            </div>
+            <div style={{ flex: 1.5 }}>
+              <div style={{ display: "flex", justifyContent: "space-between", paddingTop: '10px' }}>
+                <div style={{ fontSize: "16px", fontWeight: "bold" }}>{t('accountsettings.title4')}</div>
+                <Button type="primary" onClick={() => navigate('/authentication')} >{t('accountsettings.btnText4')}</Button>
+              </div>
+              <div style={{ paddingTop: '1em', color: '#bfbfbf' }}>{t('accountsettings.text4')}</div>
+            </div>
+          </div>
+        </Card>
+      </div>
+      <ChangeModalPhone opPhone={opPhone} setOpPhone={setOpPhone} />
+      <ChangeModalPassword visible={visible} setVisible={setVisible} />
+      <ChangeModalEmail opEmail={opEmail} setOpEmail={setOpEmail} />
+    </Page>
   )
 }

src/pages/authentication/components/Authentication.jsx

@@ -0,0 +1,57 @@
+import React from "react";
+import { Divider, Card, Steps, Button, Radio, Form, Input, Row, Col, Select, Image } from "antd";
+import { useTranslation } from 'react-i18next';
+
+export default (props) => {
+  const { index, setIndex } = props;
+  const { t } = useTranslation();
+  const [form] = Form.useForm();
+
+  const onFinish = () => {
+
+  };
+  const onClick = () => {
+    setIndex(index + 1);
+  }
+  return (
+    <>
+      <div style={{ fontSize: '24px', fontWeight: '400' }}>{t('authentication.AuthenticationTitle')}</div>
+      <Card bordered={false} style={{ width: '900px' }}>
+        <div style={{ fontSize: '16px', fontWeight: '600' }}>{t('authentication.AuthenticationContent1')}</div>
+        <Form
+          form={form}
+          size="large"
+          layout="vertical"
+          onFinish={onFinish}
+          style={{ marginTop: '4em' }}
+          wrapperCol={{ span: 14 }}
+        >
+          <Form.Item label={t('authentication.AuthenticationLabel1')}>
+            <Select defaultValue="中国大陆">
+            </Select>
+          </Form.Item>
+          <Form.Item label={t('authentication.AuthenticationLabel2')}>
+            <Input placeholder={t('authentication.AuthenticationPlaceholder1')} />
+          </Form.Item>
+          <div style={{ fontSize: '11px', color: '#bfbfbf', marginTop: '-20px' }}>{t('authentication.AuthenticationTip')}</div>
+          <Form.Item label={t('authentication.AuthenticationLabel3')}>
+            <Input placeholder={t('authentication.AuthenticationPlaceholder2')} />
+          </Form.Item>
+          <Form.Item label={t('authentication.AuthenticationLabel4')}>
+            <div style={{ marginTop: '-24px' }}>
+              <Radio style={{ fontSize: '16px' }}>{t('authentication.AuthenticationYes')}</Radio>
+              <Radio style={{ fontSize: '16px' }}>{t('authentication.AuthenticationNo')}</Radio>
+            </div>
+          </Form.Item>
+          <Form.Item style={{ marginTop: '24px' }}>
+            <Button
+              type="primary"
+              size="large"
+              onClick={onClick}
+            >{t('authentication.AuthenticationBtn')}</Button>
+          </Form.Item>
+        </Form>
+      </Card>
+    </>
+  )
+}

src/pages/authentication/components/DirectorInfo.jsx

@@ -4,9 +4,13 @@ import { useTranslation } from 'react-i18next';
 import "../style.less";
 
 export default (props) => {
+  const { index, setIndex } = props;
   const { t } = useTranslation();
   const [form] = Form.useForm();
 
+  const onNext = () => {
+    setIndex(index + 1)
+  }
   const onFinish = () => {
 
   };
@@ -84,6 +88,7 @@ export default (props) => {
           </Form.Item>
           {/* 其他董事 */}
           <div style={{ fontSize: '16px', fontWeight: '600' }}>{t('authentication.directorInfoOtherDirectors')}</div>
+          <Button type="primary" onClick={onNext} >{t('authentication.foundationInfoNextBtn')}</Button>
         </Card>
 
       </Form>

src/pages/authentication/components/EveryoneInfo.jsx

@@ -0,0 +1,71 @@
+import React from "react";
+import { Divider, Card, Steps, Button, Radio, Form, Input, Row, Col, Select, Image } from "antd";
+import UploadFile from "@/components/Upload/UploadFile";
+import { useTranslation } from 'react-i18next';
+import "../style.less";
+
+export default (props) => {
+  const { index, setIndex } = props;
+  const { t } = useTranslation();
+  const [form] = Form.useForm();
+
+  const onFinish = () => {
+
+  };
+  const onBack = () => {
+    setIndex(index - 1);
+  };
+  const onSubmit = () => {
+    setIndex(index + 1);
+  };
+
+  return (
+    <>
+      <div style={{ fontSize: '24px', fontWeight: '400' }}>{t('authentication.everyoneInfoTitle')}</div>
+      <Card bordered={false} style={{ width: '900px', marginBottom: '24px' }}>
+        <div style={{ fontSize: '16px', marginBottom: '24px' }}>{t('authentication.everyoneInfoContent1')}</div>
+        <div style={{ fontSize: '16px', fontWeight: '600' }}>{t('authentication.everyoneInfoContent2')}</div>
+        <Form
+          form={form}
+          layout="vertical"
+          onFinish={onFinish}
+          style={{ marginTop: '4em' }}
+        >
+          <Form.Item label={t('authentication.everyoneInfoInputLabel1')}>
+            <Radio style={{ fontSize: '16px' }}>{t('authentication.everyoneInfoInputRadioValue1')}</Radio>
+            <Radio style={{ fontSize: '16px' }}>{t('authentication.everyoneInfoInputRadioValue2')}</Radio>
+          </Form.Item>
+          <Form.Item>
+            <div style={{ marginTop: '40px', fontSize: '16px' }}>{t('authentication.everyoneInfoUploadTitle')}</div>
+            <div style={{ display: 'flex', alignItems: 'stretch ' }}>
+              <div className="authentication-right-upload-box">
+                <UploadFile />
+              </div>
+              <div style={{ flex: 1.2 }}>
+                <div style={{ padding: '0 15px', color: '#bfbfbf' }}>{t('authentication.everyoneInfoUploadText1')}</div>
+                <div style={{ padding: '0 15px', color: '#bfbfbf' }}>{t('authentication.everyoneInfoUploadText2')}</div>
+                <div style={{ padding: '0 15px', color: '#bfbfbf' }}>{t('authentication.everyoneInfoUploadText3')}</div>
+                <Button type="link">{t('authentication.uploadBtnText')}</Button>
+              </div>
+            </div>
+          </Form.Item>
+          <Form.Item label={t('authentication.everyoneInfoInputLabel2')}>
+            <Radio style={{ fontSize: '16px' }}>{t('authentication.everyoneInfoInputRadioValue1')}</Radio>
+            <Radio style={{ fontSize: '16px' }}>{t('authentication.everyoneInfoInputRadioValue2')}</Radio>
+            <div style={{ color: '#ffac00' }}>{t('authentication.everyoneInfoRadioTip')}</div>
+          </Form.Item>
+          <Radio>
+            {t('authentication.everyoneInfoAgreement')}
+            <a>{t('authentication.everyoneInfoAgreementTitle1')}</a>
+            {t('authentication.everyoneInfoAgreementEnd')}
+            <a>{t('authentication.everyoneInfoAgreementTitle2')}</a>
+          </Radio>
+        </Form>
+        <Form.Item style={{ marginTop: '24px' }}>
+          <Button size="large" style={{ width: '6vw', marginRight: '2vw' }} onClick={onBack}>{t('authentication.everyoneInfoBack')}</Button>
+          <Button size="large" type="primary" style={{ width: '6vw' }} onClick={onSubmit}>{t('authentication.everyoneInfoSubmit')}</Button>
+        </Form.Item>
+      </Card>
+    </>
+  )
+}

src/pages/authentication/components/FaceRecognition.jsx

@@ -0,0 +1,40 @@
+import React, { useState } from "react";
+import { Tag, Card, Steps, Button, Radio, Form, Input, Row, Col, Select, Image } from "antd";
+import { useTranslation } from 'react-i18next';
+import FaceRecognitionModal from "./FaceRecognitionModal";
+import "../style.less";
+
+export default (props) => {
+  const { t } = useTranslation();
+  const [open, setOpen] = useState(false)
+
+  const onOpen = () => {
+    setOpen(true)
+  }
+
+  return (
+    <>
+      <div style={{ fontSize: '24px', fontWeight: '400' }}>{t('authentication.FaceRecognitionTitle')}</div>
+      <Card bordered={false} style={{ width: '900px', paddingBottom: '3vw' }}>
+        <div style={{ fontSize: '16px', marginBottom: '24px' }}>{t('authentication.FaceRecognitionContent1')}</div>
+        <div style={{ fontSize: '16px', fontWeight: 'bold', marginBottom: '12px' }}>{t('authentication.FaceRecognitionSubTitle')}</div>
+        <div className="face-recognition-box">
+          <div style={{ flex: 0.3 }}>
+            <div style={{ fontSize: '16px' }}>{t('authentication.FaceRecognitionName')}</div>
+            <div style={{ fontSize: '16px', fontWeight: 'bold' }}>XXX</div>
+          </div>
+          <div style={{ flex: 0.4 }}>
+            <div style={{ fontSize: '16px' }}>{t('authentication.FaceRecognitionState')}</div>
+            <div><Tag color="orange">{t('authentication.FaceRecognitionTag1')}</Tag></div>
+          </div>
+          <div style={{ flex: 0.3 }}>
+            <Button type="primary" onClick={onOpen}>{t('authentication.FaceRecognitionBtn1')}</Button>
+          </div>
+        </div>
+        <div style={{ fontSize: '16px', marginTop: '12px', marginBottom: '40px' }}>{t('authentication.FaceRecognitionContent2')}</div>
+        <Button size="large" style={{ width: '6vw' }}>{t('authentication.FaceRecognitionBtn2')}</Button>
+      </Card>
+      <FaceRecognitionModal open={open} setOpen={setOpen} />
+    </>
+  )
+}

src/pages/authentication/components/FaceRecognitionModal.jsx

@@ -0,0 +1,38 @@
+import React from "react";
+import { Modal, Statistic, Button } from "antd";
+import { LinkOutlined } from '@ant-design/icons'
+import { useTranslation } from 'react-i18next';
+const { Countdown } = Statistic;
+
+export default (props) => {
+  const { open, setOpen } = props;
+  const { t } = useTranslation();
+  return (
+    <Modal
+      title={
+        <div style={{ textAlign: "center", fontWeight: "bold" }}>
+          {t('authentication.FaceRecognitionModalTitle')}
+        </div>
+      }
+      open={open}
+      onOk={props.onOk}
+      onCancel={() => setOpen(false)}
+      footer={null}
+    >
+      <div style={{ fontSize: "15px", marginBottom: "12px" }}>{t('authentication.FaceRecognitionModalContent1')}</div>
+      <div style={{ fontSize: "14px" }}>
+        {t('authentication.FaceRecognitionModalTip1')}
+        <Countdown
+          value={Date.now() + 10 * 1000}
+          format="mm:ss"
+          style={{ color: "red", display: "inline-block" }}
+        />
+        {t('authentication.FaceRecognitionModalTip2')}
+      </div>
+      <div style={{ fontSize: "16px", margin: "24px 0", textAlign: "center" }}>{t('authentication.FaceRecognitionDirector')}XX</div>
+      <div style={{ display: "flex", justifyContent: "center" }}>
+        <Button type="primary"><LinkOutlined />{t('authentication.FaceRecognitionBtn')}</Button>
+      </div>
+    </Modal>
+  )
+}

src/pages/authentication/components/FoundationInfo.jsx

@@ -11,7 +11,7 @@ export default (props) => {
 
   const onFinish = () => {
 
-  };     
+  };
 
   const onNext = () => {
     setIndex(index + 1)
@@ -20,10 +20,10 @@ export default (props) => {
   return (
     <>
       <div style={{ fontSize: '24px', fontWeight: '400' }}>{t('authentication.titleRight')}</div>
-      <Card bordered={false} style={{ width: '900px', marginBottom: '24px' }}>
+      {/* <Card bordered={false} style={{ width: '900px', marginBottom: '24px' }}>
         <div style={{ color: 'red', fontWeight: '600' }}>{t('authentication.rightTopSubTitle')}</div>
         <div style={{ color: '#bfbfbf' }}>{t('authentication.rightTopText')}</div>
-      </Card>
+      </Card> */}
       <Form
         form={form}
         layout="vertical"
@@ -38,9 +38,9 @@ export default (props) => {
                 <UploadFile />
               </div>
               <div style={{ flex: 1.2 }}>
-                <div style={{ padding: '0 15px' }}>{t('authentication.uploadPromptText1')}</div>
-                <div style={{ padding: '0 15px' }}>{t('authentication.uploadPromptText2')}</div>
-                <div style={{ padding: '0 15px' }}>{t('authentication.uploadPromptText3')}</div>
+                <div style={{ padding: '0 15px', color: '#bfbfbf' }}>{t('authentication.uploadPromptText1')}</div>
+                <div style={{ padding: '0 15px', color: '#bfbfbf' }}>{t('authentication.uploadPromptText2')}</div>
+                <div style={{ padding: '0 15px', color: '#bfbfbf' }}>{t('authentication.uploadPromptText3')}</div>
                 <Button type="link">{t('authentication.uploadBtnText')}</Button>
               </div>
             </div>
@@ -52,9 +52,9 @@ export default (props) => {
                 <UploadFile />
               </div>
               <div style={{ flex: 1.2 }}>
-                <div style={{ padding: '0 15px' }}>{t('authentication.uploadPromptText1')}</div>
-                <div style={{ padding: '0 15px' }}>{t('authentication.uploadPromptText2')}</div>
-                <div style={{ padding: '0 15px' }}>{t('authentication.uploadPromptText3')}</div>
+                <div style={{ padding: '0 15px', color: '#bfbfbf' }}>{t('authentication.uploadPromptText1')}</div>
+                <div style={{ padding: '0 15px', color: '#bfbfbf' }}>{t('authentication.uploadPromptText2')}</div>
+                <div style={{ padding: '0 15px', color: '#bfbfbf' }}>{t('authentication.uploadPromptText3')}</div>
                 <div style={{ padding: '0 15px', fontWeight: '600' }}>4.{t('authentication.uploadPromptTextII4')}</div>
                 <Button type="link">{t('authentication.uploadBtnText')}</Button>
               </div>
@@ -67,10 +67,10 @@ export default (props) => {
                 <UploadFile />
               </div>
               <div style={{ flex: 1.2 }}>
-                <div style={{ padding: '0 15px' }}>{t('authentication.uploadPromptText1')}</div>
-                <div style={{ padding: '0 15px' }}>{t('authentication.uploadPromptText2')}</div>
-                <div style={{ padding: '0 15px' }}>{t('authentication.uploadPromptText3')}</div>
-                <div style={{ padding: '0 15px' }}>{t('authentication.uploadPromptTextIII4')}</div>
+                <div style={{ padding: '0 15px', color: '#bfbfbf' }}>{t('authentication.uploadPromptText1')}</div>
+                <div style={{ padding: '0 15px', color: '#bfbfbf' }}>{t('authentication.uploadPromptText2')}</div>
+                <div style={{ padding: '0 15px', color: '#bfbfbf' }}>{t('authentication.uploadPromptText3')}</div>
+                <div style={{ padding: '0 15px', color: '#bfbfbf' }}>{t('authentication.uploadPromptTextIII4')}</div>
                 <div style={{ padding: '0 15px', fontWeight: '600' }}>5.{t('authentication.uploadPromptTextII4')}</div>
                 <Button type="link">{t('authentication.uploadBtnText')}</Button>
               </div>
@@ -83,9 +83,9 @@ export default (props) => {
                 <UploadFile />
               </div>
               <div style={{ flex: 1.2 }}>
-                <div style={{ padding: '0 15px' }}>{t('authentication.uploadPromptText1')}</div>
-                <div style={{ padding: '0 15px' }}>{t('authentication.uploadPromptText2')}</div>
-                <div style={{ padding: '0 15px' }}>{t('authentication.uploadPromptText3')}</div>
+                <div style={{ padding: '0 15px', color: '#bfbfbf' }}>{t('authentication.uploadPromptText1')}</div>
+                <div style={{ padding: '0 15px', color: '#bfbfbf' }}>{t('authentication.uploadPromptText2')}</div>
+                <div style={{ padding: '0 15px', color: '#bfbfbf' }}>{t('authentication.uploadPromptText3')}</div>
                 <Button type="link">{t('authentication.uploadBtnText')}</Button>
               </div>
             </div>

src/pages/authentication/index.jsx

@@ -1,8 +1,11 @@
 import React, { useState } from "react";
 import { Divider, Card, Steps, Button, Radio, Form, Input, Row, Col, Select } from "antd";
 import Page from "@/components/Page";
+import Authentication from "./components/Authentication";
 import FoundationInfo from "./components/FoundationInfo";
 import DirectorInfo from "./components/DirectorInfo";
+import EveryoneInfo from "./components/EveryoneInfo";
+import FaceRecognition from "./components/FaceRecognition";
 import { useTranslation } from 'react-i18next';
 import "./style.less";
 
@@ -21,6 +24,9 @@ export default (props) => {
               current={index}
               direction="vertical"
               items={[
+                {
+                  title: t('authentication.stepsTitle'),
+                },
                 {
                   title: t('authentication.stepsTitle1'),
                 },
@@ -43,12 +49,27 @@ export default (props) => {
         <div style={{ flex: 1.5 }}>
           {
             index === 0 && (
-              <FoundationInfo index={index} setIndex={setIndex} />
+              <Authentication index={index} setIndex={setIndex} />
             )
-          },
+          }
           {
             index === 1 && (
-              <DirectorInfo />
+              <FoundationInfo index={index} setIndex={setIndex} />
+            )
+          }
+          {
+            index === 2 && (
+              <DirectorInfo index={index} setIndex={setIndex} />
+            )
+          }
+          {
+            index === 3 && (
+              <EveryoneInfo index={index} setIndex={setIndex} />
+            )
+          }
+          {
+            index === 4 && (
+              <FaceRecognition index={index} setIndex={setIndex} />
             )
           }
         </div>

src/pages/authentication/style.less

@@ -13,7 +13,7 @@
     display: flex;
     justify-content: center;
     align-items: center;
-    border: 1px dashed;
+    border: 1px dashed #1890ff;
     display: 1;
     flex: 0.8;
   }
@@ -27,4 +27,10 @@
     width: 600px;
     background-color: #bfbfbf;
   }
+  .face-recognition-box {
+    display: flex;
+    align-items: center;
+    background-color: rgba(191, 191, 191, 0.1);
+    padding: 24px;
+  }
 }

src/pages/firstPage/components/DetailedPlan.jsx

@@ -89,7 +89,7 @@ export default (props) => {
                   <div className="title">实时互转</div>
                   <div style={{ height: "12px" }}></div>
                   <div className="nicety">
-                    <div>无额外成本，0费用完成Qbit账户间互转。</div>
+                    <div>无额外成本，0费用完成快云账户间互转。</div>
                     <div>不必提现，实时收付境内外供应商费用。</div>
                   </div>
                 </div>

src/pages/firstPage/components/InWebsite.jsx

@@ -1,13 +1,20 @@
 import { ContainerOutlined } from "@ant-design/icons";
+import { useNavigate } from "react-router-dom";
 import React from "react";
 export default (props) => {
-  const onLogin=()=>{}
-  const onRegister=()=>{}
+  const navigate = useNavigate();
+
+  const onLogin = () => {
+    navigate(`/qLogin`)
+  }
+  const onRegister = () => {
+    navigate(`/qRegister`)
+  }
   return (
     <div className="InWebsite">
       <ContainerOutlined />
       <div onClick={onLogin}>登录</div>
-      <div className="flicker"  onClick={onRegister}>
+      <div className="flicker" onClick={onRegister}>
         <span >注册</span>
       </div>
     </div>

src/pages/qLogin/QLogin.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useParams } from "react-router-dom";
 import md5 from "md5";
 import { Button, Form, Input, Radio, Select, Row, Col, message } from "antd";
 import { login } from "@/services/login";
@@ -10,17 +10,19 @@ export default (props) => {
   const [loading, setLoading] = React.useState(false);
 
   const [form] = Form.useForm();
+
   const onFinish = (values) => {
+
     setLoading(true);
     login({
       loginName: values.loginName,
-      loginType: "platform.pc",
+      loginType: "admin.pc",
       password: md5(values.password),
     })
       .then((res) => {
         setLoading(true);
         try {
-          navigate("/authentication");
+          navigate('/authentication');
         } catch (e) {
           message.error(e);
         }
@@ -36,7 +38,7 @@ export default (props) => {
 
   return (
     <div className="qlogin-right-box">
-      <div className="qlogin-right-title">登录你的Qbit账户</div>
+      <div className="qlogin-right-title">登录你的快云账户</div>
       <Form
         form={form}
         layout="vertical"
@@ -44,11 +46,11 @@ export default (props) => {
         onFinish={onFinish}
       >
         <Form.Item
-          label="手机号"
+          label="登录名"
           name="loginName"
-        // rules={[{ required: true }]}
+          rules={[{ required: true }]}
         >
-          <Input.Group>
+          {/* <Input.Group>
             <Row>
               <Col span={8}>
                 <Select defaultValue="+86">
@@ -58,7 +60,8 @@ export default (props) => {
               </Col>
               <Col span={16}><Input placeholder="请输入手机号" /></Col>
             </Row>
-          </Input.Group>
+          </Input.Group> */}
+          <Input placeholder="请输入登录名" />
         </Form.Item>
         <Form.Item
           label="密 码"
@@ -82,7 +85,7 @@ export default (props) => {
         </Form.Item>
       </Form>
       <div style={{ display: 'flex', alignItems: 'center' }}>
-        <div>还没有Qbit账户？</div><Button type="link" onClick={() => navigate('/qRegister')}>立即注册</Button>
+        <div>还没有快云账户？</div><Button type="link" onClick={() => navigate('/qRegister')}>立即注册</Button>
       </div>
     </div>
   )

src/pages/qRegister/QRegister.jsx

@@ -1,20 +1,48 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { useNavigate } from "react-router-dom";
-import { Button, Form, Input, Radio, Select, Row, Col, Checkbox } from "antd";
+import {
+  ProForm,
+  ProFormText,
+  ProFormDependency,
+} from "@ant-design/pro-components";
+import { Button, Form, Input, Radio, Select, Row, Col, Checkbox, message } from "antd";
+import { register } from "@/services/login";
 import "./style.less";
 
 export default (props) => {
   const navigate = useNavigate();
-
+  const [loading, setLoading] = useState(false);
   const { Search } = Input;
   const [form] = Form.useForm();
-  const onFinish = () => {
+  const formRef = useRef();
+
+  const onFinish = (values) => {
+    setLoading(true);
+    register({
+      userName: values.userName,
+      loginType: "platform.pc",
+      password: values.password,
+      phone: values.phone
+    })
+      .then((res) => {
+        setLoading(true);
+        try {
+          navigate("/qLogin");
+        } catch (e) {
+          message.error(e);
+        }
+        setLoading(false);
+      })
+      .catch((err) => {
+        setLoading(false);
+      });
 
+    setLoading(false);
   }
 
   return (
     <div className="qregister-right-box">
-      <div className="qregister-right-title">开通Qbit账户</div>
+      <div className="qregister-right-title">开通快云账户</div>
       <div style={{ display: 'flex', alignItems: 'center', marginBottom: '40px' }}>
         <div>已有账户？</div><Button type="link" onClick={() => navigate('/qLogin')}>去登陆</Button>
       </div>
@@ -25,11 +53,17 @@ export default (props) => {
         onFinish={onFinish}
       >
         <Form.Item
-          label="手机号"
-          name="loginName"
+          label="用户名(选填)"
+          name="userName"
+        >
+          <Input placeholder="请输入用户名" />
+        </Form.Item>
+        <Form.Item
+          label="手机号(账户)"
+          name="phone"
           rules={[{ required: true }]}
         >
-          <Input.Group>
+          {/*<Input.Group>
             <Row>
               <Col span={8}>
                 <Select defaultValue="+86">
@@ -39,10 +73,11 @@ export default (props) => {
               </Col>
               <Col span={16}><Input placeholder="请输入手机号" /></Col>
             </Row>
-          </Input.Group>
+          </Input.Group> */}
+          <Input placeholder="请输入手机号" />
         </Form.Item>
 
-        <Form.Item
+        {/* <Form.Item
           label="验证码"
           name="loginName"
           rules={[{ required: true }]}
@@ -55,7 +90,7 @@ export default (props) => {
               <Col span={9}><Button type="primary">获取验证码</Button></Col>
             </Row>
           </Input.Group>
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item
           label="设置密码"
           name="password"
@@ -66,7 +101,7 @@ export default (props) => {
             style={{ borderRadius: "4px" }}
           />
         </Form.Item>
-        <Form.Item
+        {/* <Form.Item
           label="确认密码"
           name="password"
           rules={[{ required: true }]}
@@ -75,16 +110,16 @@ export default (props) => {
             placeholder="请再次输入密码"
             style={{ borderRadius: "4px" }}
           />
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item
           label="微信号(选填)"
-          name="loginName"
+          name="wxId"
         >
           <Input placeholder="请输入微信号/手机号" style={{ borderRadius: "4px" }} />
         </Form.Item>
         <Form.Item
           label="邀请码(选填)"
-          name="loginName"
+          name="ycCode"
         >
           <Input placeholder="若有，请输入邀请码" style={{ borderRadius: "4px" }} />
         </Form.Item>

src/routes/routes.jsx

@@ -43,9 +43,13 @@ import QRegister from "@/pages/qRegister/index";
 
 export const authRoutes = [
   {
-    // index: true,
-    element: <Navigate to="/homepage" />,
+    index: true,
+    element: <Navigate to="/authentication" />,
   },
+  // {
+  //   path: "/qLogin",
+  //   element: <QLogin />,
+  // },
   // 实名认证流程
   {
     path: "/authentication",
@@ -198,10 +202,10 @@ export const defaultRoutes = [
     element: <QLogin />,
   },
   // q注册页
-  // {
-  //   path: "/qRegister",
-  //   element: <QRegister />,
-  // },
+  {
+    path: "/qRegister",
+    element: <QRegister />,
+  },
   // {
   //   path: "/login",
   //   element: <Login />,

src/services/login.js

@@ -6,12 +6,30 @@ import request from "@/utils/request";
 export const changePassword = (data) =>
   request(`/change-password`, { data, method: "put" });
 
+/*
+ * 修改手机号
+ */
+export const changePhone = (data) =>
+  request(`/change-phone`, { data, method: "put" });
+
+/*
+ * 修改邮箱
+ */
+export const changeEmail = (data) =>
+  request(`/change-email`, { data, method: "put" });
+
 /*
  * 后台登录
  */
 export const login = (data) =>
   request("/login", { data, method: "post" });
 
+/*
+* 后台注册
+*/
+export const register = (data) =>
+  request("/register", { data, method: "post" });
+
 /*
 * 登出
 */

src/store/models/user.js

@@ -4,7 +4,7 @@ import { getMenuItems } from "@/routes/menus";
 import { currentUser } from "@/services/login";
 import { getAuthedRoutes } from "@/routes/permissions";
 
-export default function useUser() {
+export default function useUser () {
   const [user, setUser] = useState(null);
   const menusRef = useRef();
   const routesRef = useRef();
@@ -12,22 +12,23 @@ export default function useUser() {
 
   const getCurrentUser = () =>
     new Promise((resolve, reject) => {
-      console.log(1);
-      // currentUser()
-      //   .then((res) => {
+      // console.log(1);
+      currentUser()
+        .then((res) => {
 
-      // dbMenusRef.current = res?.menuList || [];
-      // const permissions = dbMenusRef.current.map((x) => x.menuCode);
-      // authRoutes 是所有待验证授权的路由
-      // authedRoutes 是已经被授权的路由
-      const authedRoutes = getAuthedRoutes(authRoutes, []);
-      console.log(authedRoutes);
-      menusRef.current = getMenuItems(authedRoutes);
-      routesRef.current = mergeAuthRoutes(defaultRoutes, authedRoutes);
-      setUser({ userId: 2 });
-      resolve({ userId: 2 });
-      // })
-      // .catch(reject);
+          dbMenusRef.current = res?.menuList || [];
+          const permissions = dbMenusRef.current.map((x) => x.menuCode);
+          // authRoutes 是所有待验证授权的路由
+          // authedRoutes 是已经被授权的路由
+          const authedRoutes = getAuthedRoutes(authRoutes, permissions || []);
+          // console.log(authedRoutes);
+          menusRef.current = getMenuItems(authedRoutes);
+          routesRef.current = mergeAuthRoutes(defaultRoutes, authedRoutes);
+          setUser(res);
+          // { userId: 2 }
+          resolve();
+        })
+        .catch(reject);
     });
 
   return {