修复：采购订单,商品订单签署合同跳转认证

src/components/layout/menu/index.tsx

@@ -63,11 +63,14 @@ export function MenuView() {
     authRouterList().then((value) => {
       setItems(getItem(value));
     });
+  }, []);
+
+  useEffect(() => {
     // 设置当前选中的项目
     setOpenKeys([getRoutePid(routerList, location.pathname).toString()]);
     // 设置当前选中的项目的subMenu
     setSelectedKeys([getRouteID(routerList, location.pathname).toString()]);
-  }, []);
+  }, [location.pathname]);
   return (
     <Sider
       style={{ paddingTop: '50px' }}

src/components/order/productOrder/sureOrder/index.tsx

@@ -22,14 +22,12 @@ import { FddInterfaceAPI, OrderManageAPI } from '~/api';
 import IframeModal from '~/components/modal/iframeModal';
 import { decode } from 'js-base64';
 import { UploadFile } from 'antd/es/upload/interface';
-import { uploadContractType, userFddInfoType } from '~/api/interface/fddInterfaceType';
+import { uploadContractType } from '~/api/interface/fddInterfaceType';
 import { useNavigate } from 'react-router-dom';
 import dayjs from 'dayjs';
 
 // 商城订单对象类型
 type mallOrderItemType = InterListType<mallOrderListType>[0];
-// fdd实名认证信息类型
-type fddAuthType = InterDataType<userFddInfoType>;
 // 合同返回类型
 type contractType = InterDataType<uploadContractType>;
 
@@ -85,8 +83,6 @@ const SureOrder: FC<ModalProps & selfProps> = ({ open, onOk, onCancel, orderItem
   const [contractFileList, setContractFileList] = useState<UploadFile[]>([]);
   const [contractInfo, setContractInfo] = useState<contractType>();
   const [contractUrl, setContractUrl] = useState<string>('');
-  // fdd实名认证信息
-  const [fddAuthInfo, setFddAuthInfo] = useState<fddAuthType[0]>();
   const [iframeModalShow, setIframeModalShow] = useState<boolean>(false);
 
   // 合同上传
@@ -94,27 +90,23 @@ const SureOrder: FC<ModalProps & selfProps> = ({ open, onOk, onCancel, orderItem
     contractForm
       .validateFields(['contractTitle'])
       .then((values) => {
-        if (fddAuthInfo?.entVerifyStatus === 4) {
-          FddInterfaceAPI.uploadContract({
-            docUrl: value[0].url,
-            orderNo: orderItem.orderNo,
-            port: 1,
-            title: values.contractTitle,
+        FddInterfaceAPI.uploadContract({
+          docUrl: value[0].url,
+          orderNo: orderItem.orderNo,
+          port: 1,
+          title: values.contractTitle,
+        })
+          .then(({ result }) => {
+            setContractFileList(value);
+            contractForm.setFieldValue('contractUrl', value[0].url);
+            setContractInfo(result);
           })
-            .then(({ result }) => {
-              setContractFileList(value);
-              contractForm.setFieldValue('contractUrl', value[0].url);
-              setContractInfo(result);
-            })
-            .catch(() => {
-              setContractFileList([]);
-            });
-        } else {
-          message.warning('请先完成认证');
-          setTimeout(() => {
-            navigate('/systemManage/realNameAuth');
-          }, 500);
-        }
+          .catch(({ code }) => {
+            if (code === '1006' || code === '1005') {
+              navigate('/systemManage/realNameAuth');
+            }
+            setContractFileList([]);
+          });
       })
       .catch((error: any) => {
         setContractFileList([]);
@@ -134,14 +126,6 @@ const SureOrder: FC<ModalProps & selfProps> = ({ open, onOk, onCancel, orderItem
         message.warning(error?.errorFields[0]?.errors[0]);
       });
   };
-  // 获取fdd实名认证信息
-  const getAppUserFddInfo = () => {
-    FddInterfaceAPI.getAppUserFddInfo({ port: 1 }).then(({ result }) => {
-      if (result) {
-        setFddAuthInfo(result.find((v) => v.accountType === 2));
-      }
-    });
-  };
   // 签署合同
   const signContract = (contractId: string) => {
     FddInterfaceAPI.signContract({ contractId, port: 1 }).then(({ result }) => {
@@ -223,11 +207,6 @@ const SureOrder: FC<ModalProps & selfProps> = ({ open, onOk, onCancel, orderItem
       );
     }
   }, [orderItem, type]);
-  useEffect(() => {
-    if (open) {
-      getAppUserFddInfo();
-    }
-  }, [open]);
 
   return (
     <Modal open={open} title='确认订单' onOk={handleOk} onCancel={handleCancel} width={800}>

src/pages/orderManage/procurementOrder/orderList/index.tsx

@@ -300,12 +300,18 @@ const ProcurementOrderList = () => {
   };
   // 签署合同
   const contractSign = (contractId: string) => {
-    FddInterfaceAPI.signContract({ contractId, port: 1 }).then(({ result }) => {
-      if (result) {
-        setContractUrl(decode(result));
-        setIframeModalShow(true);
-      }
-    });
+    FddInterfaceAPI.signContract({ contractId, port: 1 })
+      .then(({ result }) => {
+        if (result) {
+          setContractUrl(decode(result));
+          setIframeModalShow(true);
+        }
+      })
+      .catch(({ code }) => {
+        if (code === '1006' || code === '1005') {
+          navigate('/systemManage/realNameAuth');
+        }
+      });
   };
   const iframeModalCancel = () => {
     setIframeModalShow(false);