Commit 19dce072 authored by chenqikuai's avatar chenqikuai

fix: 修复一些border-radius和shadow和margin和padding

parent f102c826
......@@ -34,5 +34,6 @@ export default Vue.extend({
<style scoped>
.container {
height: 280px;
border-radius: 4px;
}
</style>
......@@ -49,7 +49,7 @@
}"
>
<span class="text-app-color-2">
{{ item.minerHash | filterHash }}
{{ item.minerHash | filterHash(9) }}
</span>
</router-link>
</div>
......
......@@ -131,7 +131,7 @@
</el-table-column>
<el-table-column width="40"></el-table-column>
</el-table>
<div class="flex justify-end pt-7 mb-16">
<div class="flex justify-end pt-7" v-if="!hidePageContainer">
<page-container
@pageChange="pageChange"
@sizeChange="sizeChange"
......@@ -160,6 +160,10 @@ export default Vue.extend({
TxStatus,
},
props: {
hidePageContainer: {
type: Boolean,
default: false,
},
Trades: Array,
Loading: Boolean,
groupCellName: Function,
......
<template>
<div
style="margin-top: 70px;"
style="margin-top: 70px; padding-bottom: 60px;"
class="min-w-1200 md:w-bodySet mx-auto flow-root"
>
<chain-search :value="value" :setValue="setValue"></chain-search>
<chain-search
:value="value"
:setValue="setValue"
style="margin-top: 30px;"
></chain-search>
<address-overview class="mt-7"></address-overview>
<TabList
:setFocusedTab="(v) => (focusedTab = v)"
:tabList="tabList"
:focusedTab="focusedTab"
></TabList>
<DataFilter
v-if="focusedTab === 'txRecord'"
:optionList="optionList"
:setValue="(v) => (selectedOption = v)"
:value="selectedOption"
<div
style="margin-top: 30px; border-radius: 4px;"
class="shadow-shadow1 overflow-hidden"
>
<template #left>
{{ $t('lang.trade.txTotal', [pages.total]) }}
</template>
</DataFilter>
<TradeTable
v-if="focusedTab === 'txRecord'"
:groupCellName="groupCellName"
:Loading="loadingTxRecordTable"
:Trades="txRecordList"
:pages="pages"
:sizeChange="sizeChange"
:pageChange="pageChange"
></TradeTable>
<vote-pack-table
v-if="focusedTab === 'votingRecord'"
:list="voteList"
:loading="loadingVote"
></vote-pack-table>
<vote-pack-table
v-if="focusedTab === 'packingRecord'"
:list="packList"
:loading="loadingPack"
></vote-pack-table>
<TabList
:setFocusedTab="(v) => (focusedTab = v)"
:tabList="tabList"
:focusedTab="focusedTab"
></TabList>
<DataFilter
v-if="focusedTab === 'txRecord'"
:optionList="optionList"
:setValue="(v) => (selectedOption = v)"
:value="selectedOption"
>
<template #left>
{{ $t('lang.trade.txTotal', [pages.total]) }}
</template>
</DataFilter>
<TradeTable
v-if="focusedTab === 'txRecord'"
:hidePageContainer="true"
:groupCellName="groupCellName"
:Loading="loadingTxRecordTable"
:Trades="txRecordList"
></TradeTable>
<vote-pack-table
v-if="focusedTab === 'votingRecord'"
:list="voteList"
:loading="loadingVote"
></vote-pack-table>
<vote-pack-table
v-if="focusedTab === 'packingRecord'"
:list="packList"
:loading="loadingPack"
></vote-pack-table>
</div>
<div class="flex justify-end" v-if="focusedTab === 'txRecord'">
<page-container
style="margin-top: 30px;"
:pages="pages"
:sizeChange="sizeChange"
:pageChange="pageChange"
></page-container>
</div>
</div>
</template>
......@@ -47,6 +63,7 @@ import ChainSearch from '@/components/pc/BlockChainBrowser/ChainSearch.vue'
import AddressOverview from '@/components/pc/BlockChainBrowser/AddressOverview/index.vue'
import VueTypedMixins from 'vue-typed-mixins'
import address from '@/mixin/address'
import PageContainer from '@/components/pc/BlockChainBrowser/PageContainer.vue'
import TabList from '@/components/pc/BlockChainBrowser/TabList/index.vue'
import TradeTable from '@/components/pc/BlockChainBrowser/TradeTable/index.vue'
import DataFilter from '@/components/pc/BlockChainBrowser/DataFilter/index.vue'
......@@ -59,6 +76,7 @@ export default VueTypedMixins(address).extend({
DataFilter,
TradeTable,
VotePackTable,
PageContainer,
},
computed: {},
})
......
<template>
<div class="the-block min-w-1200 md:w-bodySet mx-auto mb-16 flow-root">
<div
class="the-block min-w-1200 md:w-bodySet mx-auto flow-root"
style="padding-bottom: 60px;"
>
<chain-search class="mt-7"></chain-search>
<div class="pc-block inner-box">
<div class="title flex items-center justify-between">
......
<template>
<div class="mx-auto md:w-bodySet blockChain min-w-1200 relative">
<div class="mx-auto md:w-bodySet blockChain min-w-1200 relative flow-root">
<ChainCard :msgList="msgList" class="chainCard"></ChainCard>
<ChainTitle />
<chain-search
......@@ -10,7 +10,7 @@
/>
<div class="rect-block"></div>
<ChainOverview :totalTx="totalTx" />
<div class="flex justify-between mt-14">
<div class="flex justify-between mt-14" style="margin-bottom: 60px;">
<latest-block :latestBlocks="latestBlocks"></latest-block>
<latest-tx :latestTxs="latestTxs"></latest-tx>
</div>
......
......@@ -13,47 +13,54 @@
:loading="loadingOverview"
:loadingRelativeBlockHeight="loadingRelativeNumber"
></block-overview>
<TabList
:tabList="tabList"
:setFocusedTab="(v) => (focusedTab = v)"
:focusedTab="focusedTab"
></TabList>
<DataFilter
v-if="focusedTab === 'txRecordTab'"
:optionList="txRecordFilterOptionList"
:setValue="(v) => (txRecordFilterValue = v)"
:value="txRecordFilterValue"
<div
style="
box-shadow: 0px 2px 15px 0px rgba(31, 52, 112, 0.06);
padding-bottom: 60px;
"
>
<template #left>
{{ $t('lang.trade.txTotal', [pages.total]) }}
</template>
</DataFilter>
<TradeTable
v-if="focusedTab === 'txRecordTab'"
:groupCellName="groupCellName"
:Loading="loadingTable"
:Trades="Trades"
:pages="pages"
:sizeChange="sizeChange"
:pageChange="pageChange"
></TradeTable>
<DataFilter
v-if="focusedTab === 'consensusNodeTab'"
:optionList="consensusNodeFilterOptionList"
:setValue="(v) => (consensusNodeFilterValue = v)"
:value="consensusNodeFilterValue"
>
<template #left>
{{
$t('lang.trade.consensusNodeTotal', [consensusNodeTableList.length])
}}
</template>
</DataFilter>
<consensus-node-table
v-if="focusedTab === 'consensusNodeTab'"
:list="consensusNodeTableList"
:loading="loadingConsensusNodeTable"
></consensus-node-table>
<TabList
:tabList="tabList"
:setFocusedTab="(v) => (focusedTab = v)"
:focusedTab="focusedTab"
></TabList>
<DataFilter
v-if="focusedTab === 'txRecordTab'"
:optionList="txRecordFilterOptionList"
:setValue="(v) => (txRecordFilterValue = v)"
:value="txRecordFilterValue"
>
<template #left>
{{ $t('lang.trade.txTotal', [pages.total]) }}
</template>
</DataFilter>
<TradeTable
v-if="focusedTab === 'txRecordTab'"
:groupCellName="groupCellName"
:Loading="loadingTable"
:Trades="Trades"
:pages="pages"
:sizeChange="sizeChange"
:pageChange="pageChange"
></TradeTable>
<DataFilter
v-if="focusedTab === 'consensusNodeTab'"
:optionList="consensusNodeFilterOptionList"
:setValue="(v) => (consensusNodeFilterValue = v)"
:value="consensusNodeFilterValue"
>
<template #left>
{{
$t('lang.trade.consensusNodeTotal', [consensusNodeTableList.length])
}}
</template>
</DataFilter>
<consensus-node-table
v-if="focusedTab === 'consensusNodeTab'"
:list="consensusNodeTableList"
:loading="loadingConsensusNodeTable"
></consensus-node-table>
</div>
</div>
</template>
......
<template>
<div
style="margin-top: 70px;"
style="margin-top: 70px; padding-bottom: 60px;"
class="min-w-1200 md:w-bodySet mx-auto flow-root"
>
<chain-search
style="margin-top: 30px;"
style="margin-top: 30px; margin-bottom: 30px;"
:clickSearch="clickSearch"
:value="searchValue"
:setValue="setSearchValue"
></chain-search>
<div class="data-table table-shadow">
<div class="data-table shadow-shadow1">
<div class="head">
<span>{{ $t('lang.txDetail.detail') }}</span>
</div>
......@@ -149,17 +149,18 @@
</div>
<div class="area line" v-if="data.execer !== 'user.write'">
<label>
<span>{{ $t('lang.txDetail.inData') }}</span>
<span class="text-text-color">{{ $t('lang.txDetail.inData') }}</span>
</label>
<div class="item-text" v-loading="loading">
<pre class="preTxt" contenteditable="true">
<code>{{data.inData | decodeTransferNote}}</code>
</pre>
<pre
class="preTxt"
contenteditable="true"
><code>{{data.inData | decodeTransferNote}}</code></pre>
</div>
</div>
<div class="area line" v-if="data.execer !== 'user.write'">
<label>
<span>{{ $t('lang.txDetail.outData') }}</span>
<span class="text-text-color">{{ $t('lang.txDetail.outData') }}</span>
</label>
<div class="item-text" v-loading="loading">
<pre class="preTxt" contenteditable="true">
......@@ -193,7 +194,7 @@ export default vueTypedMixins(tradeDetail).extend({
color: #1f3470;
font-size: 14px;
background: white;
border-radius: 2px;
border-radius: 4px;
border: 1px solid rgba(235, 239, 241, 1);
.head {
height: 70px;
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment