From ca83c4f9c06da26e5b70ee66408f2383da927172 Mon Sep 17 00:00:00 2001 From: yuyongdong Date: Tue, 20 Aug 2024 14:44:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=85=85=E5=80=BC=E5=92=8Cce?= =?UTF-8?q?c=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/logo.png | Bin 6332 -> 15086 bytes src/components/assets/assetsHeader.vue | 38 ++++++++---- src/router/index.js | 2 +- src/views/CecActivityView.vue | 79 ++++++++++++++----------- 4 files changed, 73 insertions(+), 46 deletions(-) diff --git a/public/logo.png b/public/logo.png index a32812b862da379d078a52f1a8e521d5ba0385fd..5d3a4415164e4faf0b6db7149a8ff7a89bfac903 100644 GIT binary patch literal 15086 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 literal 6332 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 - - + +

Unit

@@ -641,7 +641,6 @@ const getRechargeGoods = async () => { // selectItem 预选充值数量 const selectItem = (data, index) => { - console.log(toRaw(data)) activeIndex.value = index if(data.goods_id == 1006) { confirmRecharge.value = { @@ -660,10 +659,10 @@ const handleInput = (e) => { if(Number(brickworkAmount.value) > toRaw(confirmRecharge.value).max_buy_times) { brickworkAmount.value = toRaw(confirmRecharge.value).max_buy_times toRaw(confirmRecharge.value).price = toRaw(confirmRecharge.value).max_buy_times - toRaw(confirmRecharge.value).diamond = brickworkAmount.value*50 + toRaw(confirmRecharge.value).diamond = brickworkAmount.value*100 } else { toRaw(confirmRecharge.value).price = brickworkAmount.value - toRaw(confirmRecharge.value).diamond = brickworkAmount.value*50 + toRaw(confirmRecharge.value).diamond = brickworkAmount.value*100 priceAmount.value = brickworkAmount.value } @@ -672,8 +671,9 @@ const handleInput = (e) => { const rechargeDecrease = async () => { if(brickworkAmount.value == 1) return false brickworkAmount.value-- - priceAmount.value-- - if(confirmRecharge.value.goods_id == 1001) { + priceAmount.value = brickworkAmount.value + // priceAmount.value-- + if(confirmRecharge.value.goods_id == 1006) { toRaw(confirmRecharge.value).price = brickworkAmount.value toRaw(confirmRecharge.value).diamond = brickworkAmount.value*100 } @@ -681,7 +681,8 @@ const rechargeDecrease = async () => { const rechargeIncrease = async () => { if(brickworkAmount.value == toRaw(confirmRecharge.value).max_buy_times) return false brickworkAmount.value++ - priceAmount.value++ + priceAmount.value = brickworkAmount.value + // priceAmount.value++ if(confirmRecharge.value.goods_id == 1006) { toRaw(confirmRecharge.value).price = brickworkAmount.value toRaw(confirmRecharge.value).diamond = brickworkAmount.value*100 @@ -690,7 +691,6 @@ const rechargeIncrease = async () => { // 充值 const conformBtn = async () => { - // console.log(toRaw(confirmRecharge.value)) // return // if(localWalletStore.walletType == 3) { let address = localWalletStore.address @@ -700,9 +700,10 @@ const conformBtn = async () => { loadingDialogVisible.value = true // getGameLog() // return + let goods_num = Number(toRaw(confirmRecharge.value).goods_id) == 1006 ? Number(brickworkAmount.value) : 1 try { const bc = new BlockChain() - let res = await bc.mall.execBuyItem(Number(toRaw(confirmRecharge.value).goods_id), Number(brickworkAmount.value),toRaw(confirmRecharge.value).currency_list[0].address) + let res = await bc.mall.execBuyItem(Number(toRaw(confirmRecharge.value).goods_id), goods_num,toRaw(confirmRecharge.value).currency_list[0].address) // console.log(res) if(res) { brickworkAmount.value = 1 @@ -2193,6 +2194,7 @@ onMounted(() => { div { width: 36px; height: 28px; + margin-right: 10px; img { width: 100%; height: 100%; @@ -2202,25 +2204,37 @@ onMounted(() => { .item-amount-input { width: 222px; height: 42px; + padding: 0 20px; display: flex; align-items: center; - justify-content: space-evenly; + justify-content: space-between; margin: 0 auto; background: #1E1B26; border-radius: 21px; position: relative; input { color: #fff; - width: 100px; + width: 90px; height: 42px; border: 0px; text-align: center; + font-size: 28px; + margin-right: 35px; + } + input[type=number] { + -moz-appearance:textfield; + } + input[type=number]::-webkit-inner-spin-button, + input[type=number]::-webkit-outer-spin-button { + -webkit-appearance: none; + margin: 0; } h4 { position: absolute; top: 50%; + right: 50px; transform: translateY(-50%); - right: -43px; + // right: -43px; font-size: 20px; } } diff --git a/src/router/index.js b/src/router/index.js index 6149efa..7df8144 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -78,7 +78,7 @@ const routes = [ name: "CecActivityView", component: CecActivityView, meta: { - title: "CecActivityView", + title: "Counter Fire-CecActivity", canonical: "https://.counterfire.games", }, }, diff --git a/src/views/CecActivityView.vue b/src/views/CecActivityView.vue index c07d09b..443b5c0 100644 --- a/src/views/CecActivityView.vue +++ b/src/views/CecActivityView.vue @@ -15,15 +15,16 @@
-
- Connect Wallet +
+ Connect Wallet +
+ + +
+
+
{{ localWalletStore.showAddress }}
@@ -37,7 +38,7 @@
-

$CEC Bounty Hunt

+

Contribution Clash

@@ -58,7 +59,7 @@
-
{{ marketplaceStore.contributionPoint }}
+
{{ cecInfo.my_contribution }}
@@ -90,7 +91,7 @@
  • Your Credits
    - {{ marketplaceStore.contributionPoint }} + {{ cecInfo.my_contribution }}
  • @@ -99,7 +100,8 @@
    • -
    +
    +
  • @@ -165,17 +167,21 @@ const router = useRouter(); const totalCecPool = ref(0) const cecInfo = ref({ - my_contribution: '', - global_contribution: '', - total_cec_pool: '', - my_expected_cec: '' + my_contribution: '-', + global_contribution: '-', + total_cec_pool: 500000, + my_expected_cec: '-' }) const myWidth = computed(() => { let str = (Number(cecInfo.value.my_contribution) / Number(cecInfo.value.global_contribution)) * 100 // let str = cecInfo.value.total_cec_pool - if(str < 10) return 10 + if(!localWalletStore.token) { + str = 0 + } else { + if(str < 10) return 10 + } return str }) @@ -186,11 +192,13 @@ const totalWidth = computed(() => { // const getCecActivity = async () => { + if(localWalletStore.token) { + const { errcode, errmsg, contributionPoint, info } = await apiCecActivity(localWalletStore.address) if(errcode != 0) return totalCecPool.value = contributionPoint cecInfo.value = info - +} } // 链接钱包 @@ -228,22 +236,23 @@ const downloadGame = (platform) => { } }; -// const loginDiscord = () => { - // const _address = localWalletStore.address; - // const codeChallenge = Date.now(); - // const state = btoa(`${_address}|${codeChallenge}`); - // // const url = 'https://discord.com/api/oauth2/authorize?client_id=1116692240224501850&redirect_uri=http%3A%2F%2Flocalhost%3A3010%2Fdiscord%2Fredirect_uri&response_type=code&scope=guilds%20identify%20guilds.members.read' - // const url = `https://discord.com/api/oauth2/authorize?client_id=1117759635269636096&redirect_uri=https%3A%2F%2Foauth-svr.cebggame.com%2Fdiscord%2Fredirect_uri&response_type=code&scope=guilds%20identify%20guilds.members.read&state=${state}`; - // // location.href = url - // // // Redirect the user to the Discord OAuth2 authorization page - // let params = `scrollbars=yes,resizable=yes,status=no,location=no,toolbar=no,menubar=no,width=600,height=800,left=100,top=100`; - // let newwin = window.open(url, "discord login", params); - // var timer = setInterval(function() { - // if (newwin.closed) { - // clearInterval(timer); - // } - // }, 10); - // }; +const loginDiscord = () => { + const _address = localWalletStore.address; + const codeChallenge = Date.now(); + const state = btoa(`${_address}|${codeChallenge}`); + // const url = 'https://discord.com/api/oauth2/authorize?client_id=1116692240224501850&redirect_uri=http%3A%2F%2Flocalhost%3A3010%2Fdiscord%2Fredirect_uri&response_type=code&scope=guilds%20identify%20guilds.members.read' + const url = `https://discord.com/api/oauth2/authorize?client_id=1117759635269636096&redirect_uri=https%3A%2F%2Foauth-svr.cebggame.com%2Fdiscord%2Fredirect_uri&response_type=code&scope=guilds%20identify%20guilds.members.read&state=${state}`; + // location.href = url + // // Redirect the user to the Discord OAuth2 authorization page + let params = `scrollbars=yes,resizable=yes,status=no,location=no,toolbar=no,menubar=no,width=600,height=800,left=100,top=100`; + let newwin = window.open(url, "discord login", params); + console.log(newwin) + var timer = setInterval(function() { + if (newwin.closed) { + clearInterval(timer); + } + }, 10); + }; // 发送推文 const toTwitter = () => { @@ -714,6 +723,10 @@ onMounted(() => { background: linear-gradient(180deg, #8929ff, #e362ff); border-radius: 0 20px 20px 0; } + .total-right { + background: linear-gradient(180deg, #8929ff, #e362ff); + border-radius: 20px; + } } .total { position: absolute;