diff --git a/src/components/chain/contract/Locker.js b/src/components/chain/contract/Locker.js index 0d1aff1..5cb4e1f 100644 --- a/src/components/chain/contract/Locker.js +++ b/src/components/chain/contract/Locker.js @@ -1,6 +1,6 @@ import { ethers } from 'ethers' -import { apiUnlockOrMint } from '@/utils/marketplace' +import { apiUnlockOrMint, apiMintNft } from '@/utils/marketplace' const lockAbi = [ 'function lock(address nft, address to, uint256[] tokenIds) external', @@ -47,7 +47,7 @@ export class Locker { async sendUnlockOrMint(provider, {to, data}) { - const txHash = await web3Provider.request({ + const txHash = await provider.request({ method: 'eth_sendTransaction', params: [{ to, @@ -80,17 +80,15 @@ export class Locker { } // 游戏内资产上链, 只用于mint // 该方法会显示一个确认弹窗, 由用户选择mint到哪个地址 - async mintNft(nft, tokenIds) { - console.log('mint nft', nft, tokenIds) - const { provider, address } = await this.bc.selectAddress() + async mintNft(tokenIds) { + console.log('mint hero', tokenIds) + const { provider, address } = await this.bc.selectAddress({}) const preDatas = { - net_id: import.meta.env.VUE_APP_NET_ID, to: address, - contract_address: nft, - tokens: tokenIds.map(tokenId => {return { tokenId }}), + hero_uniids: tokenIds, } const passportToken = await this.bc.passportToken() - const { errcode, errmsg, trans_req } = await apiUnlockOrMint(preDatas, passportToken) + const { errcode, errmsg, trans_req } = await apiMintNft(preDatas, passportToken) if (errcode) { throw new Error(errmsg) } diff --git a/src/components/layout/NavBar.vue b/src/components/layout/NavBar.vue index 7321e29..08043d6 100644 --- a/src/components/layout/NavBar.vue +++ b/src/components/layout/NavBar.vue @@ -47,8 +47,11 @@