feat

src/api/register/index.js

@@ -9,7 +9,7 @@ export const sendMessageAction = declareRequest(
 // 新增用户（注册）
 export const registerAction = declareRequest(
   "registerLoading",
-  "Post > @/account/save"
+  "Post > @/safetyEval/account/save"
 );
 
 
@@ -21,5 +21,5 @@ export const orgInfoSave = declareRequest(
 
 export const syncUserToGBS = declareRequest(
   "syncUserToGBSLoading",
-  "Post > @/safetyEval/account/syncUserToGBS"
+  "Get > /safetyEval/account/syncUserToGBS"
 );

src/pages/Container/Register/index.js

@@ -14,10 +14,12 @@ import logo from "~/enumerate/img/logo.png";
 import leftIcon from "~/enumerate/img/left-img.jpg";
 import "./index.less";
 
-function Register({ sendMessageAction, registerAction, registerLoading }) {
+function Register(props) {
+  const { sendMessageAction, registerAction, register } = props;
   const [form] = Form.useForm();
   const [countdown, setCountdown] = useState(0);
   const [sending, setSending] = useState(false);
+  const {registerLoading}= register;
 
   const handleSendCode = async () => {
     const phone = form.getFieldValue("phone");
@@ -63,7 +65,7 @@ function Register({ sendMessageAction, registerAction, registerLoading }) {
     if (res.success) {
       message.success("操作成功");
       form.resetFields();
-      props.history.push(`registerMore?account=${values.account}`);
+      props.history.push(`registerMore?account=${values.account}&registerUserId=${res.data.id}`);
     }
   };
 

src/pages/Container/RegisterMore/index.js

@@ -41,7 +41,7 @@ import {
 } from "~/enumerate/enterpriseOptions";
 import "./index.less";
 
-const {router} = tools;
+const { router } = tools;
 
 const RegisterMore = (props) => {
   const { orgInfoSave, register, syncUserToGBS } = props;
@@ -53,6 +53,7 @@ const RegisterMore = (props) => {
     const formValues = await form.validateFields();
     const values = {
       ...formValues,
+      registerUserId: router.query.registerUserId,
       productionDate: formValues.productionDate
         ? dayjs(formValues.productionDate).format("YYYY-MM-DD")
         : undefined,
@@ -64,7 +65,10 @@ const RegisterMore = (props) => {
     };
     const result = await orgInfoSave(values);
     if (result.success) {
-      const syncResult = await syncUserToGBS({account: router.query.account});
+      const syncResult = await syncUserToGBS({
+        account: router.query.account,
+        registerUserId: router.query.registerUserId,
+      });
       if (syncResult.success) {
         message.success("保存成功");
         setCurrent(1);
@@ -116,7 +120,7 @@ const RegisterMore = (props) => {
         </Flex>
         {current === 0 && (
           <div>
-            <Form form={form} labelCol={{ span: 10 }} >
+            <Form form={form} labelCol={{ span: 10 }}>
               <Row gutter={[16, 16]}>
                 <Col span={12}>
                   <Form.Item