diff --git a/src/assets/img/marketplace/totalContribution.png b/src/assets/img/marketplace/totalContribution.png index 70e914d..b0aa7aa 100644 Binary files a/src/assets/img/marketplace/totalContribution.png and b/src/assets/img/marketplace/totalContribution.png differ diff --git a/src/components/Dialogs/buyDialog.vue b/src/components/Dialogs/buyDialog.vue index 1086bd0..f7a17c2 100644 --- a/src/components/Dialogs/buyDialog.vue +++ b/src/components/Dialogs/buyDialog.vue @@ -265,8 +265,9 @@ onMounted(() => { bottom: 8px; left: 10px; >div { - width: 30px; - height: 15px; + width: 32px; + height: 13px; + font-size: 8px; } div:nth-child(2) { margin-left: 8px; diff --git a/src/components/Dialogs/sellDialog.vue b/src/components/Dialogs/sellDialog.vue index 3400d1f..09c0764 100644 --- a/src/components/Dialogs/sellDialog.vue +++ b/src/components/Dialogs/sellDialog.vue @@ -303,11 +303,11 @@ onMounted(() => { font-size: 18px; } .img-btm { - bottom: 30px; - left: 30px; + bottom: 16px; + left: 20px; font-size: 18px; >div { - width: 120px; + width: 110px; height: 40px; } div:nth-child(2) { diff --git a/src/components/assets/activity.vue b/src/components/assets/activity.vue index 80957d1..e299fa6 100644 --- a/src/components/assets/activity.vue +++ b/src/components/assets/activity.vue @@ -21,7 +21,7 @@
-

No NFT yet

+

There has been no activity.

@@ -138,7 +138,7 @@ const getMyAssets = async () => { try { reqData.value.cursor = next_cursor.value.next_cursor // let res = await apiLockState(myADdress, reqData.value) - let res = await apiActivity(data, myADdress) + let res = await apiActivity(reqData.value, myADdress) // console.log(res,'--------------------------------') // return nftList.value = [...nftList.value, ...res.rows] diff --git a/src/components/assets/assetsHeader.vue b/src/components/assets/assetsHeader.vue index 26eb550..9177ff0 100644 --- a/src/components/assets/assetsHeader.vue +++ b/src/components/assets/assetsHeader.vue @@ -84,7 +84,7 @@
  • - {{item.contribution_point.match(/^\d+(?:\.\d{0,.})?/)[0]}} + {{contributionLogs(item.contribution_point)}}
    • @@ -310,7 +310,7 @@ import { ref, watch, computed, onMounted } from "vue" import ConfirmDialog from "@/components/Dialogs/confirmDialog.vue"; import {createModal} from "@/utils/model.util"; import { apiCecInfo, apiExpected, apiUserData, apiContribution } from "@/utils/marketplace" -import { priceCalculated, timeFormat } from "@/configs/priceCalculate" +import { priceCalculated, timeFormat, contributionLogs } from "@/configs/priceCalculate" import { useMarketplaceStore } from "@/store/marketplace" import {walletStore} from "@/store/wallet"; @@ -513,7 +513,7 @@ onMounted(() => { font-size: 18px; img { width: 27px; - height: 23px; + height: 27px; margin-left: 10px; } .icon { @@ -528,7 +528,7 @@ onMounted(() => { font-size: 14px; img { width: 27px; - height: 23px; + height: 27px; margin-left: 10px; } .icon { diff --git a/src/components/assets/myCard.vue b/src/components/assets/myCard.vue index 94514b9..e937fe8 100644 --- a/src/components/assets/myCard.vue +++ b/src/components/assets/myCard.vue @@ -15,6 +15,11 @@
    +
    + Common + Rare + Legendary +
    @@ -33,7 +38,7 @@
    loading - +
    loading @@ -50,15 +55,15 @@ loading List
    -
    Cancel listing
    +
    Delist
    loading - Unstake + Withdraw
    - loading + loading Stake
    @@ -145,7 +150,7 @@ const cancelNft = async (val) => { let res = await bc.market.cancelOrder([orderIds.event.data.id]) if(res.result) { let timer = setTimeout(() => { - message.success('Your item has been unlisted.') + message.success('Your item has been delisted.') emit('renewMyNft') clearTimeout(timer); }, 2000); @@ -154,7 +159,7 @@ const cancelNft = async (val) => { if(e.message.indexOf('rejected') > -1) { message.error('User rejected the request') } else { - message.error('Your item has failed to be unlisted.') + message.error('Your item has failed to be delisted.') } } } @@ -192,7 +197,7 @@ const lockToGameConfirm = async () => { const confirmResult = await createModal(ConfirmDialog, { title: '', noBtnTitle: '', - message: 'Staking is complete. This process may take 3-4 minutes.' + message: 'Staking is complete. Please refresh the page in 3 to 4 minutes to view the updated status.' }).show() loadingDialogVisible.value = false if(res) { @@ -230,7 +235,7 @@ const unlockMainConfirm = async () => { const confirmResult = await createModal(ConfirmDialog, { title: '', noBtnTitle: '', - message: 'Staking is complete. This process may take 3-4 minutes.' + message: 'Staking is complete. Please refresh the page in 3 to 4 minutes to view the updated status.' }).show() loadingDialogVisible.value = false if(res) { @@ -505,17 +510,18 @@ onMounted(() => { } } .link-staking { + width: 138px; img { - width: 140px; - height: 48px; + width: 138px; + height: 46px; } span { display: flex; justify-content: center; border-radius: 10px; align-items: center; - width: 100%; - height: 100%; + width: 94px; + height: 44px; color: #FF6271; border: 2px solid #ff6978; } diff --git a/src/components/common/card.vue b/src/components/common/card.vue index 95c6207..d382d06 100644 --- a/src/components/common/card.vue +++ b/src/components/common/card.vue @@ -31,7 +31,7 @@
    -
    Off the shelves
    +
    Delist
    @@ -107,14 +107,14 @@ const cancelNft = async (val) => { let res = await bc.market.cancelOrder([val.event.data.id]) console.log(res,[val.event.data.id]) if(res.result) { - message.success('Your item has been unlisted.') + message.success('Your item has been delisted.') emit('renewNft') } } catch (e) { if(e.message.indexOf('rejected') > -1) { message.error('User rejected the request') } else { - message.error('Your item has failed to be unlisted.') + message.error('Your item has failed to be delisted.') } } } diff --git a/src/components/common/convertCard.vue b/src/components/common/convertCard.vue index 3eb8d48..a9c4a0e 100644 --- a/src/components/common/convertCard.vue +++ b/src/components/common/convertCard.vue @@ -15,10 +15,13 @@ @@ -95,7 +98,14 @@ const props = defineProps({ }, }); const chainExpolor = (nft) => { - return `${import.meta.env.VUE_APP_EXPLORER_URL}/token/${nft.contract_address}/instance/${nft.token_id}` + // console.log(nft) + let linkUrl = '' + if(nft.type == 13) { + linkUrl = `https://etherscan.io/token/0xec23679653337d4c6390d0eeba682246a6067777?a=${nft.token_id}` + } else { + linkUrl = `${import.meta.env.VUE_APP_EXPLORER_URL}/token/${nft.contract_address}/instance/${nft.token_id}` + } + return linkUrl } diff --git a/src/components/common/hangingCard.vue b/src/components/common/hangingCard.vue index c1a8db2..751175e 100644 --- a/src/components/common/hangingCard.vue +++ b/src/components/common/hangingCard.vue @@ -46,7 +46,7 @@ @@ -77,13 +77,13 @@ const eventNft = async (e) => { let res = await bc.market.cancelOrder([e.data.id]) if(res.result) { let timer = setTimeout(() => { - message.success('Your item has been unlisted.') + message.success('Your item has been delisted.') emit('renewMyNft') clearTimeout(timer); }, 2000); } } catch (e) { - message.error('Your item has failed to be unlisted.') + message.error('Your item has failed to be delisted.') } } diff --git a/src/components/common/imgCard.vue b/src/components/common/imgCard.vue index b6d6a55..dc05240 100644 --- a/src/components/common/imgCard.vue +++ b/src/components/common/imgCard.vue @@ -6,7 +6,13 @@
  • - + +
    {{ props.nftData.detail.max_mining_days }}D
    @@ -14,6 +20,7 @@
    {{ props.nftData.detail.wealth }}
    {{ props.nftData.detail.lucky }}
    +
  • @@ -83,6 +90,7 @@ const props = defineProps({ box-sizing: border-box; } } + } .gold-img { border: 2px solid #655b77; diff --git a/src/components/common/searchView/nftStatusRadio.vue b/src/components/common/searchView/nftStatusRadio.vue index 194f1d6..bd8cdbe 100644 --- a/src/components/common/searchView/nftStatusRadio.vue +++ b/src/components/common/searchView/nftStatusRadio.vue @@ -4,7 +4,7 @@ All Listed - Unlisted + Not Listed
    diff --git a/src/components/common/starTimer.vue b/src/components/common/starTimer.vue index d1a9992..608b527 100644 --- a/src/components/common/starTimer.vue +++ b/src/components/common/starTimer.vue @@ -7,23 +7,23 @@