fix: 商品询价&询价报价&我的询价报价修改接口引入方式

src/pages/editor/mobileSettingPanel/propsSettings/components/channelInformation/index.tsx

@@ -213,6 +213,7 @@ const ChannelInformation: React.FC<BannerPropsType> = (props) => {
       idList: informationIdList,
     }
 
+    /** manage/contentInformation/pageByIdNotIn*/
     const res = await getManageContentInformationPageByIdNotIn(params, {ctlType: 'none'})
     return res.data
   }

src/pages/transaction/dealAbility/confirmOffer/detail/audit.tsx

 import React, { useCallback, useState } from 'react';
 import { Modal, Form, Radio, Tooltip, Typography, Input, Space } from 'antd';
-import { PublicApi } from '@/services/api';
+import { postTransactionNotarizeEnquiryQuotedPriceAffirm } from '@/services/TransactionV2Api';
 
 interface AutditLayoutProps {
   /** 显示/隐藏 */
@@ -19,7 +19,7 @@ const AuditLayout: React.FC<AutditLayoutProps> = (props: any) => {
 
   const handleSubmit = useCallback(async () => {
     await form.validateFields().then(res => {
-      PublicApi.postTransactionNotarizeEnquiryQuotedPriceAffirm({ id, state: res.state, auditOpinion: res.audit }).then(res => {
+      postTransactionNotarizeEnquiryQuotedPriceAffirm({ id, state: res.state, auditOpinion: res.audit }).then(res => {
         if (res.code !== 1000) {
           setLoading(false)
           return

src/pages/transaction/dealAbility/confirmOffer/detail/index.tsx

@@ -5,7 +5,6 @@ import { ColumnType } from 'antd/lib/table/interface';
 import PeripheralLayout from '@/pages/transaction/components/detailLayout';
 import { Context } from '@/pages/transaction/components/detailLayout/components/context';
 import moment from 'moment';
-import { PublicApi } from '@/services/api';
 import { CheckCircleOutlined, LinkOutlined } from '@ant-design/icons';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
 import ProgressLayout from '@/pages/transaction/components/detailLayout/components/progressLayout';
@@ -16,6 +15,7 @@ import RecordLyout from '@/pages/transaction/components/detailLayout/components/
 import ModalOperate from '@/pages/transaction/components/modalOperate';
 import { ENTERPRISE_CENTER_URL } from '@/constants';
 import AuditLayout from './audit';
+import { getTransactionInquiryDetails, getTransactionNotarizeEnquiryProductQuotationDetails, postTransactionNotarizeEnquiryQuotedPriceAudit, postTransactionNotarizeEnquiryQuotedPriceAuditTwo, postTransactionNotarizeEnquiryQuotedPriceSubmit } from '@/services/TransactionV2Api';
 
 const TABLINK = [
   { id: 'progressLayout', title: '流转进度' },
@@ -121,7 +121,7 @@ const ConfirmOfferDetail = () => {
   }
 
   const fetchDataSource = async () => {
-    await PublicApi.getTransactionNotarizeEnquiryProductQuotationDetails({ id }).then((res: any) => {
+    await getTransactionNotarizeEnquiryProductQuotationDetails({ id }).then((res: any) => {
       if (res.code !== 1000) {
         history.goBack();
         return;
@@ -201,13 +201,13 @@ const ConfirmOfferDetail = () => {
     let fetchSoure: any = null;
     switch (pathPci) {
       case 'waitSubmitAuditOffer':
-        fetchSoure = PublicApi.postTransactionNotarizeEnquiryQuotedPriceSubmit
+        fetchSoure = postTransactionNotarizeEnquiryQuotedPriceSubmit
         break;
       case 'waitAuditInquiryOne':
-        fetchSoure = PublicApi.postTransactionNotarizeEnquiryQuotedPriceAudit
+        fetchSoure = postTransactionNotarizeEnquiryQuotedPriceAudit
         break;
       case 'waitAuditInquiryTwo':
-        fetchSoure = PublicApi.postTransactionNotarizeEnquiryQuotedPriceAuditTwo
+        fetchSoure = postTransactionNotarizeEnquiryQuotedPriceAuditTwo
         break;
     }
     return fetchSoure
@@ -242,7 +242,7 @@ const ConfirmOfferDetail = () => {
               anchor="inquiryProductLayout"
               title="询价商品"
               columns={columns}
-              fetch={PublicApi.getTransactionInquiryDetails}
+              fetch={getTransactionInquiryDetails}
             />
             <GeneralLayout
               anchor="otherLayout"

src/pages/transaction/dealAbility/confirmOffer/offerSearch/index.tsx

@@ -5,9 +5,9 @@ import { Tag, Badge, Button } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment';
-import { PublicApi } from '@/services/api';
 import { OFFERSEARCHSCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
+import { getTransactionNotarizeEnquiryExternalStateEnum, getTransactionNotarizeEnquiryProductQuotationList, getTransactionProductInquiryInteriorStateEnum } from '@/services/TransactionV2Api';
 
 const OfferSearch = () => {
 
@@ -79,10 +79,10 @@ const OfferSearch = () => {
       schema={OFFERSEARCHSCHEMA}
       columns={columns}
       effects="quotationNo"
-      fetch={PublicApi.getTransactionNotarizeEnquiryProductQuotationList}
+      fetch={getTransactionNotarizeEnquiryProductQuotationList}
       reload={reload}
-      externalStatusFetch={PublicApi.getTransactionNotarizeEnquiryExternalStateEnum()}
-      interiorStatusFetch={PublicApi.getTransactionProductInquiryInteriorStateEnum({ type: '3' })}
+      externalStatusFetch={getTransactionNotarizeEnquiryExternalStateEnum()}
+      interiorStatusFetch={getTransactionProductInquiryInteriorStateEnum({ type: '3' })}
     />
   )
 }

src/pages/transaction/dealAbility/confirmOffer/preview/index.tsx

@@ -5,7 +5,6 @@ import { ColumnType } from 'antd/lib/table/interface';
 import PeripheralLayout from '@/pages/transaction/components/detailLayout';
 import { Context } from '@/pages/transaction/components/detailLayout/components/context';
 import moment from 'moment';
-import { PublicApi } from '@/services/api';
 import { CheckCircleOutlined, LinkOutlined } from '@ant-design/icons';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
 import ProgressLayout from '@/pages/transaction/components/detailLayout/components/progressLayout';
@@ -15,6 +14,7 @@ import GeneralLayout from '@/pages/transaction/components/detailLayout/component
 import RecordLyout from '@/pages/transaction/components/detailLayout/components/recordLyout';
 import EyePreview from '@/components/EyePreview';
 import { ENTERPRISE_CENTER_URL } from '@/constants';
+import { getTransactionNotarizeEnquiryQuotedPriceDetails } from '@/services/TransactionV2Api';
 
 const TABLINK = [
   { id: 'progressLayout', title: '流转进度' },
@@ -118,7 +118,7 @@ const ConfirmOfferPreview = () => {
   }
 
   const fetchDataSource = async () => {
-    await PublicApi.getTransactionNotarizeEnquiryQuotedPriceDetails({ id }).then((res: any) => {
+    await getTransactionNotarizeEnquiryQuotedPriceDetails({ id }).then((res: any) => {
       if (res.code !== 1000) {
         history.goBack();
         return;

src/pages/transaction/dealAbility/confirmOffer/waitAuditInquiryOne/index.tsx

@@ -4,10 +4,10 @@ import { history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment'
-import { PublicApi } from '@/services/api';
 import { Row, Col, Button, Tag, Badge } from 'antd';
 import { WAITAUDITINQUIRYONESCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
+import { getTransactionNotarizeEnquiryQuotedPriceAuditList, getTransactionProductInquiryExternalStateEnum, getTransactionProductInquiryInteriorStateEnum, postTransactionNotarizeEnquiryQuotedPriceAuditAll } from '@/services/TransactionV2Api';
 
 const WaitAuditInquiryOne = () => {
   const ref = useRef<any>({});
@@ -17,7 +17,7 @@ const WaitAuditInquiryOne = () => {
   const [rowkeys, setRowKeys] = useState<Array<number>>([]);
   /** 批量审核 */
   const fetchSubmitBatch = async () => {
-    const res = await PublicApi.postTransactionNotarizeEnquiryQuotedPriceAuditAll({ ids: rowkeys });
+    const res = await postTransactionNotarizeEnquiryQuotedPriceAuditAll({ ids: rowkeys });
     if (res.code === 1000) {
       ref.current.reload();
       setRowKeys([])
@@ -88,9 +88,9 @@ const WaitAuditInquiryOne = () => {
       schema={WAITAUDITINQUIRYONESCHEMA}
       columns={columns}
       effects="quotationNo"
-      fetch={PublicApi.getTransactionNotarizeEnquiryQuotedPriceAuditList}
-      externalStatusFetch={PublicApi.getTransactionProductInquiryExternalStateEnum({ type: '2' })}
-      interiorStatusFetch={PublicApi.getTransactionProductInquiryInteriorStateEnum({ type: '2' })}
+      fetch={getTransactionNotarizeEnquiryQuotedPriceAuditList}
+      externalStatusFetch={getTransactionProductInquiryExternalStateEnum({ type: '2' })}
+      interiorStatusFetch={getTransactionProductInquiryInteriorStateEnum({ type: '2' })}
       fetchRowkeys={(e) => setRowKeys(e)}
       controllerBtns={
         <Row>

src/pages/transaction/dealAbility/confirmOffer/waitAuditInquiryTwo/index.tsx

@@ -4,10 +4,10 @@ import { history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment'
-import { PublicApi } from '@/services/api';
 import { Row, Col, Button, Tag, Badge } from 'antd';
 import { WAITAUDITINQUIRYTWOSCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
+import { getTransactionNotarizeEnquiryQuotedPriceAuditListTwo, getTransactionProductInquiryExternalStateEnum, getTransactionProductInquiryInteriorStateEnum, postTransactionNotarizeEnquiryQuotedPriceAuditAllTwo } from '@/services/TransactionV2Api';
 
 const WaitAuditInquiryOne = () => {
   const ref = useRef<any>({});
@@ -17,7 +17,7 @@ const WaitAuditInquiryOne = () => {
   const [rowkeys, setRowKeys] = useState<Array<number>>([]);
   /** 批量审核 */
   const fetchSubmitBatch = async () => {
-    const res = await PublicApi.postTransactionNotarizeEnquiryQuotedPriceAuditAllTwo({ ids: rowkeys });
+    const res = await postTransactionNotarizeEnquiryQuotedPriceAuditAllTwo({ ids: rowkeys });
     if (res.code === 1000) {
       ref.current.reload();
       setRowKeys([])
@@ -88,9 +88,9 @@ const WaitAuditInquiryOne = () => {
       schema={WAITAUDITINQUIRYTWOSCHEMA}
       columns={columns}
       effects="quotationNo"
-      fetch={PublicApi.getTransactionNotarizeEnquiryQuotedPriceAuditListTwo}
-      externalStatusFetch={PublicApi.getTransactionProductInquiryExternalStateEnum({ type: '2' })}
-      interiorStatusFetch={PublicApi.getTransactionProductInquiryInteriorStateEnum({ type: '2' })}
+      fetch={getTransactionNotarizeEnquiryQuotedPriceAuditListTwo}
+      externalStatusFetch={getTransactionProductInquiryExternalStateEnum({ type: '2' })}
+      interiorStatusFetch={getTransactionProductInquiryInteriorStateEnum({ type: '2' })}
       fetchRowkeys={(e) => setRowKeys(e)}
       controllerBtns={
         <Row>

src/pages/transaction/dealAbility/confirmOffer/waitSubmitAuditOffer/index.tsx

@@ -5,9 +5,9 @@ import { Tag, Badge, Button, Row, Col } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment';
-import { PublicApi } from '@/services/api';
 import { WAITSUBMITAUDITOFFERSCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
+import { getTransactionNotarizeEnquiryQuotedPriceList, getTransactionProductInquiryExternalStateEnum, getTransactionProductInquiryInteriorStateEnum, postTransactionNotarizeEnquiryQuotedPriceSubmitAll } from '@/services/TransactionV2Api';
 
 const WaitSubmitAuditOffer = () => {
 
@@ -21,7 +21,7 @@ const WaitSubmitAuditOffer = () => {
   /** 批量审核 */
 
   const fetchSubmitBatch = async () => {
-    const res = await PublicApi.postTransactionNotarizeEnquiryQuotedPriceSubmitAll({ ids: rowkeys });
+    const res = await postTransactionNotarizeEnquiryQuotedPriceSubmitAll({ ids: rowkeys });
     if (res.code === 1000) {
       reload.current.reload();
       setRowKeys([])
@@ -91,12 +91,12 @@ const WaitSubmitAuditOffer = () => {
       schema={WAITSUBMITAUDITOFFERSCHEMA}
       columns={columns}
       effects="quotationNo"
-      fetch={PublicApi.getTransactionNotarizeEnquiryQuotedPriceList}
+      fetch={getTransactionNotarizeEnquiryQuotedPriceList}
       reload={reload}
       selectedRow
       fetchRowkeys={(e) => setRowKeys(e)}
-      externalStatusFetch={PublicApi.getTransactionProductInquiryExternalStateEnum({ type: '3' })}
-      interiorStatusFetch={PublicApi.getTransactionProductInquiryInteriorStateEnum({ type: '3' })}
+      externalStatusFetch={getTransactionProductInquiryExternalStateEnum({ type: '3' })}
+      interiorStatusFetch={getTransactionProductInquiryInteriorStateEnum({ type: '3' })}
       controllerBtns={
         <Row>
           <Col span={6}>

src/pages/transaction/dealAbility/confirmOffer/waitSubmitOffer/index.tsx

@@ -5,9 +5,9 @@ import { Tag, Badge, Button, Row, Col } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment';
-import { PublicApi } from '@/services/api';
 import { WAITSUBMITOFFERSCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
+import { getTransactionNotarizeEnquiryQuotedPriceAffirmList, getTransactionProductInquiryExternalStateEnum, getTransactionProductInquiryInteriorStateEnum, postTransactionNotarizeEnquiryQuotedPriceAffirmAll } from '@/services/TransactionV2Api';
 
 const WaitSubmitOffer = () => {
 
@@ -20,7 +20,7 @@ const WaitSubmitOffer = () => {
   const [rowkeys, setRowKeys] = useState<Array<number>>([]);
   /** 批量审核 */
   const fetchSubmitBatch = async () => {
-    const res = await PublicApi.postTransactionNotarizeEnquiryQuotedPriceAffirmAll({ ids: rowkeys });
+    const res = await postTransactionNotarizeEnquiryQuotedPriceAffirmAll({ ids: rowkeys });
     if (res.code === 1000) {
       reload.current.reload();
       setRowKeys([])
@@ -89,12 +89,12 @@ const WaitSubmitOffer = () => {
       schema={WAITSUBMITOFFERSCHEMA}
       columns={columns}
       effects="quotationNo"
-      fetch={PublicApi.getTransactionNotarizeEnquiryQuotedPriceAffirmList}
+      fetch={getTransactionNotarizeEnquiryQuotedPriceAffirmList}
       reload={reload}
       selectedRow
       fetchRowkeys={(e) => setRowKeys(e)}
-      externalStatusFetch={PublicApi.getTransactionProductInquiryExternalStateEnum({ type: '3' })}
-      interiorStatusFetch={PublicApi.getTransactionProductInquiryInteriorStateEnum({ type: '3' })}
+      externalStatusFetch={getTransactionProductInquiryExternalStateEnum({ type: '3' })}
+      interiorStatusFetch={getTransactionProductInquiryInteriorStateEnum({ type: '3' })}
       controllerBtns={
         <Row>
           <Col span={6}>

src/pages/transaction/dealAbility/inquiryOffer/detail/index.tsx

@@ -6,7 +6,6 @@ import PeripheralLayout from '@/pages/transaction/components/detailLayout';
 import { Context } from '@/pages/transaction/components/detailLayout/components/context';
 import moment from 'moment';
 import { ENTERPRISE_CENTER_URL } from '@/constants'
-import { PublicApi } from '@/services/api';
 import { CheckCircleOutlined, LinkOutlined } from '@ant-design/icons';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
 import ProgressLayout from '@/pages/transaction/components/detailLayout/components/progressLayout';
@@ -17,6 +16,7 @@ import RecordLyout from '@/pages/transaction/components/detailLayout/components/
 import ModalOperate from '@/pages/transaction/components/modalOperate';
 import { StandardTable } from 'god';
 import { getAuth } from '@/utils/auth'
+import { getTransactionInquiryDetails, getTransactionProductQuotationDetails, getTransactionProductQuotationHistoryList, postTransactionProductQuotationtAuditSubmit, postTransactionProductQuotationtAuditSubmitTwo } from '@/services/TransactionV2Api';
 
 const TABLINK = [
   { id: 'progressLayout', title: '流转进度' },
@@ -124,7 +124,7 @@ const InquiryOfferDetail = () => {
   }
 
   const fetchDataSource = async () => {
-    await PublicApi.getTransactionProductQuotationDetails({ id }).then((res: any) => {
+    await getTransactionProductQuotationDetails({ id }).then((res: any) => {
       if (res.code !== 1000) {
         history.goBack();
         return;
@@ -298,10 +298,10 @@ const InquiryOfferDetail = () => {
     let fetchSoure: any = null;
     switch (pathPci) {
       case 'waitAuditOfferOne':
-        fetchSoure = PublicApi.postTransactionProductQuotationtAuditSubmit
+        fetchSoure = postTransactionProductQuotationtAuditSubmit
         break;
       case 'waitAuditOfferTwo':
-        fetchSoure = PublicApi.postTransactionProductQuotationtAuditSubmitTwo
+        fetchSoure = postTransactionProductQuotationtAuditSubmitTwo
         break;
     }
     return fetchSoure
@@ -309,7 +309,7 @@ const InquiryOfferDetail = () => {
 
   const fetchTableData = (params: any) => {
     return new Promise(resolve => {
-      PublicApi.getTransactionProductQuotationHistoryList({ ...params, commoditySkuId }).then(res => {
+      getTransactionProductQuotationHistoryList({ ...params, commoditySkuId }).then(res => {
         if (res.code !== 1000) {
           return
         }
@@ -347,7 +347,7 @@ const InquiryOfferDetail = () => {
               anchor="inquiryProductLayout"
               title="询价商品"
               columns={columns}
-              fetch={PublicApi.getTransactionInquiryDetails}
+              fetch={getTransactionInquiryDetails}
             />
             <GeneralLayout
               anchor="otherLayout"

src/pages/transaction/dealAbility/inquiryOffer/inquirySearch/index.tsx

@@ -5,11 +5,12 @@ import { Tag, Button, Modal, Form, Select, Typography } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment';
-import { PublicApi } from '@/services/api';
 import { INQUIRYSEARCHSCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
 import { setAuth, setRouters, getAuth } from '@/utils/auth';
 import { isEmpty } from '@antv/util';
+import { postMemberLoginSwitchrole } from '@/services/MemberV2Api';
+import { getTransactionProductInquiryList, getTransactionQuotationtInquiryExternalStateEnum } from '@/services/TransactionV2Api';
 
 interface MemberRole {
   memberRoleId: number;
@@ -32,7 +33,7 @@ const InquirySearch = () => {
   }
 
   const handleFieldsAPI = (memberRoleId: number, id?) => {
-    PublicApi.postMemberLoginSwitchrole({
+    postMemberLoginSwitchrole({
       memberRoleId,
     }).then((res: any) => {
       if (res.code !== 1000) {
@@ -162,9 +163,9 @@ const InquirySearch = () => {
         schema={INQUIRYSEARCHSCHEMA}
         columns={columns}
         effects="inquiryListNo"
-        fetch={PublicApi.getTransactionProductInquiryList}
+        fetch={getTransactionProductInquiryList}
         reload={reload}
-        externalStatusFetch={PublicApi.getTransactionQuotationtInquiryExternalStateEnum()}
+        externalStatusFetch={getTransactionQuotationtInquiryExternalStateEnum()}
       />
       {!isEmpty(role) && (
         <Modal

src/pages/transaction/dealAbility/inquiryOffer/offerSearch/index.tsx

@@ -5,9 +5,9 @@ import { Tag, Badge } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment';
-import { PublicApi } from '@/services/api';
 import { OFFERSEARCHSCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
+import { getTransactionProductInquiryInteriorStateEnum, getTransactionProductQuotationList, getTransactionQuotationtInquiryExternalStateEnum } from '@/services/TransactionV2Api';
 
 const OfferSearch = () => {
 
@@ -73,10 +73,10 @@ const OfferSearch = () => {
       schema={OFFERSEARCHSCHEMA}
       columns={columns}
       effects="quotationNo"
-      fetch={PublicApi.getTransactionProductQuotationList}
+      fetch={getTransactionProductQuotationList}
       reload={reload}
-      externalStatusFetch={PublicApi.getTransactionQuotationtInquiryExternalStateEnum()}
-      interiorStatusFetch={PublicApi.getTransactionProductInquiryInteriorStateEnum({ type: '2' })}
+      externalStatusFetch={getTransactionQuotationtInquiryExternalStateEnum()}
+      interiorStatusFetch={getTransactionProductInquiryInteriorStateEnum({ type: '2' })}
     />
   )
 }

src/pages/transaction/dealAbility/inquiryOffer/preview/index.tsx

@@ -5,7 +5,6 @@ import { ColumnType } from 'antd/lib/table/interface';
 import PeripheralLayout from '@/pages/transaction/components/detailLayout';
 import { Context } from '@/pages/transaction/components/detailLayout/components/context';
 import moment from 'moment';
-import { PublicApi } from '@/services/api';
 import { CheckCircleOutlined, LinkOutlined } from '@ant-design/icons';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
 import ProgressLayout from '@/pages/transaction/components/detailLayout/components/progressLayout';
@@ -16,6 +15,7 @@ import RecordLyout from '@/pages/transaction/components/detailLayout/components/
 import EyePreview from '@/components/EyePreview';
 import { ENTERPRISE_CENTER_URL } from '@/constants';
 import { GlobalConfig } from '@/global/config';
+import { getTransactionProductInquiryDetails } from '@/services/TransactionV2Api';
 
 const TABLINK = [
   { id: 'progressLayout', title: '流转进度' },
@@ -124,7 +124,7 @@ const InquiryOfferPreview = () => {
   }
 
   const fetchDataSource = async () => {
-    await PublicApi.getTransactionProductInquiryDetails({ id }).then((res: any) => {
+    await getTransactionProductInquiryDetails({ id }).then((res: any) => {
       if (res.code !== 1000) {
         history.goBack();
         return;

src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/add.tsx

 import React from 'react';
 import AddQuoteForm from './addForm';
 import { history } from 'umi';
-import { PublicApi } from '@/services/api';
+import { postTransactionProductQuotationAdd } from '@/services/TransactionV2Api';
 const AddQuote = (props: any) => {
   return (
     <AddQuoteForm
       title={props.route.name}
-      fetchRequest={PublicApi.postTransactionProductQuotationAdd}
+      fetchRequest={postTransactionProductQuotationAdd}
     />
   )
 }

src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/addForm.tsx

@@ -7,8 +7,8 @@ import BasicInfoLayout from "./components/basicInfo";
 import ProductQuoteLayout from "./components/productQuote";
 import OtherExplainLayout from "./components/otherExplain";
 import AttachLayout from "./components/attach";
-import { PublicApi } from "@/services/api";
 import { SaveOutlined } from "@ant-design/icons";
+import { getTransactionProductInquiryDetails, getTransactionProductQuotationDetails } from "@/services/TransactionV2Api";
 
 const layout: any = {
   colon: false,
@@ -46,11 +46,11 @@ const AddedFormLayout: React.FC<AddedFormLayoutProps> = (props: any) => {
 
   useEffect(() => {
     if (id && !spam) {
-      PublicApi.getTransactionProductQuotationDetails({ id }).then(res => {
+      getTransactionProductQuotationDetails({ id }).then(res => {
         if (res.code !== 1000) {
           return
         }
-        PublicApi.getTransactionProductInquiryDetails({ id: res.data.inquiryListId.toString() }).then(resolve => {
+        getTransactionProductInquiryDetails({ id: res.data.inquiryListId.toString() }).then(resolve => {
           if (resolve.code !== 1000) {
             return
           }
@@ -77,7 +77,7 @@ const AddedFormLayout: React.FC<AddedFormLayoutProps> = (props: any) => {
         console.warn(error)
       })
     } else if (id && spam) {
-      PublicApi.getTransactionProductInquiryDetails({ id }).then(res => {
+      getTransactionProductInquiryDetails({ id }).then(res => {
         if (res.code !== 1000) {
           return
         }
@@ -143,7 +143,7 @@ const AddedFormLayout: React.FC<AddedFormLayoutProps> = (props: any) => {
       inquiryListId: value.orderId,
       inquiryListNo: value.orderNo,
     })
-    PublicApi.getTransactionProductInquiryDetails({ id: value.orderId.toString() }).then(resolve => {
+    getTransactionProductInquiryDetails({ id: value.orderId.toString() }).then(resolve => {
       if (resolve.code !== 1000) {
         return
       }

src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/components/basicInfo.tsx

@@ -5,11 +5,11 @@ import { LinkOutlined } from '@ant-design/icons';
 import Card from '@/pages/transaction/components/card';
 import style from './index.less';
 import TableModal from '@/pages/transaction/components/tableModal';
-import { PublicApi } from '@/services/api';
 import moment from 'moment';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { isEmpty } from 'lodash';
+import { getTransactionCorrespondingInquiryNumber } from '@/services/TransactionV2Api';
 interface BasicInfoLayoutProps {
   /** 获取询价单 */
   getInquiryInfo: (e) => void,
@@ -54,7 +54,7 @@ const BasicInfoLayout: React.FC<BasicInfoLayoutProps> = (props: any) => {
 
   const handleFetchData = useCallback((params: any) => {
     return new Promise(resolve => {
-      PublicApi.getTransactionCorrespondingInquiryNumber({ ...params }).then(res => {
+      getTransactionCorrespondingInquiryNumber({ ...params }).then(res => {
         if (res.code !== 1000) {
           return
         }

src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/components/otherExplain.tsx

@@ -2,10 +2,10 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { Row, Col, Form, Input, InputNumber, Select, Button } from 'antd';
 import Card from '@/pages/transaction/components/card';
 import { LinkOutlined } from '@ant-design/icons';
-import { PublicApi } from '@/services/api';
 import TableModal from '@/pages/transaction/components/tableModal';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
+import { getMemberManageUsersPage } from '@/services/MemberV2Api';
 
 interface OtherExplainLayoutProps {
   /** 获取联系人 */
@@ -18,7 +18,7 @@ const OtherExplainLayout: React.FC<OtherExplainLayoutProps> = (props: any) => {
   const [telCode, setTelCode] = useState<any>([]);
   const handleFetchData = useCallback((params: any) => {
     return new Promise(resolve => {
-      PublicApi.getMemberManageUsersPage({ ...params }).then(res => {
+      getMemberManageUsersPage({ ...params }).then(res => {
         if (res.code !== 1000) {
           return
         }
@@ -30,7 +30,7 @@ const OtherExplainLayout: React.FC<OtherExplainLayoutProps> = (props: any) => {
   }, [])
 
   const fetchTelCode = async () => {
-    const { data, code } = await PublicApi.getManageCountryAreaGetTelCode();
+    const { data, code } = await getManageCountryAreaGetTelCode();
     if (code !== 1000) {
       return;
     }
@@ -65,7 +65,7 @@ const OtherExplainLayout: React.FC<OtherExplainLayoutProps> = (props: any) => {
   ]
 
   useEffect(() => {
-    PublicApi.getMemberManageUsersPage({ current: '1', pageSize: '10' }).then(res => {
+    getMemberManageUsersPage({ current: '1', pageSize: '10' }).then(res => {
       if (res.code !== 1000) {
         return
       }
@@ -245,3 +245,7 @@ const OtherExplainLayout: React.FC<OtherExplainLayoutProps> = (props: any) => {
 }
 
 export default OtherExplainLayout;
+function getManageCountryAreaGetTelCode(): { data: any; code: any; } | PromiseLike<{ data: any; code: any; }> {
+  throw new Error('Function not implemented.');
+}
+

src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/components/productQuote.tsx

@@ -5,10 +5,10 @@ import Card from '@/pages/transaction/components/card';
 import { isEmpty } from '@/components/NiceForm/components/AntUpload/shared';
 import EyePreview from '@/components/EyePreview';
 import { ENTERPRISE_CENTER_URL } from '@/constants';
-import { PublicApi } from '@/services/api';
 import { StandardTable } from 'god';
 import moment from 'moment';
 import { getAuth } from '@/utils/auth'
+import { getTransactionProductQuotationHistoryList } from '@/services/TransactionV2Api';
 
 interface ProductQuoteLayoutProps {
   /** 回显 */
@@ -211,7 +211,7 @@ const ProductQuoteLayout: React.FC<ProductQuoteLayoutProps> = (props: any) => {
 
   const fetchTableData = useCallback((params: any) => {
     return new Promise(resolve => {
-      PublicApi.getTransactionProductQuotationHistoryList({ ...params, commoditySkuId }).then(res => {
+      getTransactionProductQuotationHistoryList({ ...params, commoditySkuId }).then(res => {
         if (res.code !== 1000) {
           return
         }

src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/edit.tsx

 import React from 'react';
 import AddQuoteForm from './addForm';
 import { history } from 'umi';
-import { PublicApi } from '@/services/api';
+import { postTransactionProductQuotationUpdate } from '@/services/TransactionV2Api';
 const EditQuote = (props: any) => {
   const { id } = history.location.query;
   return (
@@ -9,7 +9,7 @@ const EditQuote = (props: any) => {
       id={id}
       isEdit
       title={props.route.name}
-      fetchRequest={PublicApi.postTransactionProductQuotationUpdate}
+      fetchRequest={postTransactionProductQuotationUpdate}
     />
   )
 }

src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/index.tsx

@@ -4,11 +4,11 @@ import { history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment'
-import { PublicApi } from '@/services/api';
 import { Row, Col, Space, Button, Popconfirm, Tag, Badge } from 'antd';
 import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
 import { WAITADDOFFERSCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
+import { getTransactionProductInquiryExternalStateEnum, getTransactionProductInquiryInteriorStateEnum, getTransactionStayProductQuotationList, postTransactionProductQuotationDelete, postTransactionProductQuotationDeleteAll, postTransactionProductQuotationtAll, postTransactionProductQuotationtSubmit } from '@/services/TransactionV2Api';
 
 const WaitAddOffer = () => {
   const reload = useRef<any>({});
@@ -22,9 +22,9 @@ const WaitAddOffer = () => {
   const fetchSubmitBatch = async (id?: number) => {
     let res = null;
     if (id) {
-      res = await PublicApi.postTransactionProductQuotationtSubmit({ id: Number(id) })
+      res = await postTransactionProductQuotationtSubmit({ id: Number(id) })
     } else {
-      res = await PublicApi.postTransactionProductQuotationtAll({ ids: rowkeys });
+      res = await postTransactionProductQuotationtAll({ ids: rowkeys });
     }
     if (res.code === 1000) {
       reload.current.reload();
@@ -39,9 +39,9 @@ const WaitAddOffer = () => {
   const fetchDeleteBatch = async (id?: number) => {
     let res = null;
     if (id) {
-      res = await PublicApi.postTransactionProductQuotationDelete({ id });
+      res = await postTransactionProductQuotationDelete({ id });
     } else {
-      res = await PublicApi.postTransactionProductQuotationDeleteAll({ ids: rowkeys });
+      res = await postTransactionProductQuotationDeleteAll({ ids: rowkeys });
     }
     if (res.code === 1000) {
       reload.current.reload();
@@ -139,9 +139,9 @@ const WaitAddOffer = () => {
       schema={WAITADDOFFERSCHEMA}
       columns={columns}
       effects="quotationNo"
-      fetch={PublicApi.getTransactionStayProductQuotationList}
-      externalStatusFetch={PublicApi.getTransactionProductInquiryExternalStateEnum({ type: '2' })}
-      interiorStatusFetch={PublicApi.getTransactionProductInquiryInteriorStateEnum({ type: '2' })}
+      fetch={getTransactionStayProductQuotationList}
+      externalStatusFetch={getTransactionProductInquiryExternalStateEnum({ type: '2' })}
+      interiorStatusFetch={getTransactionProductInquiryInteriorStateEnum({ type: '2' })}
       fetchRowkeys={(e) => setRowKeys(e)}
       getCheckboxProps={getCheckboxProps}
       controllerBtns={

src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/quote.tsx

 import React from 'react';
 import AddQuoteForm from './addForm';
 import { history } from 'umi';
-import { PublicApi } from '@/services/api';
+import { postTransactionProductQuotationAdd } from '@/services/TransactionV2Api';
 const Quote = (props: any) => {
   const { id } = history.location.query;
   return (
     <AddQuoteForm
       id={id}
       title={props.route.name}
-      fetchRequest={PublicApi.postTransactionProductQuotationAdd}
+      fetchRequest={postTransactionProductQuotationAdd}
       spam
     />
   )

src/pages/transaction/dealAbility/inquiryOffer/waitAuditOfferOne/index.tsx

@@ -4,10 +4,10 @@ import { history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment'
-import { PublicApi } from '@/services/api';
 import { Row, Col, Button, Tag, Badge } from 'antd';
 import { WAITAUDITOFFERONESCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
+import { getTransactionAuditProductQuotationList, getTransactionProductInquiryExternalStateEnum, getTransactionProductInquiryInteriorStateEnum, postTransactionProductQuotationtAuditAll } from '@/services/TransactionV2Api';
 
 const WaitAuditOfferOne = () => {
   const ref = useRef<any>({});
@@ -17,7 +17,7 @@ const WaitAuditOfferOne = () => {
   const [rowkeys, setRowKeys] = useState<Array<number>>([]);
   /** 批量审核 */
   const fetchSubmitBatch = async () => {
-    const res = await PublicApi.postTransactionProductQuotationtAuditAll({ ids: rowkeys });
+    const res = await postTransactionProductQuotationtAuditAll({ ids: rowkeys });
     if (res.code === 1000) {
       ref.current.reload();
       setRowKeys([])
@@ -86,9 +86,9 @@ const WaitAuditOfferOne = () => {
       schema={WAITAUDITOFFERONESCHEMA}
       columns={columns}
       effects="quotationNo"
-      fetch={PublicApi.getTransactionAuditProductQuotationList}
-      externalStatusFetch={PublicApi.getTransactionProductInquiryExternalStateEnum({ type: '2' })}
-      interiorStatusFetch={PublicApi.getTransactionProductInquiryInteriorStateEnum({ type: '2' })}
+      fetch={getTransactionAuditProductQuotationList}
+      externalStatusFetch={getTransactionProductInquiryExternalStateEnum({ type: '2' })}
+      interiorStatusFetch={getTransactionProductInquiryInteriorStateEnum({ type: '2' })}
       fetchRowkeys={(e) => setRowKeys(e)}
       controllerBtns={
         <Row>

src/pages/transaction/dealAbility/inquiryOffer/waitAuditOfferTwo/index.tsx

@@ -4,10 +4,10 @@ import { history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment'
-import { PublicApi } from '@/services/api';
 import { Row, Col, Button, Tag, Badge } from 'antd';
 import { WAITADUITOFFERTWOSCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
+import { getTransactionAuditProductQuotationListTwo, getTransactionProductInquiryExternalStateEnum, getTransactionProductInquiryInteriorStateEnum, postTransactionProductQuotationtAuditAllTwo } from '@/services/TransactionV2Api';
 
 const WaitAuditOfferTwo = () => {
   const ref = useRef<any>({});
@@ -17,7 +17,7 @@ const WaitAuditOfferTwo = () => {
   const [rowkeys, setRowKeys] = useState<Array<number>>([]);
   /** 批量审核 */
   const fetchSubmitBatch = async () => {
-    const res = await PublicApi.postTransactionProductQuotationtAuditAllTwo({ ids: rowkeys });
+    const res = await postTransactionProductQuotationtAuditAllTwo({ ids: rowkeys });
     if (res.code === 1000) {
       ref.current.reload();
       setRowKeys([])
@@ -86,9 +86,9 @@ const WaitAuditOfferTwo = () => {
       schema={WAITADUITOFFERTWOSCHEMA}
       columns={columns}
       effects="quotationNo"
-      fetch={PublicApi.getTransactionAuditProductQuotationListTwo}
-      externalStatusFetch={PublicApi.getTransactionProductInquiryExternalStateEnum({ type: '2' })}
-      interiorStatusFetch={PublicApi.getTransactionProductInquiryInteriorStateEnum({ type: '2' })}
+      fetch={getTransactionAuditProductQuotationListTwo}
+      externalStatusFetch={getTransactionProductInquiryExternalStateEnum({ type: '2' })}
+      interiorStatusFetch={getTransactionProductInquiryInteriorStateEnum({ type: '2' })}
       fetchRowkeys={(e) => setRowKeys(e)}
       controllerBtns={
         <Row>

src/pages/transaction/dealAbility/inquiryOffer/waitSubmitOffer/index.tsx

@@ -3,10 +3,10 @@ import Table from '@/pages/transaction/components/tableLayout';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment'
-import { PublicApi } from '@/services/api';
 import { Row, Col, Button, Popconfirm, Tag, Badge } from 'antd';
 import { WAITSUBMITOFFERSCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
+import { getTransactionToSubmitProductQuotationList, postTransactionProductQuotationtToSubmit, postTransactionProductQuotationtToSubmitAll } from '@/services/TransactionV2Api';
 
 const WaitSubmitOffer = () => {
   const reload = useRef<any>({});
@@ -18,9 +18,9 @@ const WaitSubmitOffer = () => {
   const fetchSubmitBatch = async (id?: number) => {
     let res = null;
     if (id) {
-      res = await PublicApi.postTransactionProductQuotationtToSubmit({ id: Number(id) })
+      res = await postTransactionProductQuotationtToSubmit({ id: Number(id) })
     } else {
-      res = await PublicApi.postTransactionProductQuotationtToSubmitAll({ ids: rowkeys });
+      res = await postTransactionProductQuotationtToSubmitAll({ ids: rowkeys });
     }
     if (res.code === 1000) {
       reload.current.reload();
@@ -93,7 +93,7 @@ const WaitSubmitOffer = () => {
       schema={WAITSUBMITOFFERSCHEMA}
       columns={columns}
       effects="quotationNo"
-      fetch={PublicApi.getTransactionToSubmitProductQuotationList}
+      fetch={getTransactionToSubmitProductQuotationList}
       fetchRowkeys={(e) => setRowKeys(e)}
       controllerBtns={
         <Row>

src/pages/transaction/dealAbility/productInquiry/detail/index.tsx

@@ -6,7 +6,6 @@ import { ColumnType } from 'antd/lib/table/interface';
 import PeripheralLayout from '@/pages/transaction/components/detailLayout';
 import { Context } from '@/pages/transaction/components/detailLayout/components/context';
 import moment from 'moment';
-import { PublicApi } from '@/services/api';
 import { CheckCircleOutlined, LinkOutlined } from '@ant-design/icons';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
 import ProgressLayout from '@/pages/transaction/components/detailLayout/components/progressLayout';
@@ -17,6 +16,7 @@ import RecordLyout from '@/pages/transaction/components/detailLayout/components/
 import ModalOperate from '@/pages/transaction/components/modalOperate';
 import { ENTERPRISE_CENTER_URL } from '@/constants';
 import EyePreview from '@/components/EyePreview';
+import { getTransactionInquiryListDetails, postTransactionInquiryDocumentsReview, postTransactionInquiryDocumentsReviewTwo } from '@/services/TransactionV2Api';
 
 const TABLINK = [
   { id: 'progressLayout', title: '流转进度' },
@@ -127,7 +127,7 @@ const ProductInquiryDetail = () => {
   }
 
   const fetchDataSource = async () => {
-    await PublicApi.getTransactionInquiryListDetails({ id }).then((res: any) => {
+    await getTransactionInquiryListDetails({ id }).then((res: any) => {
       if (res.code !== 1000) {
         history.goBack();
         return;
@@ -192,10 +192,10 @@ const ProductInquiryDetail = () => {
     let fetchSoure: any = null;
     switch (pathPci) {
       case 'waitAuditInquiryOne':
-        fetchSoure = PublicApi.postTransactionInquiryDocumentsReview
+        fetchSoure = postTransactionInquiryDocumentsReview
         break;
       case 'waitAuditInquiryTwo':
-        fetchSoure = PublicApi.postTransactionInquiryDocumentsReviewTwo
+        fetchSoure = postTransactionInquiryDocumentsReviewTwo
         break;
     }
     return fetchSoure
@@ -232,7 +232,7 @@ const ProductInquiryDetail = () => {
               columns={columns}
               done
               data={dataSource.inquiryListProductRequests}
-              // fetch={PublicApi.getTransactionEnquiryProductList}
+              // fetch={getTransactionEnquiryProductList}
             />
             <GeneralLayout
               anchor="conditionLayout"

src/pages/transaction/dealAbility/productInquiry/inquirySearch/index.tsx

@@ -4,9 +4,9 @@ import { Tag, Badge } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment';
-import { PublicApi } from '@/services/api';
 import { INQUIRYSEARCHSCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
+import { getTransactionInquiryAddList, getTransactionProductInquiryExternalStateEnum, getTransactionProductInquiryInteriorStateEnum } from '@/services/TransactionV2Api';
 
 const InquirySearch = () => {
 
@@ -71,10 +71,10 @@ const InquirySearch = () => {
       schema={INQUIRYSEARCHSCHEMA}
       columns={columns}
       effects="inquiryListNo"
-      fetch={PublicApi.getTransactionInquiryAddList}
+      fetch={getTransactionInquiryAddList}
       reload={reload}
-      externalStatusFetch={PublicApi.getTransactionProductInquiryExternalStateEnum({ type: '1' })}
-      interiorStatusFetch={PublicApi.getTransactionProductInquiryInteriorStateEnum({ type: '1' })}
+      externalStatusFetch={getTransactionProductInquiryExternalStateEnum({ type: '1' })}
+      interiorStatusFetch={getTransactionProductInquiryInteriorStateEnum({ type: '1' })}
     />
   )
 }

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/add.tsx

 import React from 'react';
 import AddForm from './addForm';
 import { history } from 'umi';
-import { PublicApi } from '@/services/api';
+import { postTransactionInquiryListAdd } from '@/services/TransactionV2Api';
 const AddEnquiryOrder = (props: any) => {
   const { id } = history.location.query;
   return(
@@ -9,7 +9,7 @@ const AddEnquiryOrder = (props: any) => {
       id={id}
       isEdit={id && true}
       title={props.route.name}
-      fetchRequest={PublicApi.postTransactionInquiryListAdd}
+      fetchRequest={postTransactionInquiryListAdd}
     />
   )
 }

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/addForm.tsx

@@ -9,7 +9,8 @@ import TradeTermsLayout from "./components/tradeTerms";
 import { SaveOutlined } from "@ant-design/icons";
 import AttachLayout from "./components/attach";
 import { getCookie } from '@/utils/cookie'
-import { PublicApi } from "@/services/api";
+import { getOrderCacheGet } from "@/services/OrderNewV2Api";
+import { getTransactionInquiryGetUpperMemberCommodity, getTransactionInquiryListDetails } from "@/services/TransactionV2Api";
 
 const layout: any = {
   colon: false,
@@ -135,7 +136,7 @@ const AddedFormLayout: React.FC<AddedFormLayoutProps> = (props: any) => {
 
   const getCacheOrderInfoByKey = (key: string) => {
     return new Promise((resolve) => {
-      PublicApi.getOrderCacheGet({ key }).then((res) => {
+      getOrderCacheGet({ key }).then((res) => {
         message.destroy()
         if (res.data) {
           resolve(JSON.parse(res.data))
@@ -195,7 +196,7 @@ const AddedFormLayout: React.FC<AddedFormLayoutProps> = (props: any) => {
   }
   /** 二次询价 */
   const handleInquiry = async () => {
-    await PublicApi.getTransactionInquiryListDetails({ id }).then(res => {
+    await getTransactionInquiryListDetails({ id }).then(res => {
       if (res.code !== 1000) {
         return
       }
@@ -207,7 +208,7 @@ const AddedFormLayout: React.FC<AddedFormLayoutProps> = (props: any) => {
         fullAddressId: data.fullAddressId,
       })
       if (two) {
-        PublicApi.getTransactionInquiryGetUpperMemberCommodity({ inquiryId: id }).then(res => {
+        getTransactionInquiryGetUpperMemberCommodity({ inquiryId: id }).then(res => {
           if (res.code !== 1000) {
             return
           }

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/components/basicInfo.tsx

@@ -4,12 +4,13 @@ import { GlobalConfig } from '@/global/config'
 import { LinkOutlined } from '@ant-design/icons';
 import Card from '@/pages/transaction/components/card';
 import TableModal from '@/pages/transaction/components/tableModal';
-import { PublicApi } from '@/services/api';
 import style from './index.less';
 import { isEmpty } from '@formily/shared';
 import { ENTERPRISE_CENTER_URL } from '@/constants'
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
+import { getMemberManagePlatformProviderPage } from '@/services/MemberV2Api';
+import { postManageWebShopWebAll } from '@/services/ManageV2Api';
 
 interface BasicInfoLayoutProps {
   /** 获取询价会员 */
@@ -56,7 +57,7 @@ const BasicInfoLayout: React.FC<BasicInfoLayoutProps> = (props: any) => {
 
   const handleFetchData = useCallback((params: any) => {
     return new Promise(resolve => {
-      PublicApi.getMemberManagePlatformProviderPage({ ...params }).then(res => {
+      getMemberManagePlatformProviderPage({ ...params }).then(res => {
         if (res.code !== 1000) {
           return
         }
@@ -72,7 +73,7 @@ const BasicInfoLayout: React.FC<BasicInfoLayoutProps> = (props: any) => {
   }
 
   const getShopListFn = (memberId: number, roleId: number) => {
-    PublicApi.postManageWebShopWebAll({
+    postManageWebShopWebAll({
       siteId: GlobalConfig.global.siteInfo.id,
       environment: 1,
       hasMemberType: 1,

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/components/inquiryProduct.tsx

@@ -5,12 +5,12 @@ import Card from '@/pages/transaction/components/card';
 import { PlusOutlined } from '@ant-design/icons';
 import { ColumnType } from 'antd/lib/table/interface';
 import TableModal from '@/pages/transaction/components/tableModal';
-import { PublicApi } from '@/services/api';
 import { isEmpty } from 'lodash';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { useLinkageUtils } from '@/utils/formEffectUtils';
 import { FormEffectHooks } from '@formily/antd';
+import { getProductCommodityCommonGetCommodityListByBuyer, getProductSelectGetMemberBrand, getProductSelectGetMemberCategory } from '@/services/ProductV2Api';
 const { onFormMount$ } = FormEffectHooks
 
 interface InquiryProductLayoutProps {
@@ -128,7 +128,7 @@ const InquiryProductLayout: React.FC<InquiryProductLayoutProps> = (props: any) =
 
   const handleFetchData = useCallback((params: any) => {
     return new Promise(resolve => {
-      PublicApi.getProductCommodityCommonGetCommodityListByBuyer({ ...params, priceTypeList: 2, memberId, shopId: form.getFieldValue('shopId') }).then(res => {
+      getProductCommodityCommonGetCommodityListByBuyer({ ...params, priceTypeList: 2, memberId, shopId: form.getFieldValue('shopId') }).then(res => {
         if (res.code !== 1000) {
           return
         }
@@ -190,7 +190,7 @@ const InquiryProductLayout: React.FC<InquiryProductLayoutProps> = (props: any) =
   const useBusinessEffects = () => {
     const linkage = useLinkageUtils();
     onFormMount$().subscribe(() => {
-      PublicApi.getProductSelectGetMemberCategory({ memberId: member.memberId, memberRoleId: member.roleId }).then(res => {
+      getProductSelectGetMemberCategory({ memberId: member.memberId, memberRoleId: member.roleId }).then(res => {
         const _enum = res.data.map(item => {
           return {
             label: item.name,
@@ -201,7 +201,7 @@ const InquiryProductLayout: React.FC<InquiryProductLayoutProps> = (props: any) =
       }).catch(error => {
         console.warn(error)
       })
-      PublicApi.getProductSelectGetMemberBrand({ memberId: member.memberId, memberRoleId: member.roleId }).then(res => {
+      getProductSelectGetMemberBrand({ memberId: member.memberId, memberRoleId: member.roleId }).then(res => {
         const _enum = res.data.map(item => {
           return {
             label: item.name,

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/components/tradeTerms.tsx

@@ -2,7 +2,6 @@ import React, { useCallback, useState, useEffect } from 'react';
 import { Row, Col, Form, Input, DatePicker, Select, Button } from 'antd';
 import Card from '@/pages/transaction/components/card';
 import moment from 'moment';
-import { PublicApi } from '@/services/api';
 import { LinkOutlined } from '@ant-design/icons';
 import TableModal from '@/pages/transaction/components/tableModal';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
@@ -10,6 +9,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
 import AddressSelect from '@/components/AddressSelect';
 import style from './index.less';
 import { isEmpty } from 'lodash';
+import { getMemberManageUsersPage } from '@/services/MemberV2Api';
 
 const disabledDate = (current) => {
   return current && current < moment().startOf('day');
@@ -33,7 +33,7 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
   const [telCode, setTelCode] = useState<any>([]);
   const handleFetchData = useCallback((params: any) => {
     return new Promise(resolve => {
-      PublicApi.getMemberManageUsersPage({ ...params }).then(res => {
+      getMemberManageUsersPage({ ...params }).then(res => {
         if (res.code !== 1000) {
           return
         }
@@ -50,7 +50,7 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
 
   // 获取手机code
   const fetchTelCode = async () => {
-    const { data, code } = await PublicApi.getManageCountryAreaGetTelCode();
+    const { data, code } = await getManageCountryAreaGetTelCode();
     if (code !== 1000) {
       return;
     }
@@ -87,7 +87,7 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
   }
 
   useEffect(() => {
-    PublicApi.getMemberManageUsersPage({ current: '1', pageSize: '10' }).then(res => {
+    getMemberManageUsersPage({ current: '1', pageSize: '10' }).then(res => {
       if (res.code !== 1000) {
         return
       }
@@ -287,3 +287,7 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
 }
 
 export default TradeTermsLayout;
+function getManageCountryAreaGetTelCode(): { data: any; code: any; } | PromiseLike<{ data: any; code: any; }> {
+  throw new Error('Function not implemented.');
+}
+

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/edit.tsx

 import React from 'react';
 import AddForm from './addForm';
 import { history } from 'umi';
-import { PublicApi } from '@/services/api';
+import { postTransactionInquiryListUpdate } from '@/services/TransactionV2Api';
 const EditEnquiryOrder:React.FC<{}> = (props: any) => {
   const { id } = history.location.query;
   return(
@@ -9,7 +9,7 @@ const EditEnquiryOrder:React.FC<{}> = (props: any) => {
       id={id}
       isEdit
       title={props.route.name}
-      fetchRequest={PublicApi.postTransactionInquiryListUpdate}
+      fetchRequest={postTransactionInquiryListUpdate}
     />
   )
 }

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/index.tsx

@@ -4,11 +4,11 @@ import { history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment'
-import { PublicApi } from '@/services/api';
 import { Row, Col, Space, Button, Tag, Badge, Popconfirm, Typography } from 'antd';
 import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
 import { WAITADDINQURYSCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
+import { getTransactionInquiryList, postTransactionInquiryListDelete, postTransactionInquiryListDeleteAll, postTransactionInquiryListSubmit, postTransactionInquiryListSubmitAll } from '@/services/TransactionV2Api';
 
 const { Text } = Typography;
 const WaitAddInquiry = () => {
@@ -24,9 +24,9 @@ const WaitAddInquiry = () => {
     setLoading(true)
     let res = null;
     if (id) {
-      res = await PublicApi.postTransactionInquiryListSubmit({ id: Number(id) })
+      res = await postTransactionInquiryListSubmit({ id: Number(id) })
     } else {
-      res = await PublicApi.postTransactionInquiryListSubmitAll({ ids: rowkeys });
+      res = await postTransactionInquiryListSubmitAll({ ids: rowkeys });
     }
     if (res.code !== 1000) {
       setLoading(false)
@@ -44,9 +44,9 @@ const WaitAddInquiry = () => {
   const fetchDeleteBatch = async (id?: number) => {
     let res = null;
     if (id) {
-      res = await PublicApi.postTransactionInquiryListDelete({ id });
+      res = await postTransactionInquiryListDelete({ id });
     } else {
-      res = await PublicApi.postTransactionInquiryListDeleteAll({ ids: rowkeys });
+      res = await postTransactionInquiryListDeleteAll({ ids: rowkeys });
     }
     if (res.code === 1000) {
       reload.current.reload();
@@ -154,7 +154,7 @@ const WaitAddInquiry = () => {
       schema={WAITADDINQURYSCHEMA}
       columns={columns}
       effects="inquiryListNo"
-      fetch={PublicApi.getTransactionInquiryList}
+      fetch={getTransactionInquiryList}
       fetchRowkeys={(e) => setRowKeys(e)}
       controllerBtns={
         <Row>

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/rfq.tsx

 import React from 'react';
 import AddForm from './addForm';
 import { history } from 'umi';
-import { PublicApi } from '@/services/api';
+import { postTransactionInquiryListAdd } from '@/services/TransactionV2Api';
 const RfqEnquiryOrder = (props: any) => {
   const { id, spam_id, shopId } = history.location.query;
   return(
@@ -10,7 +10,7 @@ const RfqEnquiryOrder = (props: any) => {
       isEdit
       shopId={shopId}
       title={props.route.name}
-      fetchRequest={PublicApi.postTransactionInquiryListAdd}
+      fetchRequest={postTransactionInquiryListAdd}
       spam={spam_id}
     />
   )

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/two.tsx

 import React from 'react';
 import AddForm from './addForm';
 import { history } from 'umi';
-import { PublicApi } from '@/services/api';
+import { postTransactionInquiryListAdd } from '@/services/TransactionV2Api';
 
 const RfqEnquiryOrder = (props: any) => {
   const { id } = history.location.query;
@@ -11,7 +11,7 @@ const RfqEnquiryOrder = (props: any) => {
       id={id}
       isEdit
       title={props.route.name}
-      fetchRequest={PublicApi.postTransactionInquiryListAdd}
+      fetchRequest={postTransactionInquiryListAdd}
       two
     />
   )

src/pages/transaction/dealAbility/productInquiry/waitAuditInquiryOne/index.tsx

@@ -4,10 +4,10 @@ import { history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment'
-import { PublicApi } from '@/services/api';
 import { Row, Col, Button, Tag, Badge } from 'antd';
 import { WAITAUDITINQUIRYONESCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
+import { getTransactionInquiryToAuditList, postTransactionInquiryDocumentsReviewAll } from '@/services/TransactionV2Api';
 
 const WaitAuditInquiryOne = () => {
   const ref = useRef<any>({});
@@ -17,7 +17,7 @@ const WaitAuditInquiryOne = () => {
   const [rowkeys, setRowKeys] = useState<Array<number>>([]);
   /** 批量审核 */
   const fetchSubmitBatch = async () => {
-    const res = await PublicApi.postTransactionInquiryDocumentsReviewAll({ ids: rowkeys });
+    const res = await postTransactionInquiryDocumentsReviewAll({ ids: rowkeys });
     if (res.code === 1000) {
       ref.current.reload();
       setRowKeys([])
@@ -85,7 +85,7 @@ const WaitAuditInquiryOne = () => {
       schema={WAITAUDITINQUIRYONESCHEMA}
       columns={columns}
       effects="inquiryListNo"
-      fetch={PublicApi.getTransactionInquiryToAuditList}
+      fetch={getTransactionInquiryToAuditList}
       fetchRowkeys={(e) => setRowKeys(e)}
       controllerBtns={
         <Row>

src/pages/transaction/dealAbility/productInquiry/waitAuditInquiryTwo/index.tsx

@@ -4,10 +4,10 @@ import { history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment'
-import { PublicApi } from '@/services/api';
 import { Row, Col, Button, Tag, Badge } from 'antd';
 import { WAITAUDITINQUIRYTWOSCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
+import { getTransactionInquiryToAuditListTwo, postTransactionInquiryDocumentsReviewAllTwo } from '@/services/TransactionV2Api';
 
 const WaitAuditInquiryTwo = () => {
   const ref = useRef<any>({});
@@ -17,7 +17,7 @@ const WaitAuditInquiryTwo = () => {
   const [rowkeys, setRowKeys] = useState<Array<number>>([]);
   /** 批量审核 */
   const fetchSubmitBatch = async () => {
-    const res = await PublicApi.postTransactionInquiryDocumentsReviewAllTwo({ ids: rowkeys });
+    const res = await postTransactionInquiryDocumentsReviewAllTwo({ ids: rowkeys });
     if (res.code === 1000) {
       ref.current.reload();
       setRowKeys([])
@@ -85,7 +85,7 @@ const WaitAuditInquiryTwo = () => {
       schema={WAITAUDITINQUIRYTWOSCHEMA}
       columns={columns}
       effects="inquiryListNo"
-      fetch={PublicApi.getTransactionInquiryToAuditListTwo}
+      fetch={getTransactionInquiryToAuditListTwo}
       fetchRowkeys={(e) => setRowKeys(e)}
       controllerBtns={
         <Row>

src/pages/transaction/dealAbility/productInquiry/waitSubmitInquiry/index.tsx

@@ -3,10 +3,10 @@ import Table from '@/pages/transaction/components/tableLayout';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment'
-import { PublicApi } from '@/services/api';
 import { Row, Col, Button, Popconfirm, Tag, Badge } from 'antd';
 import { WAITSUBMITINQUIRYSCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
+import { getTransactionSubmitInquirySheetList, postTransactionInquirySubmit, postTransactionInquirySubmitAll } from '@/services/TransactionV2Api';
 
 const WaitSubmitInquiry = () => {
   const reload = useRef<any>({});
@@ -18,9 +18,9 @@ const WaitSubmitInquiry = () => {
  const fetchSubmitBatch = async (id?: number) => {
   let res = null;
   if (id) {
-    res = await PublicApi.postTransactionInquirySubmit({ id: Number(id) })
+    res = await postTransactionInquirySubmit({ id: Number(id) })
   } else {
-    res = await PublicApi.postTransactionInquirySubmitAll({ ids: rowkeys });
+    res = await postTransactionInquirySubmitAll({ ids: rowkeys });
   }
   if (res.code === 1000) {
     reload.current.reload();
@@ -92,7 +92,7 @@ const WaitSubmitInquiry = () => {
       schema={WAITSUBMITINQUIRYSCHEMA}
       columns={columns}
       effects="inquiryListNo"
-      fetch={PublicApi.getTransactionSubmitInquirySheetList}
+      fetch={getTransactionSubmitInquirySheetList}
       fetchRowkeys={(e) => setRowKeys(e)}
       controllerBtns={
         <Row>