Commit 19dce072 authored by chenqikuai's avatar chenqikuai

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

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