From 8356f5ed5f09a8064791fbe90ff3c5e442ee0178 Mon Sep 17 00:00:00 2001 From: yuyongdong Date: Wed, 17 Jul 2024 19:19:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E5=BF=83=E5=8C=96ca?= =?UTF-8?q?rd=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/assets/assetsContent.vue | 22 ++++----- src/components/assets/assetsHeader.vue | 2 +- src/components/assets/cenCard.vue | 40 ++-------------- src/components/assets/imgs.vue | 46 +++++++++++++------ src/components/assets/myCard.vue | 15 +++--- src/components/assets/staking.vue | 2 - src/components/chain/contract/Locker.js | 14 +++--- .../common/searchView/nftStatusRadio.vue | 2 +- 8 files changed, 62 insertions(+), 81 deletions(-) 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 @@
- + + + - --> +
@@ -37,12 +37,12 @@ const navList = ref([ { name: "NFTs" }, - // { - // name: "Staking" - // }, - // { - // name: "Centralized Assets" - // }, + { + name: "Centralized Assets" + }, + { + name: "Staking" + }, { name: "Listings" }, diff --git a/src/components/assets/assetsHeader.vue b/src/components/assets/assetsHeader.vue index 10d9c3f..4814965 100644 --- a/src/components/assets/assetsHeader.vue +++ b/src/components/assets/assetsHeader.vue @@ -314,7 +314,7 @@ onMounted(() => { background: url('@/assets/img/marketplace/CEC_bg.png') no-repeat; background-size: 100% 100%; box-sizing: border-box; - display: none; + // display: none; .uaw-listing-content { display: flex; justify-content: space-between; diff --git a/src/components/assets/cenCard.vue b/src/components/assets/cenCard.vue index 69315d4..93c7070 100644 --- a/src/components/assets/cenCard.vue +++ b/src/components/assets/cenCard.vue @@ -33,7 +33,7 @@
-
Mint for NFT
+
Mint for NFT
@@ -53,7 +53,6 @@ import placeholderImg from '@/assets/img/marketplace/GenesisHeroes_NFT.png' import {createModal} from "@/utils/model.util"; import ConfirmDialog from "@/components/Dialogs/confirmDialog.vue" import { timeFormat } from "@/configs/priceCalculate" -import { Locker } from "@/components/chain/contract/Locker" const emit = defineEmits(['renewMyNft']) import {formatPrice} from "@/components/chain/utils" @@ -68,14 +67,6 @@ const props = defineProps({ }, }); -const mintNft = async () => { - // console.log('-----', toRaw(props.nftData)) - // return - const locker = new Locker() - let res = await locker.mintNft([toRaw(props.nftData).uniid]) - console.log(res,'--------------') -} - // 获取地板价 const floorPrice = ref('0') const getFloorPrice = async (val) => { @@ -241,34 +232,9 @@ onMounted(() => { padding: 30px 30px 20px 30px; box-sizing: border-box; .card-img { - width: 240px; - height: 360px; + width: 190px; + height: 316px; margin: 0 auto; - :deep(.card-img-common) { - li { - width: 100%; - height: 100%; - .img-top { - width: 100px; - height: 30px; - top: 20px; - left: 20px; - } - .img-btm { - bottom: 12px; - left: 20px; - >div { - width: 80px; - height: 30px; - } - div:nth-child(1) { - } - div:nth-child(2) { - margin-left: 8px; - } - } - } - } } .card-name { display: flex; diff --git a/src/components/assets/imgs.vue b/src/components/assets/imgs.vue index 394ebef..6e8fb06 100644 --- a/src/components/assets/imgs.vue +++ b/src/components/assets/imgs.vue @@ -4,7 +4,6 @@
-
@@ -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 +