diff --git a/src/components/assets/assetsContent.vue b/src/components/assets/assetsContent.vue
index 1af9ddc..20e3645 100644
--- a/src/components/assets/assetsContent.vue
+++ b/src/components/assets/assetsContent.vue
@@ -7,14 +7,14 @@
@@ -63,12 +62,19 @@ const qualityImageUrl = computed(() => {
\ No newline at end of file
diff --git a/src/components/assets/myCard.vue b/src/components/assets/myCard.vue
index efac17a..1217aa0 100644
--- a/src/components/assets/myCard.vue
+++ b/src/components/assets/myCard.vue
@@ -198,12 +198,15 @@ const cardPrice = async (val) => {
// 赎回
const unStake = async (data) => {
- // debugger
- console.log(toRaw(data).contract_address,[toRaw(data).token_id])
- const locker = new Locker()
- // console.log(locker.sendUnlockOrMint)
- let res = await locker.unlockOrMintGameNft(toRaw(data).contract_address,[toRaw(data).token_id])
- console.log(res)
+ const bc = new BlockChain()
+ let res = await bc.locker.unlockOrMintGameNft(toRaw(data).contract_address,[toRaw(data).token_id])
+ if(res) {
+ let timer = setTimeout(() => {
+ message.success('Unstake success.')
+ emit('renewMyNft')
+ clearTimeout(timer);
+ }, 2000);
+ }
}
// 去详情页面
diff --git a/src/components/assets/staking.vue b/src/components/assets/staking.vue
index b83d1ac..e78d487 100644
--- a/src/components/assets/staking.vue
+++ b/src/components/assets/staking.vue
@@ -66,14 +66,12 @@ const renewMyNft = async() => {
overviewValue.value = ''
nftList.value = []
getMyAssets()
- // location.reload()
clearTimeout(timer);
}, 2000);
}
const next_cursor = ref()
const getMyAssets = async () => {
- // nftList.value = []
const myADdress = localWalletStore.address
const data = {
type: 3,
diff --git a/src/components/chain/contract/Locker.js b/src/components/chain/contract/Locker.js
index 75f418f..cc5d0ce 100644
--- a/src/components/chain/contract/Locker.js
+++ b/src/components/chain/contract/Locker.js
@@ -65,23 +65,21 @@ export class Locker {
async unlockOrMintGameNft(nft, tokenIds) {
console.log('unlock nft', nft, tokenIds)
const blockChain = new BlockChain()
- const { provider, address } = await blockChain.selectAddress({})
- await blockChain.checkPassportLogin();
- await blockChain.checkAndChangeChain();
+ const { provider, address } = await this.bc.selectAddress({})
+ await this.bc.checkPassportLogin();
+ await this.bc.checkAndChangeChain();
const preDatas = {
net_id: import.meta.env.VUE_APP_NET_ID,
to: address,
contract_address: nft,
- tokens: tokenIds.map(tokenId => {return { tokenId }}),
+ tokens: tokenIds.map(token_id => {return { token_id }}),
}
- console.log(await this.bc)
- const passportToken = await blockChain.passportToken()
+ const passportToken = await this.bc.passportToken()
const { errcode, errmsg, trans_req } = await apiUnlockOrMint(preDatas, passportToken)
if (errcode) {
throw new Error(errmsg)
}
const web3Provider = this.bc.passportProvider || this.bc.web3Provider
- console.log(web3Provider)
return this.sendUnlockOrMint(web3Provider, trans_req)
}
// 游戏内资产上链, 只用于mint
@@ -100,6 +98,6 @@ export class Locker {
throw new Error(errmsg)
}
trans_req.from = address
- return this.sendUnlockOrMint(this.bc.web3Provider, trans_req)
+ return this.sendUnlockOrMint(blockChain.web3Provider, trans_req)
}
}
diff --git a/src/components/common/searchView/nftStatusRadio.vue b/src/components/common/searchView/nftStatusRadio.vue
index b5533aa..194f1d6 100644
--- a/src/components/common/searchView/nftStatusRadio.vue
+++ b/src/components/common/searchView/nftStatusRadio.vue
@@ -5,7 +5,7 @@
All
Listed
Unlisted
-
Staking
+