fix

src/components/charts.vue

@@ -30,6 +30,7 @@ import { LabelLayout, UniversalTransition } from 'echarts/features'
 import { CanvasRenderer } from 'echarts/renderers'
 import { numOfOnChainTx, statSearch } from '@/service/api'
 import moment from 'moment'
+import { nFormatter } from '@/utils/common'
 // 通过 ComposeOption 来组合出一个只有必须组件和图表的 Option 类型
 type ECOption = echarts.ComposeOption<
   | BarSeriesOption
@@ -166,6 +167,11 @@ export default Vue.extend({
               },
               yAxis: {
                 type: 'value',
+                axisLabel: {
+                  formatter: (item: number) => {
+                    return nFormatter(item)
+                  },
+                },
               },
               series: [
                 {

src/components/chartsInAddr.vue

@@ -41,6 +41,7 @@ echarts.use([
 
 import chartsMixin from '@/mixin/componentsMixin/charts'
 import VueTypedMixins from 'vue-typed-mixins'
+import { nFormatter } from '@/utils/common'
 
 export default VueTypedMixins(chartsMixin).extend({
   props: {
@@ -94,6 +95,11 @@ export default VueTypedMixins(chartsMixin).extend({
               },
               yAxis: {
                 type: 'value',
+                axisLabel: {
+                  formatter: (item: number) => {
+                    return nFormatter(item)
+                  },
+                },
               },
               series: [
                 {

src/components/mobile/m-consensus-node.vue

@@ -18,7 +18,7 @@
         <Count :time="time" class="text-text-color text-xs"></Count>
       </div>
       <div class="flex justify-between items-center">
-        <div>
+        <div class=" mt-2">
           <span class="text-text-color text-xs">
             {{ $t('lang.block.consensusAddress') }}:
           </span>
@@ -36,7 +36,7 @@
                 },
               }"
             >
-              {{ address | filterHash }}
+              {{ address | filterHash(6) }}
             </router-link>
           </span>
         </div>

src/components/mobile/m-vote-pack.vue

@@ -8,7 +8,7 @@
       ]"
     >
       <div>
-        <span class="text-base font-bold">{{ rewardAmount }}</span>
+        <span class="text-base font-bold">{{ rewardAmount | filterAmount }}</span>
         <span class="text-xs">
           YCC
         </span>

src/components/mobile/map/m-numOfOnChainTx.vue

@@ -2,7 +2,7 @@
   <div class="num flow-root">
     <div class="mt-2.5 flex items-center justify-between">
       <div class="text-darkBlue font-bold">
-        链上交易数量
+        {{ $t('lang.chainPerf.txNumberOnTheChain') }}
       </div>
       <div>
         <span

src/components/pc/BlockChainBrowser/LatestTx/index.vue

@@ -9,51 +9,43 @@
         <div class="left">
           <div>
             <span class="graytxt">{{ $t('lang.trade.hash') }}：</span>
-            <span class="text-footer-color">
-              <router-link
+            <span class="text-footer-color"><router-link
                 :to="{
                   path: '/tradeHash',
                   query: {
                     hash: item.hash,
                   },
                 }"
-              >
-                {{ item.hash | filterHash(9) }}
-              </router-link>
+              >{{ item.hash | filterHash(8) }}</router-link>
             </span>
           </div>
-          <div class="graytxt">
-            {{ item.time_block | formatTime }}
+          <div class="graytxt">{{ item.time_block | formatTime }}
           </div>
         </div>
         <div class="middle">
           <div>
             <span class="graytxt">{{ $t('lang.trade.sender') }}：</span>
-            <span class="text-footer-color">
-              <router-link
+            <span class="text-footer-color"><router-link
                 :to="{
                   path: '/address',
                   query: {
                     address: item.from,
                   },
                 }"
-              >
-                {{ item.from | filterHash(9) }}
+              >{{ item.from | filterHash(8) }}
               </router-link>
             </span>
           </div>
           <div class="graytxt">
             <span class="graytxt">{{ $t('lang.trade.receiver') }}：</span>
-            <span class="text-footer-color">
-              <router-link
+            <span class="text-footer-color"><router-link
                 :to="{
                   path: '/address',
                   query: {
                     address: item.to,
                   },
                 }"
-              >
-                {{ item.to | filterHash(9) }}
+              >{{ item.to | filterHash(8) }}
               </router-link>
             </span>
           </div>
@@ -125,14 +117,14 @@ export default Vue.extend({
   color: #7c88ad;
 }
 .left {
-  min-width: 233px;
+  min-width: 230px;
 }
 
 .middle {
-  min-width: 168px;
+  min-width: 181px;
 }
 
 .right {
-  min-width: 56px;
+  min-width: 46px;
 }
 </style>

src/components/pc/txStatus.vue

@@ -60,7 +60,7 @@ export default Vue.extend({
 <style scoped lang="scss">
 .c-txStatus {
   .status {
-    width: 70px;
+    min-width: 70px;
     height: 30px;
     border-radius: 15px;
   }

src/layout/MainPage/Header.vue

@@ -250,7 +250,8 @@ export default Vue.extend({
   watch: {
     $route(n, o) {
       const scrollY = window.scrollY
-      this.iconType = n.query.lang || 'zh-CN'
+      this.iconType =
+        n.query.lang || window.sessionStorage.getItem('language') || 'zh-CN'
       this.isTop = scrollY < 70 ? true : false
       window.addEventListener('scroll', () => {
         const scrollY = window.scrollY

src/utils/common.ts

@@ -18,4 +18,45 @@ const tradeAccuracy = function(Actuators: string, ty: number, execer?: any) {
   }
 };
 
-export { tradeAccuracy };
+const nFormatter = (num: number, digits = 2) => {
+  const si = [
+    {
+      value: 1,
+      symbol: "",
+    },
+    {
+      value: 1e3,
+      symbol: "K",
+    },
+    {
+      value: 1e6,
+      symbol: "M",
+    },
+    {
+      value: 1e9,
+      symbol: "G",
+    },
+    {
+      value: 1e12,
+      symbol: "T",
+    },
+    {
+      value: 1e15,
+      symbol: "P",
+    },
+    {
+      value: 1e18,
+      symbol: "E",
+    },
+  ];
+  const rx = /\.0+$|(\.[0-9]*[1-9])0+$/;
+  let i;
+  for (i = si.length - 1; i > 0; i--) {
+    if (num >= si[i].value) {
+      break;
+    }
+  }
+  return (num / si[i].value).toFixed(digits).replace(rx, "$1") + si[i].symbol;
+};
+
+export { tradeAccuracy, nFormatter };

src/views/mobile/address/components/m-address-overview/index.vue

@@ -27,11 +27,11 @@ import MFourParams from './m-four-params.vue'
 import MAddressBalanceGraph from './m-address-balance-graph.vue'
 export default VueTypedMixins(AddressOverview).extend({
   props: {
-    balance: Number,
+    balance: [Number, Object],
     selectedValue: String,
     optionsList: Array,
     handleSelectChange: Function,
-    frozen: Number
+    frozen: [Number, Object],
   },
   components: {
     mAddressDisplay,

src/views/mobile/address/components/m-address-overview/m-address-balance-graph.vue

@@ -30,8 +30,8 @@
         :grid="{
           top: '10px',
           bottom: '25px',
-          left: '40px',
-          right: '40px',
+          left: '60px',
+          right: '60px',
         }"
         style="height: 110px;"
       ></charts-in-addr>

src/views/mobile/address/components/m-address-overview/m-address-blue-card.vue

@@ -43,8 +43,8 @@ export default Vue.extend({
     Select,
   },
   props: {
-    forzen: Number,
-    balance: Number,
+    forzen: [Number, Object],
+    balance: [Number, Object],
     selectedValue: String,
     optionsList: Array,
     handleSelectChange: Function,

src/views/mobile/tradeDetail.vue

@@ -143,7 +143,7 @@ export default vueTypedMixins(tradeDetail).extend({
     font-family: PingFangSC-Regular, PingFang SC;
     font-weight: 400;
     color: #7c88ad;
-    width: 73px;
+    width: 110px;
     min-height: 40px;
     line-height: 40px;
   }

src/views/pc/blockDetail/components/consensusNodeTable.vue

@@ -75,7 +75,11 @@
       <el-table-column :label="$t('lang.trade.type')" align="right" width="90">
         <template slot-scope="{ row }">
           <div class="text-darkBlue">
-            {{ row.type === 'vote' ? '投票节点' : '打包节点' }}
+            {{
+              row.type === 'vote'
+                ? $t('lang.block.votingNode')
+                : $t('lang.block.packingNode')
+            }}
           </div>
         </template>
       </el-table-column>

src/views/pc/tradeDetail.vue

@@ -234,7 +234,7 @@ export default vueTypedMixins(tradeDetail).extend({
     }
     .item-text {
       .status {
-        width: 70px;
+        min-width: 70px;
         height: 30px;
         border-radius: 15px;
         padding: 3px 10px;