diff --git a/src/pages/Nft/NftContract/List/index.tsx b/src/pages/Nft/NftContract/List/index.tsx index 87dc418..2b3dfd3 100644 --- a/src/pages/Nft/NftContract/List/index.tsx +++ b/src/pages/Nft/NftContract/List/index.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useRef, useState } from 'react'; +import React, { useRef, useState } from 'react'; import Table, { ProColumns, ActionType } from '@/components/Table'; import { message } from 'antd'; import AddNftContractModal from './components/AddNftContract'; diff --git a/src/pages/Nft/NftToken/List/components/AddNftModel.tsx b/src/pages/Nft/NftToken/List/components/AddNftModel.tsx index 33d3268..8d2852a 100644 --- a/src/pages/Nft/NftToken/List/components/AddNftModel.tsx +++ b/src/pages/Nft/NftToken/List/components/AddNftModel.tsx @@ -36,7 +36,10 @@ const AddNftModal = ({ onOk, onCancel, ...rest }: AddNftModalPropsType) => { if (isInit) { const contractInfo = (await getContractInfo({ erc: ContractType.NFT721 })) as any; const res = (await getNFTContractList()) as any; - const signature = (await getSignature({ address: web3.eth.defaultAccount })) as any; + const signature = (await getSignature({ + address: web3.eth.defaultAccount, + assetid: formState.values.assetid, + })) as any; console.log('signature = ', signature); let tx_hash = ''; try { diff --git a/src/pages/Nft/NftToken/List/index.tsx b/src/pages/Nft/NftToken/List/index.tsx index f88122b..d845702 100644 --- a/src/pages/Nft/NftToken/List/index.tsx +++ b/src/pages/Nft/NftToken/List/index.tsx @@ -1,6 +1,5 @@ import React, { useRef, useState } from 'react'; import Table, { ProColumns, ActionType } from '@/components/Table'; -import { message } from 'antd'; import { fetchTableData } from '@/utils/table'; import AddNftModal from './components/AddNftModel'; import { getNFTList } from '@/services/nft'; diff --git a/src/pages/Recharge/Withdraw/List/index.tsx b/src/pages/Recharge/Withdraw/List/index.tsx index bb9126a..4921ea5 100644 --- a/src/pages/Recharge/Withdraw/List/index.tsx +++ b/src/pages/Recharge/Withdraw/List/index.tsx @@ -116,6 +116,7 @@ const WithdrawList = () => { rowKey="uuid" actionRef={tableRef} request={async (params) => { + params.status = params.status == null ? 0 : parseInt(params.status); const res = await fetchTableData(getWithdrawList, params); for (const key in res.data) { if (Object.prototype.hasOwnProperty.call(res.data, key)) { diff --git a/src/pages/System/Account/components/AddAccountModal.tsx b/src/pages/System/Account/components/AddAccountModal.tsx index 8582d5f..1682662 100644 --- a/src/pages/System/Account/components/AddAccountModal.tsx +++ b/src/pages/System/Account/components/AddAccountModal.tsx @@ -1,6 +1,6 @@ // 创建弹窗 import React, { useEffect, useRef, useState } from 'react'; -import { createForm, FormPathPattern, onFieldReact } from '@formily/core'; +import { createForm, Field, FormPathPattern, onFieldReact } from '@formily/core'; import { createSchemaField } from '@formily/react'; import Modal, { ModalProps } from '@/components/Modal'; import { Form, FormItem, Input, Select } from '@formily/antd'; diff --git a/src/services/nft.ts b/src/services/nft.ts index 2f9f4c7..7130db7 100644 --- a/src/services/nft.ts +++ b/src/services/nft.ts @@ -30,20 +30,6 @@ export const createNFTContract = (data) => { }); }; -/** - * 查询token_Id是否存在 - * @param {object} params - * - * @returns {array} data - */ -export const checkTokenId = (params) => { - return request.request({ - url: '/nft/check', - method: 'get', - params, - }); -}; - /** * 获取NFT列表 * @param {object} params @@ -59,7 +45,7 @@ export const getNFTList = (params) => { }; /** - * mintNFT + * 创建完NFT后通知后端 * @param {object} data * * @returns {array} data @@ -73,7 +59,7 @@ export const mintNFT = (data) => { }; /** - * getSignature + * 获取创建NFT时的签名 * @param {object} data * * @returns {array} data @@ -87,7 +73,7 @@ export const getSignature = (data) => { }; /** - * mintNFT + * 检查assetID是否存在 * @param {object} data * * @returns {array} data diff --git a/src/utils/table.ts b/src/utils/table.ts index a8bd628..fce2f10 100644 --- a/src/utils/table.ts +++ b/src/utils/table.ts @@ -9,7 +9,7 @@ export const fetchTableData = async ( delete params.current; delete params.pageSize; const res = (await fetch(params)) || {}; - const data = res.items; + const data = res.items || []; data?.forEach((n: any) => { for (const key in formatObj) { n[key] = n[formatObj[key]];