Commit b7621d9b authored by chenqikuai's avatar chenqikuai

fix

parent 2fd209c3
rm -rf ycc-website
mv dist ycc-website
tar -czf ycc-website.tar ycc-website
scp ycc-website.tar root@121.40.18.70:/usr/share/nginx/html/ycc-website.tar
......
......@@ -11,6 +11,13 @@ export default Vue.extend({
})
</script>
<style>
.el-table td.el-table__cell,
.el-table th.el-table__cell.is-leaf {
border-bottom: 0 !important;
}
table .has-gutter {
color: #7c88ad;
}
.ant-message {
z-index: 4000 !important;
}
......@@ -41,15 +48,14 @@ export default Vue.extend({
}
.slide-in-enter-active {
transition: all .3s ease;
transition: all 0.3s ease;
}
.slide-in-leave-active {
transition: all .8s cubic-bezier(1.0, 0.5, 0.8, 1.0);
transition: all 0.8s cubic-bezier(1, 0.5, 0.8, 1);
}
.slide-in-enter, .slide-fade-leave-to
/* .slide-in-leave-active for below version 2.1.8 */ {
transform: translateX(10px);
opacity: 0;
}
</style>
......@@ -22,9 +22,9 @@ export const lang = {
chainPerf: {
speed: "Block Speed",
tps: "TPS",
txNumber: "Total Num Of Txns",
addressNumber: "Total Num Of Addr",
txNumberOnTheChain: "On-chain Txns Num",
txNumber: "Total Number Of Txns",
addressNumber: "Total Number Of Addr",
txNumberOnTheChain: "On-chain Txns Number",
},
viewMore: "See More",
search: "Search",
......
......@@ -184,7 +184,7 @@ export default Vue.extend({
height: 52px;
}
.lableLeft {
width: 73px;
width: 100px;
}
}
.c-block-desc-bottom {
......
......@@ -4,7 +4,7 @@
v-for="(item, i) in list"
:key="i"
class="h-1/4 pt-2.5"
style="margin-left: 30px;"
style="margin-left: 10px;"
>
<div class="text-text-color text-xs" style="margin-bottom: 2px;">
{{ item.name }}
......
......@@ -23,7 +23,7 @@
</div>
</div>
<div class="bottom text-center">
<div class="text-text-color mt-1">
<div class="text-text-color text-xs" style="margin-top: 6px;">
{{ $t('lang.price.marketValueInDollars') }}
</div>
<div class="text-footer-color font-bold">
......
......@@ -7,7 +7,7 @@
type === 'package' ? 'rgba(248, 164, 87, 0.05)' : 'white',
}"
>
<div class="flex items-center justify-between">
<div class="flex items-center justify-between" style="margin-top: 4px;">
<div class="text-darkBlue text-sm font-bold">
{{
type === 'package'
......@@ -17,8 +17,8 @@
</div>
<Count :time="time" class="text-text-color text-xs"></Count>
</div>
<div class="flex justify-between items-center">
<div class=" mt-2">
<div class="flex justify-between items-center" style="margin-top: 5px;">
<div>
<span class="text-text-color text-xs">
{{ $t('lang.block.consensusAddress') }}:
</span>
......@@ -40,7 +40,7 @@
</router-link>
</span>
</div>
<div class="mt-2">
<div>
<span class="text-text-color text-xs">
{{ $t('lang.block.blockReward') }}:
</span>
......
......@@ -10,9 +10,9 @@
v-if="txGroup && txGroup === 'isGroupItem'"
class="w-5 h-5 txGroupIcon"
/>
<div class="flex justify-between items-center mt-3.5">
<div class="flex justify-between items-center" style="margin-top: 14px;">
<div class="flex items-center">
<div class="text-text-color text-xs">
<div class="text-text-color text-xs" style="margin-right: 3px;">
{{ $t('lang.trade.txAmount') }} :
</div>
<div class="text-darkBlue text-sm font-bold">
......@@ -23,9 +23,12 @@
{{ blockTime | formatTime }}
</div>
</div>
<div class="flex items-center justify-between">
<div
class="flex items-center justify-between"
style="margin-top: 3px; margin-bottom: 3px;"
>
<div class="flex items-center">
<div class="text-text-color text-xs">
<div class="text-text-color text-xs" style="margin-right: 3px;">
{{ $t('lang.txDetail.txHash') }} :
</div>
<div
......
......@@ -8,7 +8,9 @@
]"
>
<div>
<span class="text-base font-bold">{{ rewardAmount | filterAmount }}</span>
<span class="text-base font-bold">
{{ rewardAmount | filterAmount }}
</span>
<span class="text-xs">
YCC
</span>
......@@ -18,7 +20,10 @@
</div>
</div>
<div class="flex-grow" style="margin-left: 10px;">
<div class="flex justify-between" style="margin-bottom: 5px;">
<div
class="flex justify-between items-center"
style="margin-bottom: 2px;"
>
<div class="text-darkBlue text-sm font-bold">
<router-link
:to="{
......@@ -31,11 +36,11 @@
{{ height }}
</router-link>
</div>
<div class="text-text-color">
<div class="text-text-color text-xs">
{{ timeBlock | formatTime }}
</div>
</div>
<div style="margin-bottom: 5px;">
<div style="margin-bottom: 2px;">
<span class="text-text-color text-xs">
{{ $t('lang.txDetail.txHash') }}:
</span>
......@@ -92,8 +97,8 @@ export default Vue.extend({
border-radius: 2px;
border-bottom: 1px solid #f5f5ff;
.box {
width: 90px;
height: 54px;
width: 100px;
height: 66px;
border-radius: 2px;
}
}
......
......@@ -9,7 +9,9 @@
v-for="(filter, i) in filters"
:key="i"
@click="currentFilter = filter"
style="margin-left: 15px;"
:style="{
'margin-left': i !== 0 && '15px',
}"
class="text-text-color"
:class="{
'text-darkBlue': currentFilter === filter,
......
......@@ -8,7 +8,7 @@
:visible="isShow"
>
<div class="logo mb-3.5 px-6">
<img src="@/assets/images/header/logo.png" width="164" alt="yuanlian" />
<img src="@/assets/images/ycclogo.png" width="140" alt="yuanlian" />
</div>
<ul class="menulist">
<li
......@@ -106,5 +106,6 @@ export default Vue.extend({
.menu-active {
background: #eff5ff;
color: #2545cb;
}
</style>
......@@ -119,7 +119,7 @@ export default Vue.extend({
width: 220px;
}
.theTitle {
width: 72px;
width: 100px;
margin-bottom: 10px;
margin-top: 10px;
}
......
......@@ -43,7 +43,7 @@ export default Vue.extend({
font-size: 18px;
font-family: PingFang-SC-Bold, PingFang-SC;
font-weight: bold;
color: #1f3470;
color: #7C88AD;
margin: 0 30px;
margin-top: 28px;
}
......
......@@ -51,7 +51,7 @@
</div>
</template>
</el-table-column>
<el-table-column prop="hash" :label="$t('lang.trade.sender')" width="70">
<el-table-column prop="hash" :label="$t('lang.trade.sender')" width="160">
<template slot-scope="item">
<router-link
:to="`/address?address=${item.row.fromAddr}`"
......@@ -76,7 +76,11 @@
/>
</template>
</el-table-column>
<el-table-column prop="hash" :label="$t('lang.trade.receiver')">
<el-table-column
prop="hash"
:label="$t('lang.trade.receiver')"
width="160"
>
<template slot-scope="item">
<router-link
:to="`/address?address=${item.row.tx.to}`"
......@@ -86,7 +90,11 @@
</router-link>
</template>
</el-table-column>
<el-table-column prop="fee" :label="$t('lang.block.txCount')">
<el-table-column
prop="fee"
:label="$t('lang.block.txCount')"
align="center"
>
<template slot-scope="item">
<div class="text-darkBlue">
{{ item.row | TradeValue }}
......@@ -100,7 +108,7 @@
</div>
</template>
</el-table-column>
<el-table-column :label="$t('lang.trade.receiveStatus')" width="100">
<el-table-column :label="$t('lang.trade.receiveStatus')" width="120">
<template slot-scope="item">
<div>
<tx-status
......
......@@ -51,7 +51,7 @@
</div>
</template>
</el-table-column>
<el-table-column prop="hash" :label="$t('lang.trade.sender')">
<el-table-column prop="hash" :label="$t('lang.trade.sender')" width="160">
<template slot-scope="item">
<router-link
:to="`/address?address=${item.row.from}`"
......@@ -76,7 +76,7 @@
/>
</template>
</el-table-column>
<el-table-column prop="hash" :label="$t('lang.trade.receiver')">
<el-table-column prop="hash" :label="$t('lang.trade.receiver')" width="160">
<template slot-scope="item">
<router-link
:to="`/address?address=${item.row.to}`"
......@@ -86,7 +86,11 @@
</router-link>
</template>
</el-table-column>
<el-table-column prop="fee" :label="$t('lang.block.txCount')">
<el-table-column
prop="fee"
:label="$t('lang.block.txCount')"
align="center"
>
<template slot-scope="item">
<div class="text-darkBlue">
{{ item.row | TradeValue }}
......@@ -100,7 +104,7 @@
</div>
</template>
</el-table-column>
<el-table-column :label="$t('lang.trade.receiveStatus')" width="100">
<el-table-column :label="$t('lang.trade.receiveStatus')" width="120">
<template slot-scope="item">
<div>
<tx-status :status="item.row.success"></tx-status>
......@@ -187,6 +191,10 @@ export default Vue.extend({
<style lang="scss">
.trade-table {
.has-gutter {
color: #7c88ad;
}
.tx-start,
.tx-middle,
.tx-end {
......
......@@ -60,12 +60,14 @@ export default Vue.extend({
<style scoped lang="scss">
.c-txStatus {
.status {
min-width: 70px;
width: fit-content;
padding: 0 10px;
height: 30px;
border-radius: 15px;
}
.status-small {
width: 50px;
width: fit-content;
padding: 0 10px;
height: 20px;
}
.success {
......
......@@ -12,7 +12,7 @@
class="min-w-1200 h-16 text-footer-color md:w-bodySet flex justify-between items-center ease-in duration-500"
>
<div class="flex items-center">
<img src="@/assets/images/header/logo.png" alt="logo" width="164" />
<img src="@/assets/images/ycclogo.png" alt="logo" width="164" />
<ul class="header_menu flex leading-normal text-sm ml-16">
<router-link
:to="{ path: '/home', query: { lang: $route.query.lang } }"
......@@ -20,18 +20,21 @@
class="pl-5 pr-5 cursor-pointer relative"
:class="{
' text-white': $route.path === '/blockChainBrowser' && isTop,
' font-bold': $route.path === '/home',
' text-text-color': $route.path !== '/home',
}"
>
{{ $t('lang.home') }}
<span
v-show="$route.path === '/home'"
class="absolute block w-7 h-1 bg-active rounded-2xl left-1/2 -bottom-2 transform -translate-x-1/2"
class="absolute block w-7 h-1 bg-footer-color rounded-2xl left-1/2 -bottom-2 transform -translate-x-1/2"
></span>
</router-link>
<li
class="pl-5 pr-5 cursor-pointer"
:class="{
' text-white': $route.path === '/blockChainBrowser' && isTop,
' text-text-color': $route.path !== '/bps',
}"
>
<a
......@@ -51,6 +54,8 @@
tag="li"
:class="{
' text-white': $route.path === '/blockChainBrowser' && isTop,
' font-bold': $route.path === '/newsList',
' text-text-color': $route.path !== '/newsList',
}"
class="pl-5 pr-5 cursor-pointer relative"
>
......@@ -59,7 +64,7 @@
v-show="
$route.path === '/newsList' || $route.path === '/newsDetails'
"
class="absolute block w-7 h-1 bg-active rounded-2xl left-1/2 -bottom-2 transform -translate-x-1/2"
class="absolute block w-7 h-1 bg-footer-color rounded-2xl left-1/2 -bottom-2 transform -translate-x-1/2"
></span>
</router-link>
<router-link
......@@ -71,6 +76,8 @@
class="pl-5 pr-5 cursor-pointer relative"
:class="{
' text-white': $route.path === '/blockChainBrowser' && isTop,
' font-bold': $route.path === '/blockChainBrowser',
' text-text-color': $route.path !== '/blockChainBrowser',
}"
>
{{ $t('lang.blockChainBrowser') }}
......@@ -83,7 +90,7 @@
$route.path === '/tradeList' ||
$route.path === '/address'
"
class="absolute block w-7 h-1 bg-active rounded-2xl left-1/2 -bottom-2 transform -translate-x-1/2"
class="absolute block w-7 h-1 bg-footer-color rounded-2xl left-1/2 -bottom-2 transform -translate-x-1/2"
:class="{
' bg-white': $route.path === '/blockChainBrowser' && isTop,
}"
......@@ -149,7 +156,7 @@
}"
>
<div class="logo mx-3.5">
<img src="@/assets/images/header/logo-m.png" alt="logo" width="164" />
<img src="@/assets/images/ycclogo.png" alt="logo" width="140" />
</div>
<div class="flex justify-between items-center">
<div class="relative">
......
......@@ -96,7 +96,6 @@ export default Vue.extend({
const c = this.$refs.c2 as HTMLElement
const d = this.$refs.d2 as HTMLElement
;[a, b, c, d].forEach((el: HTMLElement) => {
console.log(el, father, el.offsetWidth, father.offsetWidth)
if (el.offsetWidth >= father.offsetWidth) {
el.style.fontSize = '10px'
}
......
......@@ -20,7 +20,12 @@
<div class="flex items-center">
<div class="label">{{ $t('lang.block.height') }}</div>
<div class="content">
<router-link
:to="`/blockDetail?height=${data.height}`"
class="text-footer-color"
>
{{ data.height }}
</router-link>
</div>
</div>
<div class="flex items-center">
......
......@@ -72,7 +72,7 @@
</div>
</template>
</el-table-column>
<el-table-column :label="$t('lang.trade.type')" align="right" width="90">
<el-table-column :label="$t('lang.trade.type')" align="right" width="150">
<template slot-scope="{ row }">
<div class="text-darkBlue">
{{
......
......@@ -58,7 +58,10 @@
<span>{{ $t('lang.txDetail.height') }}</span>
</label>
<div class="item-text" v-loading="loading">
<router-link :to="`/blockDetail?height=${data.height}`" class="light">
<router-link
:to="`/blockDetail?height=${data.height}`"
class="light text-footer-color"
>
{{ data.height }}
</router-link>
</div>
......
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