From 4b4f94e6fd4a168697511360257423486f85d04c Mon Sep 17 00:00:00 2001 From: yuyongdong Date: Wed, 31 Jul 2024 11:06:53 +0800 Subject: [PATCH] =?UTF-8?q?gif=E6=9B=BF=E6=8D=A2=E6=88=90=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E3=80=81=E6=96=B0=E5=A2=9Egacha=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../img/marketplace/totalContribution.png | Bin 1135 -> 1706 bytes src/components/Dialogs/buyDialog.vue | 5 +-- src/components/Dialogs/sellDialog.vue | 6 ++-- src/components/assets/activity.vue | 4 +-- src/components/assets/assetsHeader.vue | 8 ++--- src/components/assets/myCard.vue | 30 ++++++++++------- src/components/common/card.vue | 6 ++-- src/components/common/convertCard.vue | 16 +++++++-- src/components/common/hangingCard.vue | 6 ++-- src/components/common/imgCard.vue | 10 +++++- .../common/searchView/nftStatusRadio.vue | 2 +- src/components/common/starTimer.vue | 16 ++++----- src/components/layout/NavBar.vue | 14 ++++---- src/configs/priceCalculate.js | 8 +++++ src/views/DetailView.vue | 31 +++++++++++------- 15 files changed, 101 insertions(+), 61 deletions(-) diff --git a/src/assets/img/marketplace/totalContribution.png b/src/assets/img/marketplace/totalContribution.png index 70e914d33397c5849169aa9496599539236bfeb5..b0aa7aac3f3aa46b0cb8ab1e2bf7301673fbd4b8 100644 GIT binary patch literal 1706 zcmaJ?X;2eq7>@#UbW2e4f&AO(~#0Rd`drV1CRh2XrdfSl{LSs*YEAu@#E zKc-@(VSo>U!GH^s$B=QH-2hiUlf!dnJMkO=E}O$=vE5i4CkC4%VDkhnuE4?rlF=}E ziXcMlw-Ae53BfdiKm{yTZf-6!*NKT>sVokkPik;kTrPt|Fz`GT0jU`(oW7_ahH)9D zKnVq+0(6Q{GLlUQLDK0zDJan;SrxueCbD2GHH5M_OtvniMW9sr|4^lJ35^pG@H@Z% zDU3(up)e}~#*u7HMjl)WT^9-!_+T(ZAXpTFWG+@QEDa$LJPknsE@=s{k5Q=PNG`s0 zo*}EfVp0B4;s=0>$!Pc+2W7aOKN;ab1?nBF(UL zC;P9HUfd$vM>k#STXM0~`LK#?cZ}@oGs8cGlGlYM5qn3eZ``R03aAJ-ADn^=%|J8Q zG6K5h*tx}|UD42esxr2_!xtDC5N$0sy79GrXIl8vgWMV;hrqzb(Sui`k{B&}hXDFd zpC?HN zg_%5OgLpwJJ#goWYsPle>24f;?doO}Qgl0sS`GeU3)_Tf+`>bSD4b|1CQpzXKlWc-`Z5pYcFa0_+$;U zi-+n(@$K(hjB52Xq3e|;S@qH1PNnu|cHH#VhNAvso(4W1w6=!h9A9gzQRCK#MD6RrSl-~KI4#m83sLEV{P)kwFAyv)Ylw~79F?m$mL zW_!tX&~##I+w&KB`LiFGt6r=|62%g296Hp=O#W&`K}UYdn@UH6QR`b9R+`6gc0m@C zEr+IH)!n@xt98jq2*N=1<1>cfGe#2|yCHsd$pXF=ij;teJbpJ~=Fu)XNtN6*@& zZMf|bt2lkP>bKn$C({lLA0mJYl8X}CJy0T|H`}KP8>F3i()_xAAjq}t$L&bEJsdAXP8SpV2^y3?p?-|QIfnCo!9@Ije&{8h&D@i*>o=zWx+ Wn&0n%)q8w&e-DXoi1>skY46{%W{bQ4 literal 1135 zcmV-#1d#iQP)Px(DM>^@R7gv$)mf;ORTKyC-~P^3OD(g(GBW3=pdKPH>?tCtDBqd~QiF;fY%()L z4Ya{>DyX0`!h#B-kcyzJKoW`uC>r%@^Q4qzmU{0wt8edn%=D@mwBbCQkG+1I*f3Ma3=;M(A{g_&L8rgM*H`RGv zN}0=f$?E7=_)+{dTG&v;Qu#!fDGU*=w%IBJTqL=r4Vb|n)pVbZQula!3JYrff1~hy zjL=yUrD=JO8hZdQsK<~!Hlj#BxmVMVDl_WBY}skHdQV>$;u<`wuZL_gRApZMKPS)P z`d~j4pyUMMtNH-5H9c)?+PcHk-$j30U8dzW$x)KdLUhtqvy}z3r5@=t1Ff{l5h@#0 zj?*e47}2)NXIdpeP8PmXnX8{=j!b{-F!gp4*2e*UccpMM4zK0=aVf4GnAKGH>oCx&p#r~UMrlbW7Wxn6Q! zTSQAGcN>wu-(BkL87%K!6T>vzRwqj~XQTM7%l-Noq~&LoYlJIG<7AnpxyGa%;=5gY z2g@a&#z=jOC34nv3y+r9p;2D*%xzyhW1HEIP1(?UT>lQ1OFLt%R7{`Ezoj1AN5b*- zlaga72k#7{)9Sqe^_KqLcCU`(HHy?TXB~Pn@nsFu4No8c8_<6P%Ma{2C$^ { 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 @@
    -
    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 @@