diff --git a/src/components/Nav.vue b/src/components/Nav.vue index 06369ee..8bb6342 100644 --- a/src/components/Nav.vue +++ b/src/components/Nav.vue @@ -24,10 +24,10 @@ const navList = ref([ title: '查看区块', route: 'Block' }, - { - title: '查看数据', - route: 'Trade' - }, + // { + // title: '查看数据', + // route: 'Trade' + // }, { title: 'Token', route: 'Token' @@ -43,10 +43,6 @@ const navList = ref([ { title: '广播数据', route: 'Broadcast' - }, - { - title: '我的钱包', - route: 'Wallet' } ]) const linkTo = (name: string) => { diff --git a/src/hooks/useGetMaxHeight.ts b/src/hooks/useGetMaxHeight.ts index f3a0540..a3cae55 100644 --- a/src/hooks/useGetMaxHeight.ts +++ b/src/hooks/useGetMaxHeight.ts @@ -1,18 +1,23 @@ import { block } from '@/api' import vuex from '@/store' +import { TotalFee } from '@/types/block' import { hexCharCodeToStr } from '@/utils/filters' import { ElMessage } from 'element-plus' -import { computed, onMounted, ref } from 'vue' +import { computed, ComputedRef, onActivated, ref } from 'vue' import { onBeforeRouteLeave } from 'vue-router' -export default () => { - const maxHeight = computed(() => vuex.getters.maxHeight) - const lastHash = computed(() => vuex.getters.lastHash) +export default function (): { + maxHeight: ComputedRef; + queryTotalFee: () => Promise; + lastHash: ComputedRef; +} { + const maxHeight: ComputedRef = computed(() => vuex.getters.maxHeight) + const lastHash: ComputedRef = computed(() => vuex.getters.lastHash) // eslint-disable-next-line no-undef const interval = ref() - onMounted(() => { + onActivated(() => { getLastHeader() console.log('开始轮询头信息') interval.value = setInterval(() => { @@ -23,8 +28,9 @@ export default () => { /** * 获取最新的区块 */ - const getLastHeader = () => { + const getLastHeader = (): void => { block.getLastHeader().then(res => { + console.log('获取最新区块', res.result.height) if (res.error) { clearInterval(Number(interval.value)) return ElMessage.error({ @@ -32,8 +38,6 @@ export default () => { offset: 300 }) } else if (maxHeight.value !== res.result.height) { - console.log('获取最新区块', res.result.height) - vuex.dispatch('setMaxHeight', res.result.height).then() vuex.dispatch('setLastHash', res.result.hash).then() } @@ -43,7 +47,7 @@ export default () => { /** * 查询从交易量和交易费 */ - const queryTotalFee = () => { + const queryTotalFee = (): Promise => { return block.queryTotalFee(hexCharCodeToStr(lastHash.value)) } diff --git a/src/router/routers/block.ts b/src/router/routers/block.ts index 51554d7..0e862cf 100644 --- a/src/router/routers/block.ts +++ b/src/router/routers/block.ts @@ -99,17 +99,6 @@ export default [ showTabBar: true }, component: () => import(/* webpackChunkName: "other" */ '@/views/Token/index.vue') - }, - { - path: '/wallet', - name: 'Wallet', - meta: { - title: '我的钱包', - keepAlive: false, - requiresAuth: true, - showTabBar: true - }, - component: () => import(/* webpackChunkName: "wallet" */ '@/views/Wallet/index.vue') - }, + } ] as MyRouteRecordRaw[] diff --git a/src/types/block.d.ts b/src/types/block.d.ts index ab6a5a8..2f4356a 100644 --- a/src/types/block.d.ts +++ b/src/types/block.d.ts @@ -105,4 +105,13 @@ export declare type TradeItem = { tx: { to: string } -} \ No newline at end of file +} + +export declare type TotalFee = { + error: string | null + id: number + result: { + fee: number + txCount: number + } +} diff --git a/src/views/Auth/login.vue b/src/views/Auth/login.vue index 152c3fa..313012c 100644 --- a/src/views/Auth/login.vue +++ b/src/views/Auth/login.vue @@ -1,7 +1,6 @@ @@ -14,7 +13,7 @@ const route = useRoute() const store = useStore() const onLogin = () => { - store.dispatch('auth/Login', { username: '15555555555', password: '123123' }).then(() => { + store.dispatch('auth/Login', { username: '', password: '' }).then(() => { route.query.to ? router.replace({ path: route.query.to as string }) : router.replace({ name: 'Home' }) }).catch(err => { alert(err.message) diff --git a/src/views/Auth/register.vue b/src/views/Auth/register.vue index 7b97081..7103913 100644 --- a/src/views/Auth/register.vue +++ b/src/views/Auth/register.vue @@ -1,7 +1,5 @@