f

src/pages/accountsettings/index.jsx

@@ -46,7 +46,7 @@ export default (props) => {
                 <div style={{ flex: 1.6 }}>
                   <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>
+                    <Button type="ghost" onClick={onOpenPassword}>{t('accountsettings.btnText1')}</Button>
                   </div>
                   <div style={{ paddingTop: '1em', color: '#bfbfbf' }}>{t('accountsettings.text1')}</div>
                 </div>
@@ -62,7 +62,7 @@ export default (props) => {
                 <div style={{ flex: 1.6 }}>
                   <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>
+                    <Button type="ghost" onClick={onOpenPhone}>{t('accountsettings.btnText2')}</Button>
                   </div>
                   <div style={{ paddingTop: '1em', color: '#bfbfbf' }}>{t('accountsettings.text2')}{phone}</div>
                 </div>
@@ -81,7 +81,7 @@ export default (props) => {
                 <div style={{ flex: 1.6 }}>
                   <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>
+                    <Button type="ghost" onClick={onOpenEmail}>{t('accountsettings.btnText3')}</Button>
                   </div>
                   <div style={{ paddingTop: '1em', color: '#bfbfbf' }}>{t('accountsettings.text3')}99****qq.com</div>
                 </div>
@@ -101,7 +101,7 @@ export default (props) => {
                 <div style={{ flex: 1.6 }}>
                   <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>
+                    <Button type="ghost" onClick={() => navigate('/authentication')} >{t('accountsettings.btnText4')}</Button>
                   </div>
                   <div style={{ paddingTop: '1em', color: '#bfbfbf' }}>{t('accountsettings.text4')}</div>
                 </div>

src/pages/authentication/components/Authentication.jsx

@@ -11,9 +11,9 @@ export default (props) => {
   const [form] = Form.useForm();
 
   const onFinish = (values) => {
-    // postTaCompanyRealName(values).then((res) => {
-    setIndex(index + 1);
-    // });
+    postTaCompanyRealName(values).then((res) => {
+      setIndex(index + 1);
+    });
   };
 
   return (

src/pages/authentication/components/DirectorInfo.jsx

@@ -10,10 +10,9 @@ export default (props) => {
   const [form] = Form.useForm();
 
   const onFinish = (values) => {
-    console.log('values2', values);
-    // postTaCompanyLegalInfo(values).then((res) => {
-    setIndex(index + 1);
-    // });
+    postTaCompanyLegalInfo([values]).then((res) => {
+      setIndex(index + 1);
+    });
   };
 
   return (

src/pages/authentication/components/EveryoneInfo.jsx

@@ -1,8 +1,8 @@
 import React, { useState } from "react";
-import { Divider, Card, Steps, Button, Radio, Form, Input, Row, Col, Select, Image } from "antd";
+import { Divider, Card, Steps, Button, Radio, Form, Input, Row, Col, Select, Checkbox } from "antd";
 import UploadFile from "@/components/Upload/UploadFile";
 import { useTranslation } from 'react-i18next';
-import { postTaCompanyInfo } from "@/services/taCompanyInfo";
+import { postTaCompanyBeneficiaryInfo } from "@/services/taCompanyBeneficiaryInfo";
 import "../style.less";
 
 export default (props) => {
@@ -12,10 +12,9 @@ export default (props) => {
 
   const [ratio, setRatio] = useState("0");
   const onFinish = (values) => {
-    console.log('values', values);
-    // postTaCompanyInfo(values).then((res) => {
-    setIndex(index + 1);
-    // });
+    postTaCompanyBeneficiaryInfo([values]).then((res) => {
+      setIndex(index + 1);
+    });
   };
   const onBack = () => {
     setIndex(index - 1);
@@ -53,19 +52,22 @@ export default (props) => {
           <Form.Item label={t('authentication.everyoneInfoUploadTitle')} style={{ marginTop: '40px', marginBottom: '36px' }} name="equityStructureChart">
             <UploadFile />
           </Form.Item>
-          <Form.Item label={t('authentication.everyoneInfoInputLabel2')} name="">
+          {/* <Form.Item label={t('authentication.everyoneInfoInputLabel2')} name="">
             <Radio.Group>
               <Radio style={{ fontSize: '16px' }} value="1">{t('authentication.everyoneInfoInputRadioValue1')}</Radio>
               <Radio style={{ fontSize: '16px' }} value="2">{t('authentication.everyoneInfoInputRadioValue2')}</Radio>
             </Radio.Group>
           </Form.Item>
-          <div style={{ marginBottom: '36px', color: '#ffac00', marginTop: '-24px' }}>{t('authentication.everyoneInfoRadioTip')}</div>
-          <Radio>
-            {t('authentication.everyoneInfoAgreement')}
-            <a>{t('authentication.everyoneInfoAgreementTitle1')}</a>
-            {t('authentication.everyoneInfoAgreementEnd')}
-            <a>{t('authentication.everyoneInfoAgreementTitle2')}</a>
-          </Radio>
+          <div style={{ marginBottom: '36px', color: '#ffac00', marginTop: '-24px' }}>{t('authentication.everyoneInfoRadioTip')}</div> */}
+
+          {/* <Form.Item name="check" rules={[{ required: true, message: '请阅读并勾选协议' }]}>
+            <Checkbox>
+              {t('authentication.everyoneInfoAgreement')}
+              <a>{t('authentication.everyoneInfoAgreementTitle1')}</a>
+              {t('authentication.everyoneInfoAgreementEnd')}
+              <a>{t('authentication.everyoneInfoAgreementTitle2')}</a>
+            </Checkbox>
+          </Form.Item> */}
           <Form.Item style={{ marginTop: '24px' }}>
             <Button size="large" style={{ width: '6vw', marginRight: '2vw' }} onClick={onBack}>{t('authentication.everyoneInfoBack')}</Button>
             <Button size="large" type="primary" htmlType="submit" style={{ width: '6vw' }}>{t('authentication.everyoneInfoSubmit')}</Button>

src/pages/authentication/components/FoundationInfo.jsx

@@ -11,10 +11,10 @@ export default (props) => {
   const { t } = useTranslation();
 
   const onFinish = (values) => {
-    console.log('values', values);
-    // postTaCompanyInfo(values).then((res) => {
-    setIndex(index + 1);
-    // });
+    console.log('values', [values]);
+    postTaCompanyInfo([values]).then((res) => {
+      setIndex(index + 1);
+    });
   };
 
   return (
@@ -123,17 +123,17 @@ export default (props) => {
 
           <Form.Item label={t('authentication.formRightLabel5')} wrapperCol={{ span: 18 }} name="numEmployees">
             <Select placeholder={t('authentication.formRightInputPlaceholder5')}>
-              <Select.Option value="1">{t('authentication.formRightInputNumber1')}</Select.Option>
-              <Select.Option value="2">{t('authentication.formRightInputNumber2')}</Select.Option>
-              <Select.Option value="3">{t('authentication.formRightInputNumber3')}</Select.Option>
+              <Select.Option value="1" style={{ backgroundColor: '#FFF' }}>{t('authentication.formRightInputNumber1')}</Select.Option>
+              <Select.Option value="2" style={{ backgroundColor: '#FFF' }}>{t('authentication.formRightInputNumber2')}</Select.Option>
+              <Select.Option value="3" style={{ backgroundColor: '#FFF' }}>{t('authentication.formRightInputNumber3')}</Select.Option>
             </Select>
           </Form.Item>
           <Form.Item label={t('authentication.formRightLabel6')} wrapperCol={{ span: 18 }} name="businessPremisesType">
             <Select placeholder={t('authentication.formRightInputPlaceholder6')}>
-              <Select.Option value="1">{t('authentication.formRightInputPlace1')}</Select.Option>
-              <Select.Option value="2">{t('authentication.formRightInputPlace2')}</Select.Option>
-              <Select.Option value="3">{t('authentication.formRightInputPlace3')}</Select.Option>
-              <Select.Option value="4">{t('authentication.formRightInputPlace4')}</Select.Option>
+              <Select.Option value="1" style={{ backgroundColor: '#FFF' }}>{t('authentication.formRightInputPlace1')}</Select.Option>
+              <Select.Option value="2" style={{ backgroundColor: '#FFF' }}>{t('authentication.formRightInputPlace2')}</Select.Option>
+              <Select.Option value="3" style={{ backgroundColor: '#FFF' }}>{t('authentication.formRightInputPlace3')}</Select.Option>
+              <Select.Option value="4" style={{ backgroundColor: '#FFF' }}>{t('authentication.formRightInputPlace4')}</Select.Option>
             </Select>
           </Form.Item>
           <Button type="primary" size="large" style={{ width: '6vw' }} htmlType="submit">{t('authentication.foundationInfoNextBtn')}</Button>

src/pages/authentication/index.jsx

@@ -49,21 +49,25 @@ export default (props) => {
         <div style={{ flex: 1.5 }}>
           {
             index === 0 && (
+              // 实名认证
               <Authentication index={index} setIndex={setIndex} />
             )
           }
           {
             index === 1 && (
+              // 填写企业基础信息
               <FoundationInfo index={index} setIndex={setIndex} />
             )
           }
           {
             index === 2 && (
+              // 填写企业董事信息
               <DirectorInfo index={index} setIndex={setIndex} />
             )
           }
           {
             index === 3 && (
+              // 填写企业受益所有人信息
               <EveryoneInfo index={index} setIndex={setIndex} />
             )
           }

src/pages/qRegister/QRegister.jsx

@@ -17,27 +17,28 @@ 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
+    // })
+    //   .then((res) => {
+    //     setLoading(true);
+    //     try {
+    //       navigate("/qLogin");
+    //     } catch (e) {
+    //       message.error(e);
+    //     }
+    //     setLoading(false);
+    //   })
+    //   .catch((err) => {
+    //     setLoading(false);
+    //   });
 
-    setLoading(false);
+    // setLoading(false);
+    navigate("/qLogin");
   }
 
   return (
@@ -123,14 +124,17 @@ export default (props) => {
         >
           <Input placeholder="若有，请输入邀请码" style={{ borderRadius: "4px" }} />
         </Form.Item>
-        <Checkbox>
-          <div>
-            <span>我已阅读并同意</span>
-            <a href="https://qbitnetwork.com/terms?type=QbitGeneralTermsAndConditions" target="_blank">Qbit General Terms and Conditions</a>和
-            <a href="https://qbitnetwork.com/terms?type=PrivacyPolicies" target="_blank">Privacy Policies</a>
-          </div>
+        <Form.Item name="check"
+          rules={[{ required: true, message: '请阅读并勾选协议' }]}>
+          <Checkbox>
+            <div>
+              <span>我已阅读并同意</span>
+              <a href="https://qbitnetwork.com/terms?type=QbitGeneralTermsAndConditions" target="_blank">Qbit General Terms and Conditions</a>和
+              <a href="https://qbitnetwork.com/terms?type=PrivacyPolicies" target="_blank">Privacy Policies</a>
+            </div>
 
-        </Checkbox>
+          </Checkbox>
+        </Form.Item>
         <Form.Item>
           <Button
             type="primary"

src/routes/routes.jsx

@@ -2,8 +2,11 @@ import {
   UserOutlined,
   SolutionOutlined,
   FileTextOutlined,
-  CreditCardOutlined,
+  FileProtectOutlined,
   IdcardOutlined,
+  SettingOutlined,
+  ShopOutlined,
+  BankOutlined
 } from "@ant-design/icons";
 import { Outlet, Navigate } from "react-router-dom";
 import AuthLayout from "@/layouts/AuthLayout";
@@ -61,7 +64,7 @@ export const authRoutes = [
     element: <HomePage />,
     meta: {
       title: "首页",
-      icon: <SolutionOutlined />,
+      icon: <BankOutlined />,
     },
   },
   {
@@ -141,7 +144,7 @@ export const authRoutes = [
     element: <QuickPass />,
     meta: {
       title: "闪付",
-      icon: <SolutionOutlined />,
+      icon: <ShopOutlined />,
     },
   },
   {
@@ -149,7 +152,7 @@ export const authRoutes = [
     element: <FinancialStatement />,
     meta: {
       title: "财务对账单",
-      icon: <SolutionOutlined />,
+      icon: <FileProtectOutlined />,
     },
   },
   {
@@ -173,7 +176,7 @@ export const authRoutes = [
     element: <AccountSettings />,
     meta: {
       title: "账号设置",
-      icon: <SolutionOutlined />,
+      icon: <SettingOutlined />,
     },
   },
 ];
@@ -213,7 +216,7 @@ export const defaultRoutes = [
   },
 ];
 
-export function mergeAuthRoutes(r1, r2) {
+export function mergeAuthRoutes (r1, r2) {
   const r = r1.slice();
   const children = r1[0].children.slice();
   r[0].children = children.concat(r2);
@@ -223,7 +226,7 @@ export function mergeAuthRoutes(r1, r2) {
 // 全部路由
 export const routes = mergeAuthRoutes(defaultRoutes, authRoutes);
 console.log(routes);
-function getPath(parent = "/", current = "") {
+function getPath (parent = "/", current = "") {
   if (current.indexOf("/") === 0 || current.indexOf("http") === 0)
     return current;
   return `${parent}/${current}`.replace(/\/\//g, "/");

src/services/taCompanyBeneficiaryInfo.js

@@ -0,0 +1,26 @@
+import request from "@/utils/request";
+
+/*
+ * 分页查询
+ */
+export const getTaCompanyBeneficiaryInfo = (params) => request(`/taCompanyBeneficiaryInfo`, { params });
+
+/*
+ * 新增数据
+ */
+export const postTaCompanyBeneficiaryInfo = (data) => request('/admin/taCompanyBeneficiaryInfo', { data, method: 'post' });
+
+/*
+ * 更新数据
+ */
+export const putTaCompanyBeneficiaryInfo = (id, data) => request(`/taCompanyBeneficiaryInfo/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteTaCompanyBeneficiaryInfo = (id) => request(`/taCompanyBeneficiaryInfo/${id}`, { method: 'delete' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getTaCompanyBeneficiaryInfoId = (id) => request(`/taCompanyBeneficiaryInfo/${id}`);