diff --git a/index.html b/index.html index 29b58c5..859e0e4 100644 --- a/index.html +++ b/index.html @@ -5,14 +5,14 @@ Counter Fire - + - + { - router.push("/"); + router.push("/home"); }; function handNavCurent(nav) { @@ -387,7 +387,7 @@ watch(() => [route.path, localWalletStore.address, marketplaceStore.fireAddress] isCart.value = true }else if(routerPath[1] == 'cecActivity') { isHeaderShow.value = false - }else if(routerPath[1] == 'claim') { + }else if(routerPath[1] == 'claim' || routerPath[1] == '') { loginShowMenu.value = false } else { loginShowMenu.value = true diff --git a/src/router/index.js b/src/router/index.js index 5b93fda..38740b3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -13,6 +13,15 @@ const routes = [ { path: "/", name: "index1", + component: ClaimView, + meta: { + title: "claim", + canonical: "https://.counterfire.games", + }, + }, + { + path: "/home", + name: "home", component: HomeView, meta: { title: "Counter Fire", diff --git a/src/utils/marketplace.js b/src/utils/marketplace.js index a779650..24a4fd7 100644 --- a/src/utils/marketplace.js +++ b/src/utils/marketplace.js @@ -128,7 +128,7 @@ export const apiCecInfo = async(address,token) => { // CEC Claim 领取 export const apiCecClaim = async(address,token) => { let url = `${API_UAW}/api/cec/claim` - return httpPost(url,address,token) + return httpPost(url,{address: address},token) } // 绑定交易所账号 diff --git a/src/views/ClaimView.vue b/src/views/ClaimView.vue index bc320c1..9ec74f0 100644 --- a/src/views/ClaimView.vue +++ b/src/views/ClaimView.vue @@ -388,8 +388,9 @@ const getCecTotal = async () => { } const isBindAccount = () => { + console.log(cecInfo.value.bindUid) if(cecInfo.value.bindUid) { - cecUserStatus.value = 2 + cecUserStatus.value = 3 } else { cecUserStatus.value = 0 } @@ -475,10 +476,10 @@ const reqGetInfo = async () => { const cecClaim = async () => { let res = await new BlockChain().claimAddress({}) console.log(res.address) - // let walletToken = await new BlockChain().token() - // let token = marketplaceStore.fireToken || walletToken - // let res1 = await apiCecClaim(res.address, token) - // console.log(res1) + let walletToken = await new BlockChain().token() + let token = marketplaceStore.fireToken || walletToken + let res1 = await apiCecClaim(res.address, token) + console.log(res1) } onMounted(() => { diff --git a/src/views/DetailView.vue b/src/views/DetailView.vue index e1d5579..2d51722 100644 --- a/src/views/DetailView.vue +++ b/src/views/DetailView.vue @@ -797,7 +797,6 @@ 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/${