Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 678623bfc4825eb043c204df40fe47809ec2d024
+  newTag: bc9cd408e635ff1422c33129fc8f96d1853de9c0

src/pages/orderManage/equipmentOrder/comp/detailPurchaser/index.tsx

@@ -117,7 +117,7 @@ const DetailPurchaser: React.FC<PropsType> = (props) => {
       ) : (
         ''
       )}
-      {detail?.returnKdnExpDTO ? (
+      {detail?.returnKdnExpDTO?.logisticCode ? (
         <>
           <div className='detail-title'>归还信息</div>
           <div className='detail-text'>物流单号：{detail?.returnKdnExpDTO?.logisticCode}</div>

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

@@ -17,7 +17,7 @@ type detailType = InterDataType<purchaseOrderDetailType>;
 
 const ProcurementOrderDetail = () => {
   const navigate = useNavigate();
-  const { userInfo } = useSelector((state: any) => state.userInfo);
+  const { userInfo } = useSelector((state: any) => state.UserInfo);
   const [searchParams] = useSearchParams();
   const [purchaseOrderDetail, setPurchaseOrderDetail] = useState<detailType>();
   // 订单状态

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

@@ -344,7 +344,11 @@ const ProcurementOrderList = () => {
       })
       .catch(({ code }) => {
         if (code === '1006' || code === '1005') {
-          navigate('/systemManage/realNameAuth');
+          FddInterfaceAPI.getCompanyVerifyUrl({ port: 1 }).then(({ result }) => {
+            if (result) {
+              window.open(decode(result), '_blank');
+            }
+          });
         }
       });
   };