fix: 再次更新交易规则路由

config/routes/tranactionRoute/index.ts

@@ -191,12 +191,28 @@ const TranactionRoute: RouterChild = {
 
     // 新增交易规则
     {
-      path: '/memberCenter/tranactionAbility/transactionRules/addRule',
+      path: '/memberCenter/tranactionAbility/transactionRules/add',
       name: 'addRule',
       hideInMenu: true,
       component: '@/pages/transaction/transactionRules/addRule',
     },
 
+    // 编辑交易规则
+    {
+      path: '/memberCenter/tranactionAbility/transactionRules/edit',
+      name: 'editRule',
+      hideInMenu: true, 
+      component: '@/pages/transaction/transactionRules/addRule',
+    },
+
+    // 交易规则详情
+    {
+      path: '/memberCenter/tranactionAbility/transactionRules/detail',
+      name: 'ruleDetail',
+      hideInMenu: true, 
+      component: '@/pages/transaction/transactionRules/addRule',
+    },
+
     // 供应会员评价管理
     {
       path: '/memberCenter/tranactionAbility/supplierEvaluation',

src/pages/payandSettle/amountAccountManage/memberAccountManage/index.tsx

@@ -62,19 +62,19 @@ const AccountLists: React.FC<{}> = () => {
       title: '账户余额',
       dataIndex: 'accountBalance',
       key: 'accountBalance',
-      render: text => `￥${text}`
+      render: text => `￥${text.toFixed(2)}`
     },
     {
       title: '锁定余额',
       dataIndex: 'lockBalance',
       key: 'lockBalance',
-      render: text => `￥${text}`
+      render: text => `￥${text.toFixed(2)}`
     },
     {
       title: '可用余额',
       dataIndex: 'usableBalance',
       key: 'usableBalance',
-      render: (t, r) => `￥${r.accountBalance - r.lockBalance}`
+      render: (t, r) => `￥${((r.accountBalance*100 - r.lockBalance*100)/100).toFixed(2)}`
     },
     {
       title: '会员状态',

src/pages/payandSettle/amountAccountManage/memberAccountManage/memberAccountDetail.tsx

@@ -12,13 +12,15 @@ import { memberStatusMap, moveStatusMap, statusMap } from '../../constant'
 import { SettingOutlined, StopOutlined } from '@ant-design/icons'
 import { validatorByte } from '@/utils/regExp'
 import { PublicApi } from '@/services/api'
-import { GetPayMemberAssetAccountGetMemberAssetAccountResponse } from '@/services/PayApi'
+import { StandardTable } from 'god'
 
 const { TextArea } = Input
 
 const AccountDetail: React.FC<{}> = () => {
+  const refTrade = useRef<any>({})
+  const refMove = useRef<any>({})
   const [checkForm] = Form.useForm()
-  const [dealRecord, setDealRecord] = useState<any>()
+  // const [dealRecord, setDealRecord] = useState<any>()
   const [moveRecord, setMoveRecord] = useState<any>()
   const [isDisabled, setIsDisabled] = useState<boolean>(false)
   const [visibleModal, setVisibleModal] = useState<boolean>(false)
@@ -26,7 +28,6 @@ const AccountDetail: React.FC<{}> = () => {
 
   useEffect(() => {
     getAccountInfo()
-    // pay/memberAssetAccount/getMemberAssetAccount
   }, [])
 
   const getAccountInfo = async () => {
@@ -35,13 +36,33 @@ const AccountDetail: React.FC<{}> = () => {
     const { code, data } = res
     setDetails(data)
     if(code === 1000){
-      let tradeRecord = await PublicApi.getPayMemberAssetAccountGetAccountTradeRecord({memberAssetAccountId: data.id + ''})
+    //   let tradeRecord = await PublicApi.getPayMemberAssetAccountGetAccountTradeRecord({memberAssetAccountId: data.id + ''})
       let statusRecord = await PublicApi.getPayMemberAssetAccountGetAccountCheckRecord({memberAssetAccountId: data.id + ''})
-      setDealRecord(tradeRecord.data)
+    //   setDealRecord(tradeRecord.data)
       setMoveRecord(statusRecord.data)
     }
   }
 
+    // 获取交易记录
+    const fetchTradeData = (params) => {
+      return new Promise((resolve, reject) => {
+        PublicApi.getPayMemberAssetAccountGetAccountTradeRecord({memberAssetAccountId: history.location.query.id + '', ...params}).then(res => {
+          const { data } = res
+          resolve(data)
+        })
+      })
+    }
+  
+    // // 获取流转记录
+    // const fetchMoveData = (params) => {
+    //   return new Promise((resolve, reject) => {
+    //     PublicApi.getPayMemberAssetAccountGetAccountCheckRecord({memberAssetAccountId: history.location.query.id + ''}).then(res => {
+    //       const { data } = res
+    //       resolve(data)
+    //     })
+    //   })
+    // }
+
   const columns: ColumnType<any>[] = [
     {
       title: '交易流水号',
@@ -65,11 +86,6 @@ const AccountDetail: React.FC<{}> = () => {
       key: 'operation',
     },
     {
-      title: '交易金额(元)',
-      dataIndex: 'tradeMoney',
-      key: 'tradeMoney',
-    },
-    {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
@@ -165,7 +181,7 @@ const AccountDetail: React.FC<{}> = () => {
                   <div className={styles.statistic}>
                     <div className={styles['statistic-title']}>可用余额(元)：</div>
                     <div className={styles['statistic-amount']}>
-                      {`${details.accountBalance - details.lockBalance}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
+                      {`${((details.accountBalance*100 - details.lockBalance*100)/100).toFixed(2)}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
                     </div>
                   </div>
                   <div className={styles['repayment-end']}>
@@ -191,7 +207,7 @@ const AccountDetail: React.FC<{}> = () => {
                     <p className={styles.rightTitle}>账户余额(元)：</p>
                   </Col>
                   <Col span={20}>
-                    <p className={styles.rightInfo}>{details?.accountBalance}</p>
+                    <p className={styles.rightInfo}>{details?.accountBalance?.toFixed(2)}</p>
                   </Col>
                 </Row>
                 <Row>
@@ -199,7 +215,7 @@ const AccountDetail: React.FC<{}> = () => {
                     <p className={styles.rightTitle}>锁定金额(元)：</p>
                   </Col>
                   <Col span={20}>
-                    <p className={styles.rightInfo}>{details?.lockBalance}</p>
+                    <p className={styles.rightInfo}>{details?.lockBalance?.toFixed(2)}</p>
                   </Col>
                 </Row>
                 <Row>
@@ -222,12 +238,24 @@ const AccountDetail: React.FC<{}> = () => {
       </Space>
       <Space direction="vertical" style={{width:'100%'}}>
         <Card headStyle={{borderBottom:'none'}} title="交易记录">
-          <Table dataSource={dealRecord} columns={columns} />
+          <StandardTable
+            columns={columns}
+            currentRef={refTrade}
+            fetchTableData={(params: any) => fetchTradeData(params)}
+          />
         </Card>
       </Space>
       <Space direction="vertical" style={{width:'100%'}}>
         <Card headStyle={{borderBottom:'none'}} title="流转记录">
-          <Table dataSource={moveRecord} columns={moveColumns} />
+          <Table columns={moveColumns} dataSource={moveRecord} pagination={false} />
+          {/* <StandardTable
+            columns={moveColumns}
+            currentRef={refMove}
+            fetchTableData={(params: any) => fetchMoveData(params)}
+            tableProps={{
+              pagination: false
+            }}
+          /> */}
         </Card>
       </Space>
       <Modal

src/pages/payandSettle/capitalAccounts/accountLists/accountDetail.tsx

@@ -20,7 +20,8 @@ const schemaActions = createFormActions()
 const AccountDetail: React.FC<{}> = () => {
   const modalRef = useRef<any>()
   const refTrade = useRef<any>({})
-  const refMove = useRef<any>({})
+  // const refMove = useRef<any>({})
+  const [moveData, setMoveData] = useState<any>()
   const [ details, setDetails ] = useState<any>({ accountBalance: 0,  lockBalance: 0})
   const [pageId, setPageId] = useState<any>()
   const [isBtnLoading, setIsBtnLoading] = useState<boolean>(false)
@@ -35,6 +36,10 @@ const AccountDetail: React.FC<{}> = () => {
     let res =  await PublicApi.getPayAssetAccountGetAssetAccount({id})
     const { code, data } = res
     setDetails(data)
+    PublicApi.getPayAssetAccountGetAccountStatusRecord({memberAssetAccountId: id + ''}).then(res => {
+      const { data } = res
+      setMoveData(data)
+    })
   }
 
   // 获取交易记录
@@ -47,15 +52,15 @@ const AccountDetail: React.FC<{}> = () => {
     })
   }
 
-  // 获取流转记录
-  const fetchMoveData = (params) => {
-    return new Promise((resolve, reject) => {
-      PublicApi.getPayAssetAccountGetAccountStatusRecord({memberAssetAccountId: history.location.query.id + ''}).then(res => {
-        const { data } = res
-        resolve(data)
-      })
-    })
-  }
+  // // 获取流转记录
+  // const fetchMoveData = (params) => {
+  //   return new Promise((resolve, reject) => {
+  //     PublicApi.getPayAssetAccountGetAccountStatusRecord({memberAssetAccountId: history.location.query.id + ''}).then(res => {
+  //       const { data } = res
+  //       resolve(data)
+  //     })
+  //   })
+  // }
 
   const columns: ColumnType<any>[] = [
     {
@@ -81,11 +86,6 @@ const AccountDetail: React.FC<{}> = () => {
       render: (t, r) => operationMap[t]
     },
     {
-      title: '交易金额(元)',
-      dataIndex: 'tradeMoney',
-      key: 'tradeMoney',
-    },
-    {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
@@ -157,7 +157,7 @@ const AccountDetail: React.FC<{}> = () => {
       if(res.code === 1000){
         getAccountInfo()
         refTrade.current.reload()
-        refMove.current.reload()
+        // refMove.current.reload()
       }
       modalRef.current.setVisible(false)
       setIsBtnLoading(false)
@@ -183,7 +183,7 @@ const AccountDetail: React.FC<{}> = () => {
                   <div className={styles.statistic}>
                     <div className={styles['statistic-title']}>可用余额(元)：</div>
                     <div className={styles['statistic-amount']}>
-                      {`${(details.accountBalance*100 - details.lockBalance*100)/100}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
+                      {`${((details.accountBalance*100 - details.lockBalance*100)/100).toFixed(2)}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
                     </div>
                   </div>
                   <div className={styles['repayment-end']}>
@@ -209,7 +209,7 @@ const AccountDetail: React.FC<{}> = () => {
                     <p className={styles.rightTitle}>账户余额(元)：</p>
                   </Col>
                   <Col span={20}>
-                    <p className={styles.rightInfo}>{details?.accountBalance}</p>
+                    <p className={styles.rightInfo}>{details?.accountBalance?.toFixed(2)}</p>
                   </Col>
                 </Row>
                 <Row>
@@ -217,7 +217,7 @@ const AccountDetail: React.FC<{}> = () => {
                     <p className={styles.rightTitle}>锁定金额(元)：</p>
                   </Col>
                   <Col span={20}>
-                    <p className={styles.rightInfo}>{details?.lockBalance}</p>
+                    <p className={styles.rightInfo}>{details?.lockBalance?.toFixed(2)}</p>
                   </Col>
                 </Row>
                 <Row>
@@ -255,14 +255,15 @@ const AccountDetail: React.FC<{}> = () => {
       </Space>
       <Space direction="vertical" style={{width:'100%'}}>
         <Card headStyle={{borderBottom:'none'}} title="流转记录">
-          <StandardTable
+          <Table columns={moveColumns} dataSource={moveData} pagination={false} />
+          {/* <StandardTable
             columns={moveColumns}
             currentRef={refMove}
             fetchTableData={(params: any) => fetchMoveData(params)}
             tableProps={{
               pagination: false
             }}
-          />
+          /> */}
         </Card>
       </Space>
       <ModalForm

src/pages/payandSettle/capitalAccounts/accountLists/applyWithdraw.tsx

@@ -32,7 +32,7 @@ const AccountDetail: React.FC<{}> = () => {
     const { code, data } = res
     setDetails(data)
     if(code === 1000){
-      let bankRes = await PublicApi.getSettleAccountsCorporateAccountConfig({memberId: data.memberId})
+      let bankRes = await PublicApi.getSettleAccountsCorporateAccountConfig({memberId: data.memberId + ''})
       setBankDetail(bankRes.data)
     }
   }
@@ -70,11 +70,6 @@ const AccountDetail: React.FC<{}> = () => {
       render: (t, r) => operationMap[t]
     },
     {
-      title: '交易金额(元)',
-      dataIndex: 'tradeMoney',
-      key: 'tradeMoney',
-    },
-    {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
@@ -163,7 +158,7 @@ const AccountDetail: React.FC<{}> = () => {
                   </div>
                   <div className={styles['repayment-end']}>
                     <span className={styles['repayment-time']}>
-                      最多可以提现：¥ {(details.accountBalance*100 - details.lockBalance*100)/100}
+                      最多可以提现：¥ {((details.accountBalance*100 - details.lockBalance*100)/100).toFixed(2)}
                     </span>
                   </div>
                 </div>
@@ -212,7 +207,7 @@ const AccountDetail: React.FC<{}> = () => {
                   <div className={styles.statistic}>
                     <div className={styles['statistic-title']}>可用余额(元)：</div>
                     <div className={styles['statistic-amount']}>
-                      {`${(details.accountBalance*100 - details.lockBalance*100)/100}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
+                      {`${((details.accountBalance*100 - details.lockBalance*100)/100).toFixed(2)}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
                     </div>
                   </div>
                   <div className={styles['repayment-end']}>
@@ -238,7 +233,7 @@ const AccountDetail: React.FC<{}> = () => {
                     <p className={styles.rightTitle}>账户余额(元)：</p>
                   </Col>
                   <Col span={20}>
-                    <p className={styles.rightInfo}>{details?.accountBalance}</p>
+                    <p className={styles.rightInfo}>{details?.accountBalance?.toFixed(2)}</p>
                   </Col>
                 </Row>
                 <Row>
@@ -246,7 +241,7 @@ const AccountDetail: React.FC<{}> = () => {
                     <p className={styles.rightTitle}>锁定金额(元)：</p>
                   </Col>
                   <Col span={20}>
-                    <p className={styles.rightInfo}>{details?.lockBalance}</p>
+                    <p className={styles.rightInfo}>{details?.lockBalance?.toFixed(2)}</p>
                   </Col>
                 </Row>
                 <Row>

src/pages/payandSettle/capitalAccounts/accountLists/index.tsx

@@ -70,19 +70,19 @@ const AccountLists: React.FC<{}> = () => {
       title: '账户余额',
       dataIndex: 'accountBalance',
       key: 'accountBalance',
-      render: text => `￥${text}`
+      render: text => `￥${text.toFixed(2)}`
     },
     {
       title: '锁定余额',
       dataIndex: 'lockBalance',
       key: 'lockBalance',
-      render: text => `￥${text}`
+      render: text => `￥${text.toFixed(2)}`
     },
     {
       title: '可用余额',
       dataIndex: 'usableBalance',
       key: 'usableBalance',
-      render: (t, r) => `￥${(r.accountBalance*100 - r.lockBalance*100)/100}`
+      render: (t, r) => `￥${((r.accountBalance*100 - r.lockBalance*100)/100).toFixed(2)}`
     },
   ]