From f681c24e5b1341530834d7ea1d86de667e2b8e58 Mon Sep 17 00:00:00 2001 From: yuyongdong Date: Thu, 25 Jul 2024 17:58:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9herder=20Table=E8=B7=AF?= =?UTF-8?q?=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/assets/myCard.vue | 19 +- src/components/common/convertCard.vue | 23 +- .../common/searchView/nftStatusRadio.vue | 2 +- src/components/layout/NavBar.vue | 204 ++++++------------ src/views/DetailView.vue | 18 +- 5 files changed, 112 insertions(+), 154 deletions(-) diff --git a/src/components/assets/myCard.vue b/src/components/assets/myCard.vue index 246af98..94514b9 100644 --- a/src/components/assets/myCard.vue +++ b/src/components/assets/myCard.vue @@ -37,8 +37,12 @@
loading - Stake + Stake
+
@@ -53,10 +57,10 @@ loading Unstake
- + Stake + @@ -158,8 +162,8 @@ const cancelNft = async (val) => { const loadingDialogVisible = ref(false) // 下链使用 -const lockToGame = async(type) => { - if(type == 'founder') { +const lockToGame = async(data) => { + if(data.type == 13) { const confirmResult = await createModal(ConfirmDialog, { title: '', message: `Are you sure you want to stake?` @@ -168,7 +172,7 @@ const lockToGame = async(type) => { loadingDialogVisible.value = true unlockMainConfirm() } - } else if(type == 'convert') { + } else { const confirmResult = await createModal(ConfirmDialog, { title: '', message: 'Are you sure you want to stake?' @@ -391,6 +395,7 @@ const sellHandleClose = (val) => { onMounted(() => { cardPrice(toRaw(props.nftData)) + }); diff --git a/src/components/common/convertCard.vue b/src/components/common/convertCard.vue index aa91fd9..3eb8d48 100644 --- a/src/components/common/convertCard.vue +++ b/src/components/common/convertCard.vue @@ -7,18 +7,18 @@
-
{{ nft.name }}
+
Founder's Tag
+
{{ nft.name }}
- - diff --git a/src/components/layout/NavBar.vue b/src/components/layout/NavBar.vue index 80b7ab7..4f8b43f 100644 --- a/src/components/layout/NavBar.vue +++ b/src/components/layout/NavBar.vue @@ -145,7 +145,7 @@ const navList = reactive([ name: "ASSETS", path: "/assets", submenu: [ - { label: "Before 2024", link: "https://pledge.kingsome.cn" }, + { label: "Before 2024", link: "https://pledge.counterfire.games" }, { label: "After 2024", path: "/assets", @@ -157,18 +157,23 @@ const navList = reactive([ name: "NOTICE", path: "/notice", }, - { - id: 5, - name: "EVENT", - path: "/contact", - submenu: [ - { label: "Badge", link: "https://badge.counterfire.games/" }, - { - label: "Gacha", - link: "https://gacha.counterfire.games/", - }, - ], - }, + // { + // id: 5, + // name: "GACHA", + // path: "https://gacha.counterfire.games/view", + // }, + // { + // id: 5, + // name: "EVENT", + // path: "/contact", + // submenu: [ + // { label: "Badge", link: "https://badge.counterfire.games/" }, + // { + // label: "Gacha", + // link: "https://gacha.counterfire.games/", + // }, + // ], + // }, // { // id: 6, // name: "STAKE", @@ -211,7 +216,9 @@ function handNavCurent(nav) { router.push(nav.path); // } else if(nav.id == 6) { // window.open(nav.path, "_blank"); - } + // } else if(nav.id == 5) { + // window.open(nav.path, "_blank") + } // if (nav.id == 1 || nav.id == 2 || nav.id == 3) { // window.open(nav.path, "_blank"); // } else if (nav.id == 5 || nav.id == 6) { @@ -380,82 +387,19 @@ onMounted( async () => { line-height: 30px; color: #bb7fff !important; cursor: pointer; - .dropdown { - position: absolute; - top: 84px; - left: 50%; - width: 100%; - background: rgba(0, 0, 0, 0.84); - border-radius: 0px 0px 12px 12px; - z-index: 1; - opacity: 0; - transform: translate(-50%, 0%); - visibility: hidden; - transition: all 0.3s ease-out; - } - - .dropdown ul { - list-style: none; - margin: 0; - padding: 0; - } - .dropdown li { - // padding-top: 10px; - // padding-bottom: 10px; - padding-left: 20px; - padding-right: 20px; - cursor: pointer; - } - .link-content { - display: flex; - // width: 150px; - text-align: center; - align-items: center; - justify-content: space-between; - } - .link-label { - font-size: 16px; - font-family: Arial; - font-weight: 400; - text-align: center; - color: #ffffff; - } - .dropdown li a { - font-size: 16px; - font-family: Arial; - font-weight: 400; - color: #ffffff; - padding-top: 10px; - padding-bottom: 10px; - text-align: center; /* ensure text is centered */ - width: 100%; /* make it span the full width */ - display: block; - cursor: pointer; - } - .dropdown li span { - font-size: 15px; - font-family: Arial; - font-weight: 400; - color: #ffffff; + &:hover { + transition-property: color; + transition-duration: 0.15s; + transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); + font-family: "Anton"; + background-color: #bb7fff; + border-radius: 42px; + color: #000000 !important; + .dropdown { + display: block; + } } } - .duration-200 { - transition-duration: 0.2s; - } - .nav-item:hover { - transition-property: color; - transition-duration: 0.15s; - transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); - font-family: "Anton"; - background-color: #bb7fff; - border-radius: 42px; - color: #000000 !important; - } - .nav-item:hover .dropdown { - opacity: 1; - visibility: visible; - } - .active-nav-item { font-size: 32px; font-family: "Anton"; @@ -469,55 +413,49 @@ onMounted( async () => { transition-duration: 0.3s; transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); color: #000000 !important; - .dropdown { - position: absolute; - top: 84px; - left: 50%; - width: 100%; - background: rgba(0, 0, 0, 0.84); - border-radius: 0px 0px 12px 12px; - z-index: 1; - opacity: 0; - transform: translate(-50%, 0%); - visibility: hidden; - transition: all 0.3s ease-out; + &:hover { + .dropdown { + display: block; + } } - .dropdown ul { + } + .dropdown { + position: absolute; + top: 84px; + left: 50%; + width: 100%; + background: rgba(0, 0, 0, 0.84); + border-radius: 0px 0px 12px 12px; + z-index: 1; + transform: translate(-50%, 0%); + display: none; + transition: all 0.3s ease-out; + ul { list-style: none; margin: 0; padding: 0; - } - .dropdown li { - padding-top: 10px; - padding-bottom: 10px; - padding-left: 20px; - padding-right: 20px; - cursor: pointer; - } - .link-content { - display: flex; - // width: 150px; - align-items: center; - justify-content: space-between; - } - .link-label { - font-size: 16px; - font-family: Arial; - font-weight: 400; - text-align: center; - color: #ffffff; - } - .dropdown li a { - font-size: 16px; - font-family: Arial; - font-weight: 400; - color: #ffffff; - } - .dropdown li span { - font-size: 15px; - font-family: Arial; - font-weight: 400; - color: #ffffff; + li { + padding-left: 20px; + padding-right: 20px; + cursor: pointer; + .link-content { + display: flex; + text-align: center; + align-items: center; + justify-content: space-between; + a { + font-size: 16px; + font-family: Arial; + font-weight: 400; + color: #ffffff; + padding-top: 10px; + padding-bottom: 10px; + text-align: center; /* ensure text is centered */ + width: 100%; /* make it span the full width */ + cursor: pointer; + } + } + } } } } diff --git a/src/views/DetailView.vue b/src/views/DetailView.vue index 8ddfcdc..2077f29 100644 --- a/src/views/DetailView.vue +++ b/src/views/DetailView.vue @@ -106,7 +106,8 @@
Contract address
{{ detailData.nft.contract_address}}
- {{ sliceAddress(detailData.nft.contract_address) }} + {{ sliceAddress(detailData.nft.contract_address) }} + {{ sliceAddress(detailData.nft.contract_address) }}
  • @@ -121,7 +122,8 @@
  • Metadata
    - + +
  • Royalties
    @@ -234,6 +236,7 @@ const detailData = ref(null) const assetsDetailData = ref(null) const myAddress = localWalletStore.address const contractBlankUrl = ref() +const founderBlankUrl = ref() const contractTokenUrl = ref() const nftAbilities = ref() const icon = ref('') @@ -628,7 +631,9 @@ const mintHero = async () => { const getDetail = async () => { let { errcode, errmsg, data} = await nftDetail(props.address, props.tokenid) + console.log(data) contractBlankUrl.value = `${import.meta.env.VUE_APP_EXPLORER_URL}/address/${data.nft.contract_address}` + contractTokenUrl.value = `${import.meta.env.VUE_APP_EXPLORER_URL}/token/${data.nft.contract_address}/instance/${data.nft.token_id}` if (errcode) { // console.log(errmsg) @@ -652,6 +657,7 @@ onMounted(() => { getDetail() } else { detailData.value = marketplaceList.detailData + founderBlankUrl.value = `https://etherscan.io/token/0xec23679653337d4c6390d0eeba682246a6067777?a=${detailData.value.nft.token_id}` nftAbilities.value = marketplaceList.detailData.nft.detail } }) @@ -926,12 +932,16 @@ onMounted(() => { position: relative; cursor: pointer; >div { - width: 520px; + width: 560px; height: 40px; + border-radius: 10px; + line-height: 40px; + border: 1px solid #7e7686; position: absolute; top: -50px; left: -50%; - background: #17141b; + text-align: center; + background: #282131; color: #fff; display: none; }