fix: fix some ui problem

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

@@ -70,3 +70,9 @@ export default VueTypedMixins(AddressOverview).extend({
   }
 }
 </style>
+<style>
+.el-popover,
+.el-popper {
+  z-index: 3001 !important;
+}
+</style>

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

@@ -48,7 +48,7 @@
             </p> -->
             <router-link
               :to="`/tradeHash?hash=${item.row.txHash}`"
-              class="light flex-left"
+              class="light flex-left text-footer-color"
             >
               {{ item.row.txHash | filterHash(10) }}
             </router-link>
@@ -59,7 +59,7 @@
         <template slot-scope="item">
           <router-link
             :to="`/address?address=${item.row.fromAddr}`"
-            class="light"
+            class="text-footer-color"
           >
             {{ item.row.fromAddr | filterHash(10) }}
           </router-link>
@@ -82,17 +82,26 @@
       </el-table-column>
       <el-table-column prop="hash" :label="$t('lang.trade.receiver')">
         <template slot-scope="item">
-          <router-link :to="`/address?address=${item.row.tx.to}`" class="light">
+          <router-link
+            :to="`/address?address=${item.row.tx.to}`"
+            class="text-footer-color"
+          >
             {{ item.row.tx.to | filterHash(10) }}
           </router-link>
         </template>
       </el-table-column>
       <el-table-column prop="fee" :label="$t('lang.block.txCount')">
-        <template slot-scope="item">{{ item.row | TradeValue }}</template>
+        <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">
-          {{ item.row.fee }}{{ item.row.tx.fee | filterFee }}
+          <div class="text-darkBlue">
+            {{ item.row.fee }}{{ item.row.tx.fee | filterFee }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('lang.trade.receiveStatus')">
@@ -106,12 +115,18 @@
       </el-table-column>
       <el-table-column :label="$t('lang.trade.time')" width="160">
         <template slot-scope="item">
-          {{ item.row.blockTime | formatTime }}
+          <div class="text-darkBlue">
+            {{ item.row.blockTime | formatTime }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('lang.trade.type')" width="100">
         <template slot-scope="item">
-          {{ item.row.actionName === 'unknown' ? 'none' : item.row.actionName }}
+          <div class="text-darkBlue">
+            {{
+              item.row.actionName === 'unknown' ? 'none' : item.row.actionName
+            }}
+          </div>
         </template>
       </el-table-column>
     </el-table>

src/router/index.ts

@@ -50,10 +50,10 @@ const routes: Array<RouteConfig> = [
         component: () => import(`@/views/${file}/tradeDetail.vue`),
       },
       {
-        path: '/address',
-        name: '个人地址',
+        path: "/address",
+        name: "个人地址",
         component: () => import(`@/views/${file}/address/index.vue`),
-      }
+      },
     ],
   },
 ];
@@ -64,4 +64,8 @@ const router = new VueRouter({
   routes,
 });
 
+router.afterEach(() => {
+  window.scrollTo({ top: 0 });
+});
+
 export default router;

src/utils/filters.ts

@@ -71,7 +71,6 @@ const formatTime = (date: any, format = "yyyy-MM-dd hh:mm:ss") => {
 };
 
 const decodeTransferNote = (tx: any = {}) => {
-  
   let payload: any = "";
   if (tx.execer === "user.p.xunku.storage") {
     return JSON.parse(`${deCode(tx.rawPayload)}`);
@@ -172,10 +171,12 @@ export default {
     }
   },
   branchIncome: (num: string, token: string) => {
-    return "这里是的收益来源以及金额";
+    return `8 YCC（${i18n.t("lang.block.votingNode")} 5 +  ${i18n.t(
+      "lang.block.packingNode"
+    )} 3）`;
     // return Number(num) > branchNum
-    // ? `8 ${base}（${i18n.t("home.miner")} 5 +  ${i18n.t("home.fund")} 3）`
-    // : `30${base}（${i18n.t("home.miner")} 18 +  ${i18n.t("home.fund")} 12）`;
+    //   ? `8 ${base}（${i18n.t("home.miner")} 5 +  ${i18n.t("home.fund")} 3）`
+    //   : `30${base}（${i18n.t("home.miner")} 18 +  ${i18n.t("home.fund")} 12）`;
   },
   TradeValue: (tradeInfo: any) => {
     if (!tradeInfo.amount && !tradeInfo.assets)

src/views/mobile/blockDetail/index.vue

@@ -19,6 +19,13 @@
       :focusedTab="focusedTab"
       :setFocusedTab="setFocusedTab"
     ></m-tabs>
+    <div class="bg-white px-4">
+      <Select
+        :selectedValue="selectedOption"
+        :optionList="optionList"
+        @change="selectOption"
+      ></Select>
+    </div>
     <div v-if="focusedTab === '1'" class="flow-root">
       <m-tx-item
         v-for="(trade, i) in Trades"
@@ -56,6 +63,7 @@ import MTabs from '@/components/mobile/m-tabs.vue'
 import MTxItem from '@/components/mobile/m-txItem.vue'
 import MPageContainer from '@/components/mobile/m-pageContainer.vue'
 import MConsensusNode from '@/components/mobile/m-consensus-node.vue'
+import Select from '@/components/pc/Select.vue'
 export default VueTypedMixins(blockDetailMixin).extend({
   components: {
     MChainSearch,
@@ -64,6 +72,7 @@ export default VueTypedMixins(blockDetailMixin).extend({
     MTxItem,
     MPageContainer,
     MConsensusNode,
+    Select,
   },
 })
 </script>

src/views/pc/block.vue

@@ -66,7 +66,7 @@
             </router-link>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('lang.block.mineRevenue')">
+        <el-table-column :label="$t('lang.block.blockReward')">
           <template slot-scope="block">
             <div class="light2">
               {{ block.row.height | branchIncome('BTY') }}

src/views/pc/tradeDetail.vue

@@ -76,7 +76,10 @@
           <span>{{ $t('lang.trade.sender') }}</span>
         </label>
         <div class="item-text" v-loading="loading">
-          <router-link :to="`/address?address=${data.from}`" class="light">
+          <router-link
+            :to="`/address?address=${data.from}`"
+            class="text-footer-color"
+          >
             {{ data.from }}
           </router-link>
         </div>
@@ -86,7 +89,10 @@
           <span>{{ $t('lang.trade.receiver') }}</span>
         </label>
         <div class="item-text" v-loading="loading">
-          <router-link :to="`/address?address=${data.to}`" class="light">
+          <router-link
+            :to="`/address?address=${data.to}`"
+            class="text-footer-color"
+          >
             {{ data.to }}
           </router-link>
         </div>
@@ -232,6 +238,7 @@ export default vueTypedMixins(tradeDetail).extend({
         border-radius: 15px;
         padding: 3px 10px;
         font-size: 14px;
+        color: #1f3470;
         i {
           font-size: 14px;
         }