Skip to content

Y
ycc-website
Commit 86549f5b authored by chenqikuai's avatar chenqikuai
Browse files
Options

Squashed commit of the following:

commit ce005aed0ed606eb19b10dc17ffeac4e1b267683 Author: cqk <chenqk@33.cn> Date: Thu Mar 3 15:07:23 2022 +0800 v.0.0.5 commit 20e8bf8c6504217de507a3f65319d7d340621c8b Author: cqk <chenqk@33.cn> Date: Thu Mar 3 15:05:33 2022 +0800 fix: 修复表格样式、以及confirm宽度
parent 748f7ae1
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 163 deletions
src/App.vue
View file @ 86549f5b
......@@ -11,6 +11,33 @@ export default Vue.extend({
})
</script>
<style>
.el-table--striped .el-table__body td.el-table__cell {
background: #fafbfc;
}
.el-table--striped .el-table__body tr.el-table__row--striped:hover > td {
background: rgba(37, 69, 203, 0.04) !important;
}
.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
background: white;
}
.c-consensusNodeTable {
border-bottom: 10px solid #fafbfc !important;
}
.c-consensusNodeTable .el-table::before {
height: 0px;
}
.c-consensusNodeTable td.el-table__cell {
border-bottom: 10px solid #fafbfc !important;
border-top: 10px solid #fafbfc !important;
}
.el-table .el-table__header thead tr {
height: 70px;
}
.el-table .el-table__body-wrapper .el-table__row {
height: 60px;
}
.el-table td.el-table__cell,
.el-table th.el-table__cell.is-leaf {
border-bottom: 0 !important;
......
src/components/mobile/m-pageContainer.vue
View file @ 86549f5b
......@@ -118,11 +118,9 @@ $white: #6368de;
border: 1px solid #dee1e6;
border-right: none;
}
.el-pager li {
}
}
.confirm {
width: 58px;
min-width: 58px;
height: 30px;
line-height: 30px;
background: #2545cb;
......
src/components/pc/BlockChainBrowser/TradeTable/index.vue
View file @ 86549f5b
......@@ -196,7 +196,7 @@ export default Vue.extend({
.tx-middle,
.tx-end {
position: relative;
background-color: rgba(79, 221, 252, 0.04);
background-color: rgba(79, 221, 252, 0.04) !important;
.start-line {
position: absolute;
left: 50%;
......
src/components/pc/BlockChainBrowser/TradeTable2.vue
View file @ 86549f5b
......@@ -90,10 +90,7 @@
</router-link>
</template>
</el-table-column>
<el-table-column
:label="$t('lang.block.txCount')"
align="center"
>
<el-table-column :label="$t('lang.block.txCount')" align="center">
<template slot-scope="item">
<div class="text-darkBlue">
{{ item.row | TradeValue }}
......@@ -202,7 +199,7 @@ export default Vue.extend({
.tx-middle,
.tx-end {
position: relative;
background-color: rgba(79, 221, 252, 0.04);
background-color: rgba(79, 221, 252, 0.04) !important;
.start-line {
position: absolute;
left: 50%;
......
src/main.ts
View file @ 86549f5b
......@@ -24,7 +24,7 @@ Object.entries(filters).forEach(([filterName, filterFunc]) => {
// 'en': require('@/assets/lang/en.ts')
// }
// });
console.log('v.0.0.4');
console.log('v.0.0.5');
Vue.use(Select);
Vue.use(Table);
......
src/views/pc/address/components/votePackTable.vue
View file @ 86549f5b
<template>
<div class="c-votePackTable">
<el-table :data="list" v-loading="loading">
<el-table :data="list" v-loading="loading" stripe>
<TableColumn label width="40"></TableColumn>
<TableColumn :label="$t('lang.txDetail.height')">
<template slot-scope="{ row }">
......@@ -66,7 +66,7 @@
},
}"
>
{{ row.receiver | filterHash}}
{{ row.receiver | filterHash }}
</router-link>
</div>
</template>
......
src/views/pc/blockDetail/components/consensusNodeTable.vue
View file @ 86549f5b
......@@ -11,7 +11,6 @@
>
<template slot="empty">
<div>
<!-- <div class="loading-line"></div> -->
<span v-if="!loading && list.length === 0">
{{ $t('lang.page.nodata') }}
</span>
......@@ -23,7 +22,7 @@
<div
class="text-footer-color"
:class="{
' text-orange2': item.row.type === '',
' text-orange2': item.row.type === 'pack',
}"
>
<router-link
......@@ -44,7 +43,7 @@
<div
class="text-footer-color"
:class="{
' text-orange2': item.row.type === '',
' text-orange2': item.row.type === 'pack',
}"
>
<router-link
......
src/views/pc/trade.vue
View file @ 86549f5b
......@@ -41,149 +41,6 @@
:sizeChange="sizeChange"
:pages="pages"
></TradeTable2>
<!-- 表格部分 -->
<!-- <el-table
:data="txList"
stripe
style="width: 100%;"
class="data-table"
:cell-class-name="groupCellName"
v-loading="loading"
element-loading-text="Loading..."
element-loading-spinner="el-icon-loading"
>
<template slot="empty">
<div>
<span v-if="!loading && txList.length === 0">
{{ $t('lang.page.nodata') }}
</span>
</div>
</template>
<el-table-column label width="40">
<template slot-scope="item">
<div>
<div
:class="{
'start-line': item.row.tradeG === 2,
'middle-line': item.row.tradeG === 1,
'end-line': item.row.tradeG === 3,
}"
></div>
<img
class="w-5 h-5 max-w-none z-20 relative"
style="left: -10px;"
v-if="
item.row.tradeG === 1 ||
item.row.tradeG === 2 ||
item.row.tradeG === 3
"
src="../../assets/images/blockChainBrowser/tradeDetail/txGroupIcon.png"
/>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('lang.trade.hash')">
<template slot-scope="item">
<div>
<router-link
:to="`/tradeHash?hash=${item.row.hash}`"
class="light flex-left text-footer-color"
>
{{ item.row.hash | filterHash(10) }}
</router-link>
</div>
</template>
</el-table-column>
<el-table-column prop="hash" :label="$t('lang.trade.sender')">
<template slot-scope="item">
<router-link
:to="`/address?address=${item.row.from}`"
class="text-footer-color"
>
{{ item.row.from | filterHash(10) }}
</router-link>
</template>
</el-table-column>
<el-table-column width="60">
<template slot-scope="item">
<img
:src="
item.row.tradeG === 1 ||
item.row.tradeG === 2 ||
item.row.tradeG === 3
? arrowRightBlue
: arrowRightDark
"
style="width: 20px; height: 20px;"
alt=""
/>
</template>
</el-table-column>
<el-table-column prop="hash" :label="$t('lang.trade.receiver')">
<template slot-scope="item">
<router-link
:to="`/address?address=${item.row.to}`"
class="text-footer-color"
>
{{ item.row.to | filterHash(10) }}
</router-link>
</template>
</el-table-column>
<el-table-column prop="fee" :label="$t('lang.block.txCount')">
<template slot-scope="item">
<div class="text-darkBlue">
{{ item.row | TradeValue }}
</div>
</template>
</el-table-column>
<el-table-column :label="$t('lang.trade.fee')" width="120">
<template slot-scope="item">
<div class="text-darkBlue">
{{ item.row.fee | filterFee }}
</div>
</template>
</el-table-column>
<el-table-column :label="$t('lang.trade.receiveStatus')">
<template slot-scope="item">
<div>
<tx-status :status="item.row.success"></tx-status>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('lang.trade.time')" width="160">
<template slot-scope="item">
<div class="text-darkBlue">
{{ item.row.block_time | formatTime }}
</div>
</template>
</el-table-column>
<el-table-column
:label="$t('lang.trade.type')"
width="90"
align="right"
>
<template slot-scope="item">
<div class="text-darkBlue">
{{
item.row.action_name === 'unknown'
? 'none'
: item.row.action_name
}}
</div>
</template>
</el-table-column>
<el-table-column width="40"></el-table-column>
</el-table> -->
<!-- 底部分页 -->
<!-- <div class="bottom-page flex justify-end">
<page-container
@pageChange="pageChange"
@sizeChange="sizeChange"
:currentPage="pages.currentPage"
:pageSize="pages.pageSize"
:total="pages.total"
></page-container>
</div> -->
</div>
</div>
</template>
......@@ -295,11 +152,6 @@ export default VueTypedMixins(tradeMixin).extend({
color: #1f3470;
}
.light {
/* font-size: 14px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #7c88ad; */
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
......
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