Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/components/StatusTag/index.tsx

@@ -2,10 +2,10 @@
  * @Author: XieZhiXiong
  * @Date: 2020-08-31 17:52:14
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-09 09:52:55
+ * @LastEditTime: 2021-11-18 10:20:13
  * @Description: 状态 tag
  */
-import React, { HTMLAttributes } from 'react';
+import React from 'react';
 import classNames from 'classnames';
 import styles from './index.less';
 
@@ -14,7 +14,7 @@ export const STATUS_TYPE = ['success', 'warning', 'default', 'danger', 'primary'
 export type StatusTagProps = {
   type: 'success' | 'warning' | 'default' | 'danger' | 'primary' | 'nobility';
   title: React.ReactNode;
-  style?: HTMLAttributes<HTMLSpanElement>,
+  style?: React.CSSProperties,
 };
 
 const StatusTag: React.FC<StatusTagProps> = ({ type, title, style }) => {

src/pages/afterService/components/RefundModal/Credit/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-01-06 11:36:34
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-11-17 19:36:47
+ * @LastEditTime: 2021-11-18 09:52:30
  * @Description: 授信退款
  */
 import React, { useState, useEffect } from 'react';

src/pages/contract/components/corporate/index.tsx

@@ -5,7 +5,6 @@ import cx from 'classnames'
 import { QuestionCircleOutlined } from '@ant-design/icons';
 import { postContractSignatureAuthAgentAuth } from '@/services/ContractV2Api'
 import { getManageCountryAreaGetTelCode } from '@/services/ManageV2Api';
-// import { getManageCountryAreaGetTelCode } from '@/services/ManageV2Api';
 
 
 interface queryProps {

src/pages/contract/components/test/index.tsx

@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react'
 import { Result, Button, Form, Input, Select, Row, Col } from 'antd'
 import styles from '../index.less'
 import { AlipaySquareFilled } from '@ant-design/icons';
+import { getManageCountryAreaGetTelCode } from '@/services/ManageV2Api';
 
 interface queryProps {
   actionRef?: any,

src/pages/member/memberPrComingClassify/components/ComingClassifyDrawer/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-24 17:47:32
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-11-17 18:05:46
+ * @LastEditTime: 2021-11-18 11:07:50
  * @Description: 审核Form抽屉
  */
 import React, { useEffect } from 'react';
@@ -18,12 +18,12 @@ import {
   FormPath,
 } from '@formily/antd';
 import { getMemberDepositClassifyCity, getMemberDepositClassifyProvince } from '@/services/MemberV2Api';
+import { getProductCustomerGetCustomerCategoryTree } from '@/services/ProductV2Api';
 import { useLinkageUtils } from '@/utils/formEffectUtils';
 import { ArrayCards } from '@formily/antd-components';
 import { schema } from './schema';
 import CascaderFormItem from '../../../components/CascaderFormItem';
 import styles from './index.less';
-// import { getProductCustomerGetCustomerCategoryTree } from '@/services/ProductApi';
 
 type CategoriesType = {
   /**

src/pages/member/memberQuery/applyMember/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-26 16:52:48
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-11-17 18:15:51
+ * @LastEditTime: 2021-11-18 11:09:06
  * @Description: 申请会员
  */
 import React, { useState, useEffect, useRef } from 'react';
@@ -22,7 +22,12 @@ import ReutrnEle from '@/components/ReturnEle';
 import NiceForm from '@/components/NiceForm';
 import MellowCard from '@/components/MellowCard';
 import NoData from '@/components/NoData';
-import { getMemberAbilityInfoApplyDepositDetail, getMemberAbilityInfoDepositDetail, postMemberAbilityInfoApply, postMemberAbilityInfoDepositDetailUpdate } from '@/services/MemberV2Api';
+import {
+  getMemberAbilityInfoApplyDepositDetail,
+  getMemberAbilityInfoDepositDetail,
+  postMemberAbilityInfoApply,
+  postMemberAbilityInfoDepositDetailUpdate,
+} from '@/services/MemberV2Api';
 import { getManageContentNoticeFindAllByColumnType } from '@/services/ManageV2Api';
 import { normalizeFiledata, FileData } from '@/utils';
 import schema, { GroupItem } from './schema';
@@ -244,7 +249,6 @@ const MemberQueryApplyMember: React.FC<RouteComponentProps> = (props: any) => {
     } else {
       postMemberAbilityInfoDepositDetailUpdate({
         validateId: validateId as number,
-        validateId: validateId as number,
         detail: step3,
         ...commonPayload,
       }).then(res => {

src/pages/payandSettle/creditApplication/components/DetailInfo/index.tsx

@@ -12,13 +12,13 @@ import { FormOutlined } from '@ant-design/icons';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { history } from 'umi';
 import lodash from 'lodash';
-import { PublicApi } from '@/services/api';
-import { GetPayCreditApplyGetApplyDetailResponse } from '@/services/PayApi';
+import { GetPayCreditApplyGetApplyDetailResponse, postPayCreditApplyAddCreditApply } from '@/services/PayV2Api';
 import { CREDIT_INNER_STATUS, CREDIT_OUTER_STATUS, CREDIT_STATUS } from '@/constants/payment';
 import { normalizeFiledata, FileData } from '@/utils';
 import AvatarWrap from '@/components/AvatarWrap';
 import StatusTag from '@/components/StatusTag';
 import { CREDIT_STATUS_TAG_MAP, CREDIT_OUTER_STATUS_TAG_MAP, CREDIT_INNER_STATUS_BADGE_MAP_PURCHASER } from '../../../constant';
+import { getPayCreditApplyGetApplyDetail } from '@/services/PayV2Api';
 
 const OuterCirculation = React.lazy(() => import('../OuterCirculation'));
 const QuotaApplicationInfo = React.lazy(() => import('../QuotaApplicationInfo'));
@@ -69,7 +69,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
       return;
     }
     setInfoloading(true);
-    PublicApi.getPayCreditApplyGetApplyDetail({
+    getPayCreditApplyGetApplyDetail({
       applyId: id,  
       creditId,  
     }).then(res => {
@@ -102,7 +102,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
     setSubmitLoading(true);
     const { fileList, ...rest } = quotaValues;
 
-    PublicApi.postPayCreditApplyAddCreditApply({
+    postPayCreditApplyAddCreditApply({
       applyId: +id, 
       creditId: creditId ? +creditId : 0,
       fileList: fileList.map((item: any) => ({ name: item.name, fileUrl: item.url })),

src/pages/payandSettle/creditApplication/quotaFormQuery/index.tsx

@@ -8,7 +8,7 @@ import moment from 'moment';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { createFormActions } from '@formily/antd';
-import { PublicApi } from '@/services/api';
+import { getPayCreditApplyPageCreditApply, getPayCreditApplyPageItemsByConsumer } from '@/services/PayV2Api';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
@@ -103,7 +103,7 @@ const QuotaFormQuery: React.FC = () => {
   const fetchListData = (params: any) => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
-      PublicApi.getPayCreditApplyPageCreditApply({
+      getPayCreditApplyPageCreditApply({
         startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
@@ -122,7 +122,7 @@ const QuotaFormQuery: React.FC = () => {
 
   // 初始化高级筛选选项
   const fetchSearchItems = async () => {
-    const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
+    const res = await getPayCreditApplyPageItemsByConsumer();
     
     if (res.code === 1000) {
       const { data } = res;

src/pages/payandSettle/creditApplication/quotaMenage/detail/components/IntroduceRow/index.tsx

@@ -14,7 +14,7 @@ import {
 } from 'antd';
 import { createFormActions, FormEffectHooks } from '@formily/antd';
 import lodash from 'lodash';
-import { PublicApi } from '@/services/api';
+import { postPayCreditApplyCreditRepay, getPayCreditApplyGetCreditRepayResult } from '@/services/PayV2Api';
 import { 
   PAY_CHANNEL_WECHAT, 
   PAY_CHANNEL_BALANCE, 
@@ -228,7 +228,7 @@ class IntroduceRow extends React.Component<IntroduceRowProps, IntroduceRowState>
           // 微信支付
           case PAY_CHANNEL_WECHAT: {
             this.setState({ repaymentSubmitLoading: true });
-            PublicApi.postPayCreditApplyCreditRepay({
+            postPayCreditApplyCreditRepay({
               billId, 
               ...values,
             }).then(res => {
@@ -292,7 +292,7 @@ class IntroduceRow extends React.Component<IntroduceRowProps, IntroduceRowState>
     const { billId, repaymentValues } = this.state;
 
     this.setState({ repaymentSubmitLoading: true });
-    PublicApi.postPayCreditApplyCreditRepay({
+    postPayCreditApplyCreditRepay({
       billId, 
       ...repaymentValues,
       ...values,
@@ -315,7 +315,7 @@ class IntroduceRow extends React.Component<IntroduceRowProps, IntroduceRowState>
     const { repaymentValues, billId } = this.state;
 
     this.setState({ uploadVoucherSubmitLoading: true });
-    PublicApi.postPayCreditApplyCreditRepay({
+    postPayCreditApplyCreditRepay({
       billId: +billId, 
       ...repaymentValues,
       payProveList: payProveList.map(item => item.status === 'done' && ({
@@ -369,7 +369,7 @@ class IntroduceRow extends React.Component<IntroduceRowProps, IntroduceRowState>
 
   handleCheckResult = (): Promise<{ success: Boolean }> => {
     return new Promise((resolve, reject) => {
-      PublicApi.getPayCreditApplyGetCreditRepayResult({
+      getPayCreditApplyGetCreditRepayResult({
         recordId: `${this.payRecordId}`, 
       }).then(res => {
         if (res.code !== 1000) {

src/pages/payandSettle/creditApplication/quotaMenage/detail/components/RefundModal/index.tsx

 import React from 'react';
 import { Modal } from 'antd';
 import { createFormActions, FormEffectHooks } from '@formily/antd';
-import { PublicApi } from '@/services/api';
+import { getOrderCommonPayChannels } from '@/services/OrderNewV2Api';
 import NiceForm from '@/components/NiceForm';
 import { BillDetailData } from '../IntroduceRow';
 import { repaymentModalSchema } from './schema';
@@ -48,17 +48,17 @@ const RefundModal: React.FC<RefundModalProps> = (props) => {
   // 获取供应商支付渠道
   const getPayChannels = (): Promise<any[]> => {
     return new Promise((resolve, reject) => {
-      PublicApi.getPayCreditRepaymentList({
+      getOrderCommonPayChannels({
         payType: `${1}`,   // 支付方式：1 线上支付
         memberId: `${billInfo.memberId}`, 
-        memberRoleId: `${billInfo.memberRoleId}`, 
+        roleId: `${billInfo.memberRoleId}`, 
       }).then(res => {
         if (res.code === 1000) {
           const options = 
             res.data ? 
               res.data.map(item => ({
-                label: item.way, 
-                value: item.wayId, 
+                label: item.payChannelName, 
+                value: item.payChannel, 
               })) : 
               [];
           resolve(options);

src/pages/payandSettle/creditApplication/quotaMenage/detail/components/UploadVoucherModal/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-01-13 13:46:08
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-06-17 10:22:59
+ * @LastEditTime: 2021-11-18 10:05:27
  * @Description: 上传凭证弹窗
  */
 import React, { useState, useEffect } from 'react';
@@ -10,7 +10,7 @@ import { Modal, message, Upload } from 'antd';
 import styled from 'styled-components';
 import { createFormActions } from '@formily/antd';
 import NiceForm from '@/components/NiceForm';
-import { PublicApi } from '@/services/api';
+import { getSettleAccountsGetMemberAccountConfig } from '@/services/SettleV2Api';
 import { uploadVoucherModalSchema } from './schema';
 import styles from './index.less';
 
@@ -75,12 +75,12 @@ const UploadVoucherModal: React.FC<UploadVoucherModalProps> = (props: UploadVouc
   const [loading, setLoading] = useState(false);
 
   // 获取对公账户信息
-  const getSettleAccountsGetMemberAccountConfig = (memberId: number, memberRoleId: number) => {
+  const fetchSettleAccountsGetMemberAccountConfig = (memberId: number, memberRoleId: number) => {
     if (!memberId || !memberRoleId || loading) {
       return;
     }
     setLoading(true);
-    PublicApi.getSettleAccountsGetMemberAccountConfig({
+    getSettleAccountsGetMemberAccountConfig({
       memberId: `${memberId}`, 
       roleId: `${memberRoleId}`, 
     }).then(res => {
@@ -96,7 +96,7 @@ const UploadVoucherModal: React.FC<UploadVoucherModalProps> = (props: UploadVouc
 
   useEffect(() => {
     if (visible) {
-      getSettleAccountsGetMemberAccountConfig(memberId, memberRoleId);
+      fetchSettleAccountsGetMemberAccountConfig(memberId, memberRoleId);
     }
   }, [visible]);
 

src/pages/payandSettle/creditApplication/quotaMenage/detail/index.tsx

@@ -8,8 +8,7 @@ import {
 } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { history } from 'umi';
-import { PublicApi } from '@/services/api';
-import { GetPayCreditApplyGetCreditDetailResponse } from '@/services/PayApi';
+import { getPayCreditApplyGetCreditDetail, getPayCreditApplyGetCreditBillDetail, getPayCreditApplyPageCreditTradeRecord, getPayCreditApplyPageCreditOverdue, GetPayCreditApplyGetCreditDetailResponse } from '@/services/PayV2Api';
 import { usePageStatus, PageStatus } from '@/hooks/usePageStatus';
 import {
   CREDIT_REPAYMENT_STATUS, 
@@ -41,7 +40,7 @@ const QuotaMenageDetail: React.FC = () => {
       return;
     }
     setInfoLoading(true);
-    PublicApi.getPayCreditApplyGetCreditDetail({
+    getPayCreditApplyGetCreditDetail({
       id,
     }).then(res => {
       if (res.code === 1000) {
@@ -73,7 +72,7 @@ const QuotaMenageDetail: React.FC = () => {
   // 获取账单详情
   const fetchBillDetail = (params: BillDetailParams): Promise<BillDetailData> => {
     return new Promise((resolve, reject) => {
-      PublicApi.getPayCreditApplyGetCreditBillDetail(params)
+      getPayCreditApplyGetCreditBillDetail(params)
         .then(res => {
           if (res.code === 1000) {
             resolve(res.data);
@@ -92,7 +91,7 @@ const QuotaMenageDetail: React.FC = () => {
       return;
     }
     return new Promise((resolve, reject) => {
-      PublicApi.getPayCreditApplyPageCreditTradeRecord({
+      getPayCreditApplyPageCreditTradeRecord({
         creditId: id, 
         ...params, 
       }).then(res => {
@@ -112,7 +111,7 @@ const QuotaMenageDetail: React.FC = () => {
       return;
     }
     setCreditOverdueListLoading(true);
-    PublicApi.getPayCreditApplyPageCreditOverdue({
+    getPayCreditApplyPageCreditOverdue({
       creditId: id, 
       current: '1', 
       pageSize: '9999',       // 暂时写死

src/pages/payandSettle/creditApplication/quotaMenage/index.tsx

@@ -6,7 +6,7 @@ import { StandardTable } from 'god';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { createFormActions } from '@formily/antd';
-import { PublicApi } from '@/services/api';
+import { getPayCreditApplyPageCredit, getPayCreditApplyPageItemsByConsumer } from '@/services/PayV2Api';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
@@ -171,7 +171,7 @@ const QuotaMenage: React.FC = () => {
   const fetchListData = (params: any) => {
     const { status = 0, rePayStatus = 0, ...rest } = params; 
     return new Promise((resolve, reject) => {
-      PublicApi.getPayCreditApplyPageCredit({
+      getPayCreditApplyPageCredit({
         status, 
         rePayStatus, 
         ...rest, 
@@ -190,7 +190,7 @@ const QuotaMenage: React.FC = () => {
 
   // 初始化高级筛选选项
   const fetchSearchItems = async () => {
-    const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
+    const res = await getPayCreditApplyPageItemsByConsumer();
     
     if (res.code === 1000) {
       const { data } = res;

src/pages/payandSettle/creditApplication/quotaPrSubmit/index.tsx

@@ -16,7 +16,7 @@ import moment from 'moment';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { createFormActions } from '@formily/antd';
-import { PublicApi } from '@/services/api';
+import { postPayCreditApplySubmitCreditApply, postPayCreditApplyDeleteCreditApply, getPayCreditApplyPageWaitSubmitCreditApply } from '@/services/PayV2Api';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import EyePreview from '@/components/EyePreview';
@@ -43,7 +43,7 @@ const QuotaPrSubmit: React.FC = () => {
       content: '正在提交', 
       duration: 0,
     });
-    PublicApi.postPayCreditApplySubmitCreditApply({
+    postPayCreditApplySubmitCreditApply({
       applyId: record.id, 
     }).then(res => {
       if (res.code === 1000) {
@@ -63,7 +63,7 @@ const QuotaPrSubmit: React.FC = () => {
       content: '正在删除', 
       duration: 0,
     });
-    PublicApi.postPayCreditApplyDeleteCreditApply({
+    postPayCreditApplyDeleteCreditApply({
       applyId: record.id, 
     }).then(res => {
       if (res.code === 1000) {
@@ -189,7 +189,7 @@ const QuotaPrSubmit: React.FC = () => {
   const fetchListData = (params: any) => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
-      PublicApi.getPayCreditApplyPageWaitSubmitCreditApply({
+      getPayCreditApplyPageWaitSubmitCreditApply({
         startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 

src/pages/payandSettle/creditManage/components/DetailInfo/index.tsx

@@ -7,8 +7,7 @@ import {
 } from 'antd';
 import { history } from 'umi';
 import lodash from 'lodash';
-import { PublicApi } from '@/services/api';
-import { GetPayCreditHandleGetApplyDetailResponse } from '@/services/PayApi';
+import { getPayCreditHandleGetApplyDetail, GetPayCreditHandleGetApplyDetailResponse, postPayCreditHandleUpdateVerify } from '@/services/PayV2Api';
 import { 
   CREDIT_INNER_STATUS, 
   CREDIT_OUTER_STATUS, CREDIT_STATUS, 
@@ -90,7 +89,7 @@ const DetailInfo: React.FC<DetailInfoProps> = (props) => {
       return;
     }
     setInfoloading(true);
-    PublicApi.getPayCreditHandleGetApplyDetail({
+    getPayCreditHandleGetApplyDetail({
       applyId: id,  
       creditId,  
     }).then(res => {
@@ -156,7 +155,7 @@ const DetailInfo: React.FC<DetailInfoProps> = (props) => {
     }
 
     return new Promise<void>((resolve, reject) => {
-      PublicApi.postPayCreditHandleUpdateVerify({
+      postPayCreditHandleUpdateVerify({
         applyId: id, 
         ...values,
       }).then(res => {

src/pages/payandSettle/creditManage/quotaFormQuery/index.tsx

@@ -8,7 +8,7 @@ import moment from 'moment';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { createFormActions } from '@formily/antd';
-import { PublicApi } from '@/services/api';
+import { getPayCreditHandlePageCreditChildApply, getPayCreditHandlePageItemsBySupplier } from '@/services/PayV2Api';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
@@ -105,7 +105,7 @@ const QuotaFormQuery: React.FC = () => {
   const fetchListData = (params: any) => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
-      PublicApi.getPayCreditHandlePageCreditChildApply({
+      getPayCreditHandlePageCreditChildApply({
         startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null,  
         ...rest, 
@@ -124,7 +124,7 @@ const QuotaFormQuery: React.FC = () => {
 
   // 初始化高级筛选选项
   const fetchSearchItems = async () => {
-    const res = await PublicApi.getPayCreditHandlePageItemsBySupplier();
+    const res = await getPayCreditHandlePageItemsBySupplier();
     
     if (res.code === 1000) {
       const { data } = res;

src/pages/payandSettle/creditManage/quotaMenage/detail/components/IntroduceRow/index.tsx

@@ -14,7 +14,7 @@ import {
 } from 'antd';
 import { createFormActions, FormEffectHooks } from '@formily/antd';
 import lodash from 'lodash';
-import { PublicApi } from '@/services/api';
+import { postPayCreditHandleCreditConfirmRepay } from '@/services/PayV2Api';
 import MellowCard from '@/components/MellowCard';
 import { Pie } from '@/components/Charts';
 import StatusTag from '@/components/StatusTag';
@@ -197,7 +197,7 @@ class IntroduceRow extends React.Component<IntroduceRowProps, IntroduceRowState>
 
   // 确认还款结果
   handleConfirm = params => {
-    return PublicApi.postPayCreditHandleCreditConfirmRepay(params);
+    return postPayCreditHandleCreditConfirmRepay(params);
   };
 
   render() {

src/pages/payandSettle/creditManage/quotaMenage/detail/index.tsx

@@ -8,8 +8,7 @@ import {
 } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { history } from 'umi';
-import { PublicApi } from '@/services/api';
-import { GetPayCreditHandleGetCreditDetailResponse } from '@/services/PayApi';
+import { getPayCreditHandleGetCreditDetail, getPayCreditHandleGetCreditBillDetail, getPayCreditHandlePageCreditTradeRecord, getPayCreditHandlePageCreditOverdue, GetPayCreditHandleGetCreditDetailResponse } from '@/services/PayV2Api';
 import { usePageStatus, PageStatus } from '@/hooks/usePageStatus';
 import {
   CREDIT_REPAYMENT_STATUS, 
@@ -39,7 +38,7 @@ const QuotaMenageDetail: React.FC = () => {
   const getCreditDetail = () => {
 
     setInfoLoading(true);
-    PublicApi.getPayCreditHandleGetCreditDetail({
+    getPayCreditHandleGetCreditDetail({
       id,
     }).then(res => {
       if (res.code === 1000) {
@@ -71,7 +70,7 @@ const QuotaMenageDetail: React.FC = () => {
   // 获取账单详情
   const fetchBillDetail = (params: BillDetailParams): Promise<BillDetailData> => {
     return new Promise((resolve, reject) => {
-      PublicApi.getPayCreditHandleGetCreditBillDetail(params)
+      getPayCreditHandleGetCreditBillDetail(params)
         .then(res => {
           if (res.code === 1000) {
             resolve(res.data);
@@ -90,7 +89,7 @@ const QuotaMenageDetail: React.FC = () => {
       return;
     }
     return new Promise((resolve, reject) => {
-      PublicApi.getPayCreditHandlePageCreditTradeRecord({
+      getPayCreditHandlePageCreditTradeRecord({
         creditId: id, 
         ...params, 
       }).then(res => {
@@ -110,7 +109,7 @@ const QuotaMenageDetail: React.FC = () => {
       return;
     }
     setCreditOverdueListLoading(true);
-    PublicApi.getPayCreditHandlePageCreditOverdue({
+    getPayCreditHandlePageCreditOverdue({
       creditId: id, 
       current: '1', 
       pageSize: '9999',       // 暂时写死

src/pages/payandSettle/creditManage/quotaMenage/index.tsx

@@ -13,7 +13,8 @@ import { StandardTable } from 'god';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { createFormActions } from '@formily/antd';
-import { PublicApi } from '@/services/api';
+import { postPayCreditHandleAdjustQuota, postPayCreditHandleUpdateStatus, getPayCreditHandlePageCredit, getPayCreditHandlePageItemsBySupplier } from '@/services/PayV2Api';
+import { getMemberManagePageitems } from '@/services/MemberV2Api';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
@@ -55,7 +56,7 @@ const QuotaMenage: React.FC = () => {
       content: '正在申请', 
       duration: 0,
     });
-    PublicApi.postPayCreditHandleAdjustQuota({
+    postPayCreditHandleAdjustQuota({
       creditId: record.id, 
     }).then(res => {
       if (res.code === 1000) {
@@ -74,7 +75,7 @@ const QuotaMenage: React.FC = () => {
       content: `正在${status === CREDIT_STATUS_NORMAL ? '解除' : '冻结'}`, 
       duration: 0,
     });
-    PublicApi.postPayCreditHandleUpdateStatus({
+    postPayCreditHandleUpdateStatus({
       id: record.id, 
       status, 
     }).then(res => {
@@ -229,7 +230,7 @@ const QuotaMenage: React.FC = () => {
   const fetchListData = (params: any) => {
     const { status = 0, rePayStatus = 0, ...rest } = params; 
     return new Promise((resolve, reject) => {
-      PublicApi.getPayCreditHandlePageCredit({
+      getPayCreditHandlePageCredit({
         status, 
         rePayStatus, 
         ...rest, 
@@ -248,7 +249,7 @@ const QuotaMenage: React.FC = () => {
 
   // 初始化高级筛选选项
   const fetchSearchItems = async () => {
-    const res = await PublicApi.getPayCreditHandlePageItemsBySupplier();
+    const res = await getPayCreditHandlePageItemsBySupplier();
     
     if (res.code === 1000) {
       const { data } = res;
@@ -278,7 +279,7 @@ const QuotaMenage: React.FC = () => {
 
   // 初始化高级筛选会员选项
   const fetchSearchMemberItems = async () => {
-    const res = await PublicApi.getMemberManagePageitems();
+    const res = await getMemberManagePageitems();
     
     if (res.code === 1000) {
       const { data = {} }: any = res;

src/pages/payandSettle/creditManage/quotaPr1/index.tsx

@@ -9,7 +9,8 @@ import moment from 'moment';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { createFormActions } from '@formily/antd';
-import { PublicApi } from '@/services/api';
+import { getMemberManagePageitems } from '@/services/MemberV2Api';
+import { getPayCreditHandlePageCreditChildWaitVerifyApplyStepOne, getPayCreditHandlePageItemsBySupplier } from '@/services/PayV2Api';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
@@ -124,7 +125,7 @@ const QuotaPr1: React.FC = () => {
   const fetchListData = (params: any) => {
     const { startTime, endTime, applyType = 0, ...rest } = params; 
     return new Promise((resolve, reject) => {
-      PublicApi.getPayCreditHandlePageCreditChildWaitVerifyApplyStepOne({
+      getPayCreditHandlePageCreditChildWaitVerifyApplyStepOne({
         startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         applyType, 
@@ -144,7 +145,7 @@ const QuotaPr1: React.FC = () => {
 
   // 初始化高级筛选选项
   const fetchSearchItems = async () => {
-    const res = await PublicApi.getPayCreditHandlePageItemsBySupplier();
+    const res = await getPayCreditHandlePageItemsBySupplier();
     
     if (res.code === 1000) {
       const { data } = res;
@@ -161,7 +162,7 @@ const QuotaPr1: React.FC = () => {
   
   // 初始化高级筛选会员选项
   const fetchSearchMemberItems = async () => {
-    const res = await PublicApi.getMemberManagePageitems();
+    const res = await getMemberManagePageitems();
     
     if (res.code === 1000) {
       const { data = {} }: any = res;

src/pages/payandSettle/creditManage/quotaPr1/verify.tsx

+/*
+ * @Author: XieZhiXiong
+ * @Date: 2021-10-18 11:11:16
+ * @LastEditors: XieZhiXiong
+ * @LastEditTime: 2021-11-18 10:16:53
+ * @Description: 
+ */
 import React, { useState } from 'react';
 import { 
   Button, 
 } from 'antd';
 import { history } from 'umi';
-import { PublicApi } from '@/services/api';
+import { postPayCreditHandleVerifyStepOne } from '@/services/PayV2Api';
 import { FormOutlined } from '@ant-design/icons';
 import { usePageStatus } from '@/hooks/usePageStatus';
 import DetailInfo from '../components/DetailInfo';
@@ -19,8 +26,8 @@ const QuotaPr1Verify: React.FC = () => {
       return;
     }
     setSubmitLoading(true);
-    PublicApi.postPayCreditHandleVerifyStepOne({
-      applyId: id, 
+    postPayCreditHandleVerifyStepOne({
+      applyId: +id, 
       isPass: values.agree, 
       opinion: values.reason, 
     }).then(res => {

src/pages/payandSettle/creditManage/quotaPr2/index.tsx

@@ -9,7 +9,8 @@ import moment from 'moment';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { createFormActions } from '@formily/antd';
-import { PublicApi } from '@/services/api';
+import { getMemberManagePageitems } from '@/services/MemberV2Api';
+import { getPayCreditHandlePageCreditChildWaitVerifyApplyStepTwo, getPayCreditHandlePageItemsBySupplier } from '@/services/PayV2Api';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
@@ -124,7 +125,7 @@ const QuotaPr1: React.FC = () => {
   const fetchListData = (params: any) => {
     const { startTime, endTime, applyType = 0, ...rest } = params; 
     return new Promise((resolve, reject) => {
-      PublicApi.getPayCreditHandlePageCreditChildWaitVerifyApplyStepTwo({
+      getPayCreditHandlePageCreditChildWaitVerifyApplyStepTwo({
         startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         applyType, 
@@ -144,7 +145,7 @@ const QuotaPr1: React.FC = () => {
 
   // 初始化高级筛选选项
   const fetchSearchItems = async () => {
-    const res = await PublicApi.getPayCreditHandlePageItemsBySupplier();
+    const res = await getPayCreditHandlePageItemsBySupplier();
     
     if (res.code === 1000) {
       const { data } = res;
@@ -161,7 +162,7 @@ const QuotaPr1: React.FC = () => {
 
   // 初始化高级筛选会员选项
   const fetchSearchMemberItems = async () => {
-    const res = await PublicApi.getMemberManagePageitems();
+    const res = await getMemberManagePageitems();
     
     if (res.code === 1000) {
       const { data = {} }: any = res;

src/pages/payandSettle/creditManage/quotaPr2/verify.tsx

+/*
+ * @Author: XieZhiXiong
+ * @Date: 2021-10-18 11:11:16
+ * @LastEditors: XieZhiXiong
+ * @LastEditTime: 2021-11-18 10:17:33
+ * @Description: 
+ */
 import React, { useState } from 'react';
 import { 
   Button, 
 } from 'antd';
 import { history } from 'umi';
-import { PublicApi } from '@/services/api';
+import { postPayCreditHandleVerifyStepTwo } from '@/services/PayV2Api';
 import { FormOutlined } from '@ant-design/icons';
 import { usePageStatus } from '@/hooks/usePageStatus';
 import DetailInfo from '../components/DetailInfo';
@@ -19,8 +26,8 @@ const QuotaPr2Verify: React.FC = () => {
       return;
     }
     setSubmitLoading(true);
-    PublicApi.postPayCreditHandleVerifyStepTwo({
-      applyId: id, 
+    postPayCreditHandleVerifyStepTwo({
+      applyId: +id, 
       isPass: values.agree, 
       opinion: values.reason, 
     }).then(res => {

src/pages/payandSettle/creditManage/quotaPr3/index.tsx

@@ -9,7 +9,8 @@ import moment from 'moment';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { createFormActions } from '@formily/antd';
-import { PublicApi } from '@/services/api';
+import { getMemberManagePageitems } from '@/services/MemberV2Api';
+import { getPayCreditHandlePageCreditChildWaitVerifyApplyStepThree, getPayCreditHandlePageItemsBySupplier } from '@/services/PayV2Api';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
@@ -124,7 +125,7 @@ const QuotaPr3: React.FC = () => {
   const fetchListData = (params: any) => {
     const { startTime, endTime, applyType = 0, ...rest } = params; 
     return new Promise((resolve, reject) => {
-      PublicApi.getPayCreditHandlePageCreditChildWaitVerifyApplyStepThree({
+      getPayCreditHandlePageCreditChildWaitVerifyApplyStepThree({
         startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         applyType, 
@@ -144,7 +145,7 @@ const QuotaPr3: React.FC = () => {
 
   // 初始化高级筛选选项
   const fetchSearchItems = async () => {
-    const res = await PublicApi.getPayCreditHandlePageItemsBySupplier();
+    const res = await getPayCreditHandlePageItemsBySupplier();
     
     if (res.code === 1000) {
       const { data } = res;
@@ -161,7 +162,7 @@ const QuotaPr3: React.FC = () => {
 
   // 初始化高级筛选会员选项
   const fetchSearchMemberItems = async () => {
-    const res = await PublicApi.getMemberManagePageitems();
+    const res = await getMemberManagePageitems();
     
     if (res.code === 1000) {
       const { data = {} }: any = res;

src/pages/payandSettle/creditManage/quotaPr3/verify.tsx

+/*
+ * @Author: XieZhiXiong
+ * @Date: 2021-10-18 11:11:16
+ * @LastEditors: XieZhiXiong
+ * @LastEditTime: 2021-11-18 10:18:41
+ * @Description: 
+ */
 import React, { useState } from 'react';
 import { 
   Button, 
 } from 'antd';
 import { history } from 'umi';
-import { PublicApi } from '@/services/api';
+import { postPayCreditHandleVerifyStepThree } from '@/services/PayV2Api';
 import { FormOutlined } from '@ant-design/icons';
 import { usePageStatus } from '@/hooks/usePageStatus';
 import DetailInfo from '../components/DetailInfo';
@@ -19,8 +26,8 @@ const QuotaPr3Verify: React.FC = () => {
       return;
     }
     setSubmitLoading(true);
-    PublicApi.postPayCreditHandleVerifyStepThree({
-      applyId: id, 
+    postPayCreditHandleVerifyStepThree({
+      applyId: +id, 
       isPass: values.agree, 
       opinion: values.reason, 
     }).then(res => {

src/pages/payandSettle/creditManage/quotaPrConfirm/index.tsx

@@ -9,7 +9,8 @@ import moment from 'moment';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { createFormActions } from '@formily/antd';
-import { PublicApi } from '@/services/api';
+import { getMemberManagePageitems } from '@/services/MemberV2Api';
+import { getPayCreditHandlePageCreditChildWaitConfirmVerifyApply, getPayCreditHandlePageItemsBySupplier } from '@/services/PayV2Api';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
@@ -124,7 +125,7 @@ const QuotaPrConfirm: React.FC = () => {
   const fetchListData = (params: any) => {
     const { startTime, endTime, applyType = 0, ...rest } = params; 
     return new Promise((resolve, reject) => {
-      PublicApi.getPayCreditHandlePageCreditChildWaitConfirmVerifyApply({
+      getPayCreditHandlePageCreditChildWaitConfirmVerifyApply({
         startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         applyType, 
@@ -144,7 +145,7 @@ const QuotaPrConfirm: React.FC = () => {
 
   // 初始化高级筛选选项
   const fetchSearchItems = async () => {
-    const res = await PublicApi.getPayCreditHandlePageItemsBySupplier();
+    const res = await getPayCreditHandlePageItemsBySupplier();
     
     if (res.code === 1000) {
       const { data } = res;
@@ -161,7 +162,7 @@ const QuotaPrConfirm: React.FC = () => {
 
   // 初始化高级筛选会员选项
   const fetchSearchMemberItems = async () => {
-    const res = await PublicApi.getMemberManagePageitems();
+    const res = await getMemberManagePageitems();
     
     if (res.code === 1000) {
       const { data = {} }: any = res;

src/pages/payandSettle/creditManage/quotaPrConfirm/verify.tsx

+/*
+ * @Author: XieZhiXiong
+ * @Date: 2021-10-18 11:11:47
+ * @LastEditors: XieZhiXiong
+ * @LastEditTime: 2021-11-18 10:19:18
+ * @Description: 
+ */
 import React, { useState } from 'react';
 import { 
   Button, 
 } from 'antd';
 import { history } from 'umi';
-import { PublicApi } from '@/services/api';
+import { postPayCreditHandleConfirmVerifyCreditApply } from '@/services/PayV2Api';
 import { FormOutlined } from '@ant-design/icons';
 import { usePageStatus } from '@/hooks/usePageStatus';
 import {
@@ -26,8 +33,8 @@ const QuotaPrConfirmVerify: React.FC = () => {
       return;
     }
     setSubmitLoading(true);
-    PublicApi.postPayCreditHandleConfirmVerifyCreditApply({
-      applyId: id, 
+    postPayCreditHandleConfirmVerifyCreditApply({
+      applyId: +id, 
       isPass: values.agree, 
       opinion: values.reason, 
     }).then(res => {

src/pages/payandSettle/creditManage/quotaPrSubmit/index.tsx

@@ -9,7 +9,7 @@ import moment from 'moment';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { createFormActions } from '@formily/antd';
-import { PublicApi } from '@/services/api';
+import { getPayCreditHandlePageCreditChildWaitSubmitApply, getPayCreditHandlePageItemsBySupplier } from '@/services/PayV2Api';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
@@ -23,6 +23,7 @@ import {
   CREDIT_INNER_STATUS_BADGE_MAP, 
 } from '../../constant';
 import styles from './index.less';
+import { getMemberManagePageitems } from '@/services/MemberV2Api';
 
 const formActions = createFormActions();
 
@@ -124,7 +125,7 @@ const QuotaPrSubmit: React.FC = () => {
   const fetchListData = (params: any) => {
     const { startTime, endTime, applyType = 0, ...rest } = params; 
     return new Promise((resolve, reject) => {
-      PublicApi.getPayCreditHandlePageCreditChildWaitSubmitApply({
+      getPayCreditHandlePageCreditChildWaitSubmitApply({
         startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         applyType, 
@@ -144,7 +145,7 @@ const QuotaPrSubmit: React.FC = () => {
 
   // 初始化高级筛选选项
   const fetchSearchItems = async () => {
-    const res = await PublicApi.getPayCreditHandlePageItemsBySupplier();
+    const res = await getPayCreditHandlePageItemsBySupplier();
     
     if (res.code === 1000) {
       const { data } = res;
@@ -161,7 +162,7 @@ const QuotaPrSubmit: React.FC = () => {
 
   // 初始化高级筛选会员选项
   const fetchSearchMemberItems = async () => {
-    const res = await PublicApi.getMemberManagePageitems();
+    const res = await getMemberManagePageitems();
     
     if (res.code === 1000) {
       const { data = {} }: any = res;

src/pages/payandSettle/creditManage/quotaPrSubmit/verify.tsx

+/*
+ * @Author: XieZhiXiong
+ * @Date: 2021-10-18 11:11:16
+ * @LastEditors: XieZhiXiong
+ * @LastEditTime: 2021-11-18 10:20:30
+ * @Description: 
+ */
 import React, { useState } from 'react';
 import { 
   Button, 
 } from 'antd';
 import { history } from 'umi';
-import { PublicApi } from '@/services/api';
+import { postPayCreditHandleSubmitVerifyCreditApply } from '@/services/PayV2Api';
 import { FormOutlined } from '@ant-design/icons';
 import { usePageStatus } from '@/hooks/usePageStatus';
 import DetailInfo from '../components/DetailInfo';
@@ -19,8 +26,8 @@ const QuotaPrSubmitVerify: React.FC = () => {
       return;
     }
     setSubmitLoading(true);
-    PublicApi.postPayCreditHandleSubmitVerifyCreditApply({
-      applyId: id, 
+    postPayCreditHandleSubmitVerifyCreditApply({
+      applyId: +id, 
       isPass: values.agree, 
       opinion: values.reason, 
     }).then(res => {