f

src/layouts/AuthLayout/RequireLogin.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import { useModel } from "@/store";
+import { currentUser } from "@/services/login";
 
 export default (props) => {
   const { user, getCurrentUser } = useModel("user");
@@ -18,6 +19,11 @@ export default (props) => {
           setUserStatus(-1);
         });
     }
+    currentUser().then((res) => {
+      if (!res.user?.email) {
+        navigate("/bindEmail");
+      }
+    });
   }, []);
 
   useEffect(() => {

src/locale/zh.json

@@ -154,6 +154,10 @@
     "btnText4": "去提交",
     "text4": "请结合您的实际业务运营情况及时提交新的业务场景",
 
+    "title5": "启用谷歌身份验证器",
+    "btnText5": "去启用",
+    "text5": "为了您的账户安全，请启用谷歌身份验证器（Google Authenticator）",
+
     "emailTitle": "修改邮箱",
     "emailInput1": "原始邮箱",
     "emailInput2": "新邮箱",
@@ -182,5 +186,12 @@
     "title4": "填写企业受益所有人信息",
     "title5": "人脸识别",
     "title6": "确认提交"
+  },
+  "bindEmail": {
+    "extra": "请绑定您的邮箱",
+    "label": "邮箱",
+    "placeholder": "请输入邮箱",
+    "message": "请输入邮箱",
+    "submit": "确定"
   }
 }

src/pages/accountsettings/components/ChangeModalEmail.jsx

@@ -10,18 +10,19 @@ import { useNavigate } from "react-router-dom";
 import { useTranslation } from 'react-i18next';
 
 export default (props) => {
-  const { opEmail, setOpEmail } = props;
+  const { opEmail, setOpEmail, setEmail, hideEmail } = props;
   const navigate = useNavigate();
   const { t } = useTranslation();
 
   const onFinish = async (values) => {
     const data = {
-      originEmail: md5(values.email),
-      newEmail: md5(values.newEmail),
+      originEmail: values.email,
+      newEmail: values.newEmail,
     };
     await changeEmail(data);
-    navigate(`/login`);
-
+    let email = hideEmail(values?.newEmail);
+    setEmail(email)
+    setOpEmail(false)
     return true;
   };
 

src/pages/accountsettings/components/ChangeModalPhone.jsx

@@ -27,7 +27,7 @@ export default (props) => {
 
   return (
     <ModalForm
-      title={t('accountsettings.emailTitle')}
+      title={t('accountsettings.phoneTitle')}
       width="480px"
       open={opPhone}
       modalProps={{

src/pages/accountsettings/index.jsx

@@ -13,14 +13,31 @@ export default (props) => {
   const [opPhone, setOpPhone] = useState(false);
   const [opEmail, setOpEmail] = useState(false);
   const [phone, setPhone] = useState();
+  const [email, setEmail] = useState();
 
   const navigate = useNavigate();
 
   const { t } = useTranslation();
+
+  const hideEmail = (email) => {
+    // 分割邮箱地址，获取用户名和域名部分  
+    const [user, domain] = email?.split('@');
+
+    // 替换用户名的中间部分为星号  
+    const hiddenUser = user.charAt(0) + '****' + user.charAt(user.length - 1);
+    console.log('hiddenUser', hiddenUser);
+
+    // 重新组合隐藏的邮箱地址  
+    const hiddenEmail = `${hiddenUser}@${domain}`;
+
+    return hiddenEmail;
+  }
   useEffect(() => {
     currentUser().then((res) => {
       let secretPhone = (res.user.phone).replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+      let secretEmail = hideEmail(res.user.email);
       setPhone(secretPhone)
+      setEmail(secretEmail)
     })
   }, [])
 
@@ -72,7 +89,7 @@ export default (props) => {
         </div>
 
         <div style={{ display: "flex", alignItems: "stretch", marginTop: '24px' }}>
-          <div style={{ flex: 0.5, marginRight: '24px' }}>
+          <div style={{ flex: 1, marginRight: '24px' }}>
             <Card>
               <div style={{ display: "flex", alignItems: "stretch" }}>
                 <div style={{ flex: 0.4, display: "flex", justifyContent: "center" }}>
@@ -83,7 +100,23 @@ export default (props) => {
                     <div style={{ fontSize: "16px", fontWeight: "bold" }}>{t('accountsettings.title3')}</div>
                     <Button type="ghost" onClick={onOpenEmail}>{t('accountsettings.btnText3')}</Button>
                   </div>
-                  <div style={{ paddingTop: '1em', color: '#bfbfbf' }}>{t('accountsettings.text3')}99****qq.com</div>
+                  <div style={{ paddingTop: '1em', color: '#bfbfbf' }}>{t('accountsettings.text3')}{email}</div>
+                </div>
+              </div>
+            </Card>
+          </div>
+          <div style={{ flex: 1 }}>
+            <Card>
+              <div style={{ display: "flex", alignItems: "stretch" }}>
+                <div style={{ flex: 0.4, display: "flex", justifyContent: "center" }}>
+                  <img src="	https://qbitnetwork.com/app/img/ga-qbit.06a15090.png" alt={t('accountsettings.title5')} width="100" />
+                </div>
+                <div style={{ flex: 1.6 }}>
+                  <div style={{ display: "flex", justifyContent: "space-between", paddingTop: '10px' }}>
+                    <div style={{ fontSize: "16px", fontWeight: "bold" }}>{t('accountsettings.title5')}</div>
+                    <Button type="ghost">{t('accountsettings.btnText5')}</Button>
+                  </div>
+                  <div style={{ paddingTop: '1em', color: '#bfbfbf' }}>{t('accountsettings.text5')}</div>
                 </div>
               </div>
             </Card>
@@ -113,7 +146,7 @@ export default (props) => {
 
         <ChangeModalPhone opPhone={opPhone} setOpPhone={setOpPhone} />
         <ChangeModalPassword visible={visible} setVisible={setVisible} />
-        <ChangeModalEmail opEmail={opEmail} setOpEmail={setOpEmail} />
+        <ChangeModalEmail opEmail={opEmail} setOpEmail={setOpEmail} setEmail={setEmail} hideEmail={hideEmail} />
       </Page>
     </div>
   )

src/pages/bindEmail/index.jsx

@@ -0,0 +1,49 @@
+import React, { useState, useEffect } from "react";
+import { Divider, Card, Button, Radio, Form, Input, Row, Col } from "antd";
+import { useTranslation } from 'react-i18next';
+import { useNavigate } from "react-router-dom";
+import { changeEmail } from "@/services/login";
+
+export default (props) => {
+  const navigate = useNavigate();
+
+  const { t } = useTranslation();
+  const [form] = Form.useForm();
+
+  const onFinish = (values) => {
+    changeEmail(values).then((res) => {
+      navigate("/authentication");
+    })
+  };
+
+  return (
+    <Row justify="center" style={{ marginTop: '48px' }}>
+      <Col span={12}>
+        <Card
+          title={
+            <div>
+              {t('bindEmail.extra')}
+            </div>}
+        >
+          <Form
+            form={form}
+            size="large"
+            onFinish={onFinish}
+          >
+            <Form.Item label={t('bindEmail.label')} rules={[{ required: true, message: t('bindEmail.message') }]} name="newEmail">
+              <Input placeholder={t('bindEmail.placeholder')} />
+
+            </Form.Item>
+            <Form.Item>
+              <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
+                <Button type="primary" htmlType="submit">
+                  {t('bindEmail.submit')}
+                </Button>
+              </div>
+            </Form.Item>
+          </Form>
+        </Card>
+      </Col>
+    </Row>
+  )
+}

src/pages/incorporation/index.jsx

@@ -36,21 +36,21 @@ export default (props) => {
         <Card>
           <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', padding: '0 24px' }}>
             <div style={{ textAlign: 'center' }}>
-              <img src="https://qbitnetwork.com/app/img/register-img-1.f346588c.png" width="130px" />
+              <img src="./img/step4.jpg" width="130px" />
               <div style={{ fontSize: '14px', fontWeight: 'bold' }}>
                 {t('incorporation.title4')}
               </div>
             </div>
             <div style={{ border: '1px dashed #82ced2', width: '20vw' }} />
             <div style={{ textAlign: 'center' }}>
-              <img src="https://qbitnetwork.com/app/img/register-img-2.cc735250.png" width="130px" />
+              <img src="./img/step5.jpg" width="130px" />
               <div style={{ fontSize: '14px', fontWeight: 'bold' }}>
                 {t('incorporation.title5')}
               </div>
             </div>
             <div style={{ border: '1px dashed #82ced2', width: '20vw' }} />
             <div style={{ textAlign: 'center' }}>
-              <img src="https://qbitnetwork.com/app/img/register-img-3.b5b8bd86.png" width="130px" />
+              <img src="./img/step6.jpg" width="130px" />
               <div style={{ fontSize: '14px', fontWeight: 'bold' }}>
                 {t('incorporation.title6')}
               </div>

src/pages/qRegister/QRegister.jsx

@@ -17,28 +17,29 @@ export default (props) => {
   const formRef = useRef();
 
   const onFinish = (values) => {
-    // setLoading(true);
-    // register({
-    //   userName: values.userName,
-    //   loginType: "admin.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(true);
+    register({
+      userName: values.userName,
+      loginType: "admin.pc",
+      password: values.password,
+      phone: values.phone,
+      wxNum: values.wxNum,
+      invitationCode: values.invitationCode
+    })
+      .then((res) => {
+        setLoading(true);
+        try {
+          navigate("/qLogin");
+        } catch (e) {
+          message.error(e);
+        }
+        setLoading(false);
+      })
+      .catch((err) => {
+        setLoading(false);
+      });
 
-    // setLoading(false);
-    navigate("/qLogin");
+    setLoading(false);
   }
 
   return (
@@ -114,29 +115,30 @@ export default (props) => {
         </Form.Item> */}
         <Form.Item
           label="微信号(选填)"
-          name="wxId"
+          name="wxNum"
         >
           <Input placeholder="请输入微信号/手机号" style={{ borderRadius: "4px" }} />
         </Form.Item>
         <Form.Item
           label="邀请码(选填)"
-          name="ycCode"
+          name="invitationCode"
         >
           <Input placeholder="若有，请输入邀请码" style={{ borderRadius: "4px" }} />
         </Form.Item>
-        {/* 这个是 我已阅读并同意 的东西，涛哥你看适当放开 */}
 
-        {/* <Form.Item name="check"
+        <Form.Item name="check"
           rules={[{ required: true, message: '请阅读并勾选协议' }]}>
-          <Checkbox>
-            <div>
-              <span>我已阅读并同意</span>
-              <a href="https://qbitnetwork.com/terms?type=QbitGeneralTermsAndConditions" target="_blank">快云 General Terms and Conditions</a>和
-              <a href="https://qbitnetwork.com/terms?type=PrivacyPolicies" target="_blank">Privacy Policies</a>
-            </div>
+          <Checkbox.Group value="1">
+            <Checkbox value="1">
+              <div>
+                <span>我已阅读并同意</span>
+                <a href="https://qbitnetwork.com/terms?type=QbitGeneralTermsAndConditions" target="_blank">快云 General Terms and Conditions</a>和
+                <a href="https://qbitnetwork.com/terms?type=PrivacyPolicies" target="_blank">Privacy Policies</a>
+              </div>
 
-          </Checkbox>
-        </Form.Item> */}
+            </Checkbox>
+          </Checkbox.Group>
+        </Form.Item>
         <Form.Item>
           <Button
             type="primary"

src/routes/routes.jsx

@@ -27,6 +27,7 @@ import StoreForeignExchange from "@/pages/storeforeignexchange";
 import QuantuMstored from "@/pages/quantumstored";
 import QuantumCredit from "@/pages/quantumcredit";
 import TransactionInquiry from "@/pages/transactioninquiry";
+import BindEmail from "@/pages/bindEmail";
 import FirstPage from "@/pages/firstPage/index";
 
 import QLogin from "@/pages/qLogin/index";
@@ -180,6 +181,14 @@ export const authRoutes = [
       icon: <SettingOutlined />,
     },
   },
+  {
+    path: "bindEmail",
+    element: <BindEmail />,
+    meta: {
+      title: "绑定邮箱",
+      hideInMenu: true,
+    },
+  },
 ];
 
 export const defaultRoutes = [