diff --git a/src/components/chain/BlockChain.js b/src/components/chain/BlockChain.js index ba500d2..f8b46b4 100644 --- a/src/components/chain/BlockChain.js +++ b/src/components/chain/BlockChain.js @@ -342,7 +342,7 @@ export class BlockChain { } async claimAddress({title, subTitle, targetChainId}) { - console.log(targetChainId) + // console.log(targetChainId) // return const initData = {} initData[this.store.walletType] = this.store.address diff --git a/src/views/ClaimView copy.vue b/src/views/ClaimView copy.vue new file mode 100644 index 0000000..9ec74f0 --- /dev/null +++ b/src/views/ClaimView copy.vue @@ -0,0 +1,1679 @@ + + + + + \ No newline at end of file diff --git a/src/views/ClaimView.vue b/src/views/ClaimView.vue index 106453e..ddb76f9 100644 --- a/src/views/ClaimView.vue +++ b/src/views/ClaimView.vue @@ -83,7 +83,7 @@ -
+
You have no CEC available to claim.
@@ -128,7 +128,7 @@
-
+
@@ -142,7 +142,6 @@
-
  • @@ -178,15 +177,15 @@
    • -
    +
    -
    +
    @@ -199,30 +198,35 @@
    - Grab a share of 1,000,000 $CEC +
    - Aug 30, 06:00 - Sep 5, 06:00 UTC + Sep 9, 00:00 UTC
    - +
    -

    {{Number(cecInfo.available) == 0 ? 0 : priceCalculated(cecInfo.available,18).toString().match(/^\d+(?:\.\d{0,2})?/)[0]}} $CEC deposit to Bitget in progress

    +

    {{Number(cecInfo.available) == 0 ? 0 : priceCalculated(cecInfo.available,18).toString().match(/^\d+(?:\.\d{0,2})?/)[0]}} $CEC claimed to your address in progress

    Well done! You're all set!

    -

    You'll receive your $CEC airdrop in Bitget spot account before the listing time.

    +

    check the progress here Bscscan

    -
    -

    Jump to Bitget Launchpool and grab your share of 11M $CEC now!

    +

    + Jump to + Bing X Earn + and + Bitget Pool X + to earn more $CEC +

    @@ -242,47 +246,55 @@
    No
    - +
    -
    - - +
    +

    {{Number(cecInfo.available) == 0 ? 0 : priceCalculated(cecInfo.available,18).toString().match(/^\d+(?:\.\d{0,2})?/)[0]}} $CEC successfully claimed

    -
    -
    Cancellation successful
    +
    +

    Well done! You're all set!

    +
    +
    +

    check the progress here Bscscan

    +
    + +
    +

    + Jump to + Bing X Earn + and + Bitget Pool X + to earn more $CEC +

    -
    OK
    +
    -

    Confirm withdrawal of {{Number(cecInfo.available) == 0 ? 0 : priceCalculated(cecInfo.available,18).toString().match(/^\d+(?:\.\d{0,2})?/)[0]}} $CEC

    +

    Confirm claim of {{Number(cecInfo.available) == 0 ? 0 : priceCalculated(cecInfo.available,18).toString().match(/^\d+(?:\.\d{0,2})?/)[0]}} $CEC

    -
  • + +
  • +
    Receiving Address :
    + {{ claimMyAddress }}
  • -
    Deposit Address :
    - {{ cecInfo.bindAddress }} -
    • -
  • -
    You may not receive your airdrop in Bitget if your UID, deposit address is not correct or doesn't exist
    -
    • -
  • -
    KYC passed only
    -
    • -
  • -
    It's required to comlete the identity verification to become eligible to deposit to Bitget
    +
    You will use this address to receive $CEC and to pay for gas
    • -
    Confirm
    - Back +
    Claim
    + Disconnect
    -

    Do you have a Bitget exchange account?

    +

    Connect the receiving wallet and use it to pay for gas

    -

    No, click to create

    +
    -
    Yes, i have it
    +
    Connect
    @@ -327,7 +339,6 @@
    -
    Cec claim
    @@ -354,7 +365,6 @@ import { apiCecInfoAll, apiBindAccount, apiCecClaim } from "@/utils/marketplace" import ConfirmDialog from "@/components/Dialogs/confirmDialog.vue"; import {createModal} from "@/utils/model.util"; -const loadingDialogVisible = ref(false) const localWalletStore = walletStore() const marketplaceStore = useMarketplaceStore() const instructionLink = ref('https://medium.com/@CounterFire/pre-deposit-instruction-a30d6ce62f80') @@ -362,7 +372,7 @@ const claimLogDialogVisible = ref(false) const address = ref() const tradeId = ref() const tradeAddress = ref() -const cecUserStatus = ref(-1) // -2 没有cec -1 登陆后 0 是否绑定交易所 1 绑定账号 2 账号回显 3 绑定成功提示 4 是否取消绑定 5 取消绑定成功 +const cecUserStatus = ref(0) // -2 没有cec -1 登陆后 0 获取claim地址 2 账号回显 3 绑定成功提示 4 是否取消绑定 5 取消绑定成功 const cecInfo = ref({ available: 0, bindAddress: '', @@ -380,7 +390,7 @@ const getCecTotal = async () => { let data = await apiCecInfoAll(address.value, token) cecInfo.value = data.data if(data.data.bindUid) { - // cecUserStatus.value = -2 + // cecUserStatus.value = 0 // } else { cecUserStatus.value = -1 } else { @@ -394,14 +404,6 @@ const getCecTotal = async () => { } } -const isBindAccount = () => { - if(cecInfo.value.bindUid) { - cecUserStatus.value = 3 - } else { - cecUserStatus.value = 0 - } -} - const connectLogin = async () => { await new BlockChain().cecLogin() @@ -478,15 +480,26 @@ const reqGetInfo = async () => { getCecTotal() } +const claimMyAddress = ref() +// 获取钱包地址 +const connectWallet = async () => { + const chainId = parseInt(import.meta.env.VUE_APP_NET_ID_CLAIM); + const subTitle = 'Select the payment address.' + const { provider, address } = await new BlockChain().claimAddress({subTitle: subTitle,targetChainId: chainId}) + console.log(address) + if(address) { + claimMyAddress.value = address + cecUserStatus.value = 2 + } +} + // 领取 const cecClaim = async () => { let walletToken = await new BlockChain().token() let token = marketplaceStore.fireToken || walletToken try { - loadingDialogVisible.value = true let res = await new BlockChain().claim.cecClaim(token) if(res) { - loadingDialogVisible.value = false getCecTotal() const confirmResult = await createModal(ConfirmDialog, { title: '', @@ -504,7 +517,6 @@ const cecClaim = async () => { } else { message.error("Claim fail."); } - loadingDialogVisible.value = false } // let walletToken = await new BlockChain().token() @@ -1307,9 +1319,11 @@ onMounted(() => { } span { display: inline-block; - width: 118px; + // width: 118px; height: 42px; line-height: 42px; + padding: 0px 10px; + box-sizing: border-box; text-align: center; background: rgba(30,27,38,0); border-radius: 21px;