diff --git a/src/components/staking/conversion.vue b/src/components/staking/conversion.vue
index 0bc91cd..4b6c463 100644
--- a/src/components/staking/conversion.vue
+++ b/src/components/staking/conversion.vue
@@ -29,7 +29,7 @@
Convert remaining time
- $0.57
+ {{ timeStaking(Number(stakingStore.cecInfoData.lastDepositTime)) }}
@@ -45,16 +45,16 @@
{{ priceCalculated(stakingStore.cecInfoData.CecClaimable) }}
- Staking
- Staking
+ Convert
+ Convert
- Disarm
- Disarm
+ Cancel
+ Cancel
- Collection
- Collection
+ Claim
+ Claim
@@ -72,7 +72,7 @@ import LoadingDialog from "@/components/Dialogs/loadingDialog.vue"
import ConfirmDialog from "@/components/Dialogs/confirmDialog.vue";
import {createModal} from "@/utils/model.util";
import { STAKING_ADDRESSES } from "@/configs/configchain"
-import { priceCalculated } from "@/configs/priceCalculate"
+import { priceCalculated, timeStaking } from "@/configs/priceCalculate"
import {walletStore} from "@/store/wallet";
import { useStakingStore } from "@/store/staking"
import { BlockChain } from "@/components/chain/BlockChain"
diff --git a/src/components/staking/header.vue b/src/components/staking/header.vue
index 293a1bf..0d59413 100644
--- a/src/components/staking/header.vue
+++ b/src/components/staking/header.vue
@@ -168,6 +168,7 @@ const cecInfoData = ref({
* 查询当前用户存储的EsCEC数量(转化+未转化) queryVestedTotal
* 查询当前用户可以领取的CEC数量 queryClaimable
* 查询用户已经领取的CEC总量 queryClaimabledAll
+ * 查询最后转化存入的时间 queryLastDepositTime
*
*/
const getCecData = async () => {
@@ -197,6 +198,7 @@ const getCecData = async () => {
cecInfoData.value.esCecClaim = BigInt(await bc.staking.queryCumulativeByEsCEC());
cecInfoData.value.CecClaimable = BigInt(await bc.vester.queryClaimable())
cecInfoData.value.cecClaimAll = BigInt(await bc.vester.queryClaimabledAll())
+ cecInfoData.value.lastDepositTime = BigInt(await bc.vester.queryLastDepositTime())
cecInfoData.value.totalCollection = cecInfoData.value.CecCollection + cecInfoData.value.esCecCollection;
stakingStore.cecInfoData = cecInfoData.value;
// getCode()
diff --git a/src/components/staking/index.vue b/src/components/staking/index.vue
index 18a0d79..066560c 100644
--- a/src/components/staking/index.vue
+++ b/src/components/staking/index.vue
@@ -196,11 +196,11 @@ const eventBtnName = (val) => {
// cec stake
const cecStakingText = async () => {
// console.log(localWalletStore.refreshToken)
- if(!stakingStore.bindPassportAddress) {
- await new BlockChain().appendPassport()
- let res = await apiBindPassport({passport_jwt: 'Bearer '+localWalletStore.refreshToken})
- console.log(res)
- } else {
+ // if(!stakingStore.bindPassportAddress) {
+ // await new BlockChain().appendPassport()
+ // let res = await apiBindPassport({passport_jwt: 'Bearer '+localWalletStore.refreshToken})
+ // console.log(res)
+ // } else {
// console.log(localWalletStore.refreshToken)
// return
cecDialogVisible.value = true
@@ -210,7 +210,7 @@ const cecStakingText = async () => {
typeName: "CEC",
amount: stakingStore.cecInfoData.cecBalance
}
- }
+ // }
}
const closeCecStakedText = () => {