From 27530dbcaa0537ae0739ea117703aa605e38a1b9 Mon Sep 17 00:00:00 2001 From: yuyongdong Date: Thu, 19 Sep 2024 14:20:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbigint=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=A4=B1=E8=B4=A5=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BD=99=E9=A2=9D=E4=B8=8D=E8=B6=B3=E5=BC=B9=E7=AA=97=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/staking/conversion.vue | 14 ++++++------ src/components/staking/header.vue | 6 +++--- src/components/staking/index.vue | 31 +++++++++++++++------------ src/views/StakingView.vue | 2 +- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/components/staking/conversion.vue b/src/components/staking/conversion.vue index 948200d..b8a1bd2 100644 --- a/src/components/staking/conversion.vue +++ b/src/components/staking/conversion.vue @@ -161,9 +161,9 @@ const cecDeposit = async (_amount) => { }).show(); } } catch (e) { - if(e.message.indexOf('User denied transaction signature') == -1) { + if(e.message.indexOf('User denied transaction signature') > -1) { message.error('User denied transaction signature') - } else if(e.message.indexOf('amount exceeds balance') == -1) { + } else if(e.message.indexOf('amount exceeds balance') > -1) { message.error('transfer amount exceeds balance') } else { message.error('Vest fail') @@ -195,9 +195,9 @@ const cecWithdraw = async () => { }).show(); } } catch (e) { - if(e.message.indexOf('User denied transaction signature') == -1) { + if(e.message.indexOf('User denied transaction signature') > -1) { message.error('User denied transaction signature') - } else if(e.message.indexOf('amount exceeds balance') == -1) { + } else if(e.message.indexOf('amount exceeds balance') > -1) { message.error('transfer amount exceeds balance') } else { message.error('Vest cancel fail') @@ -233,10 +233,10 @@ const claimCec = async () => { }).show(); } } catch (e) { - if(e.message.indexOf('User denied transaction signature') == -1) { - message.error('User denied transaction signature') - } else if(e.message.indexOf('amount exceeds balance') == -1) { + if(e.message.indexOf('transfer amount exceeds balance') > -1) { message.error('transfer amount exceeds balance') + } else if(e.message.indexOf('User denied transaction signature') > -1) { + message.error('User denied transaction signature') } else { message.error('Claim fail') } diff --git a/src/components/staking/header.vue b/src/components/staking/header.vue index 7d6c486..b95ad01 100644 --- a/src/components/staking/header.vue +++ b/src/components/staking/header.vue @@ -245,14 +245,14 @@ onMounted(() => { .staking-header { width: 1348px; margin: 0 auto; - margin-top: 80px; + margin-top: 140px; .staking-header-tit { display: flex; justify-content: space-between; align-items: center; padding-left: 54px; line-height: 22px; - margin-bottom: 5px; + margin-bottom: 20px; h1 { font-family: "Poppins"; font-weight: bold; @@ -284,7 +284,7 @@ onMounted(() => { justify-content: space-between; background: #2d2738; padding: 20px 58px 25px 54px; - border-radius: 15px; + border-radius: 30px; .staking-header-con { display: flex; flex-direction: column; diff --git a/src/components/staking/index.vue b/src/components/staking/index.vue index 57126c3..b13397f 100644 --- a/src/components/staking/index.vue +++ b/src/components/staking/index.vue @@ -167,7 +167,10 @@ const localWalletStore = walletStore() const stakingStore = useStakingStore() const bc = new BlockChain(); const chainId = parseInt(import.meta.env.VUE_APP_STAKING_CHAIN); -const unStakingAmount = computed(() => Number(priceCalculated(toRaw(stakingStore.cecInfoData).CecStaked)) - Number(priceCalculated(toRaw(stakingStore.cecInfoData).CecDisarm))); +const unStakingAmount = computed(() => { + let amount = (Number(priceCalculated(toRaw(stakingStore.cecInfoData).CecStaked))*1e5) - (Number(priceCalculated(toRaw(stakingStore.cecInfoData).CecDisarm)*1e5)) + return amount +}); const loadingDialogVisible = ref(false) const dialogUnstakeText = ref({ title: "Stake CEC", @@ -246,7 +249,7 @@ const closeCecStakedText = async () => { title: "Unstake CEC", typeLabel: "Unstake", typeName: "CEC", - amount: BigInt(unStakingAmount.value) * BigInt(1e18), + amount: BigInt(unStakingAmount.value) * BigInt(1e13), btnText: 'Unstake' } @@ -313,9 +316,9 @@ const onCecStaked = async (_amount) => { }).show() } } catch (e) { - if(e.message.indexOf('User denied transaction signature') == -1) { + if(e.message.indexOf('User denied transaction signature') > -1) { message.error('User denied transaction signature') - } else if(e.message.indexOf('amount exceeds balance') == -1) { + } else if(e.message.indexOf('amount exceeds balance') > -1) { message.error('transfer amount exceeds balance') } else { message.error('Staked fail') @@ -342,9 +345,9 @@ const closeStaked = async (type, _amount) => { }).show(); } } catch (e) { - if(e.message.indexOf('User denied transaction signature') == -1) { + if(e.message.indexOf('User denied transaction signature') > -1) { message.error('User denied transaction signature') - } else if(e.message.indexOf('amount exceeds balance') == -1) { + } else if(e.message.indexOf('amount exceeds balance') > -1) { message.error('transfer amount exceeds balance') } else { message.error('Unstake fail') @@ -365,9 +368,9 @@ const closeStaked = async (type, _amount) => { }).show(); } } catch (e) { - if(e.message.indexOf('User denied transaction signature') == -1) { + if(e.message.indexOf('User denied transaction signature') > -1) { message.error('User denied transaction signature') - } else if(e.message.indexOf('amount exceeds balance') == -1) { + } else if(e.message.indexOf('amount exceeds balance') > -1) { message.error('transfer amount exceeds balance') } else { message.error('Unstake fail') @@ -393,9 +396,9 @@ const getCecCollection = async (type) => { }).show(); } } catch (e) { - if(e.message.indexOf('User denied transaction signature') == -1) { + if(e.message.indexOf('User denied transaction signature') > -1) { message.error('User denied transaction signature') - } else if(e.message.indexOf('amount exceeds balance') == -1) { + } else if(e.message.indexOf('amount exceeds balance') > -1) { message.error('transfer amount exceeds balance') } else { message.error('Claim fail') @@ -415,9 +418,9 @@ const getCecCollection = async (type) => { loadingDialogVisible.value = false } } catch (e) { - if(e.message.indexOf('User denied transaction signature') == -1) { + if(e.message.indexOf('User denied transaction signature') > -1) { message.error('User denied transaction signature') - } else if(e.message.indexOf('amount exceeds balance') == -1) { + } else if(e.message.indexOf('amount exceeds balance') > -1) { message.error('transfer amount exceeds balance') } else { message.error('Claim fail') @@ -445,9 +448,9 @@ const esCecStaked = async (_amount) => { }).show() } } catch (e) { - if(e.message.indexOf('User denied transaction signature') == -1) { + if(e.message.indexOf('User denied transaction signature') > -1) { message.error('User denied transaction signature') - } else if(e.message.indexOf('amount exceeds balance') == -1) { + } else if(e.message.indexOf('amount exceeds balance') > -1) { message.error('transfer amount exceeds balance') } else { message.error('Staked fail') diff --git a/src/views/StakingView.vue b/src/views/StakingView.vue index d9e2930..f60a780 100644 --- a/src/views/StakingView.vue +++ b/src/views/StakingView.vue @@ -247,7 +247,7 @@ const toTwitter = () => { const userCecInfo = async () => { - loadingDialogTime() + // loadingDialogTime() getNetId(); // getVipInfo(); getCecData();