fix

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

@@ -3,8 +3,8 @@
     <div
       class="box text-center flex flex-col justify-center"
       :class="[
-        type === 'vote' ? 'text-orange' : ' text-footer-color',
-        type === 'vote' ? ' bg-lightOrange' : '  bg-lightBlue3',
+        type !== 'vote' ? 'text-orange' : ' text-footer-color',
+        type !== 'vote' ? ' bg-lightOrange' : '  bg-lightBlue4',
       ]"
     >
       <div>
@@ -28,11 +28,11 @@
               },
             }"
           >
-            102938
+            {{ height }}
           </router-link>
         </div>
         <div class="text-text-color">
-          {{ 2039480923 | formatTime }}
+          {{ timeBlock | formatTime }}
         </div>
       </div>
       <div style="margin-bottom: 5px;">
@@ -48,7 +48,7 @@
               },
             }"
           >
-            {{ 'alskdjflaksjdflkasdf' | filterHash(9) }}
+            {{ txHash | filterHash(9) }}
           </router-link>
         </span>
       </div>
@@ -65,7 +65,7 @@
               },
             }"
           >
-            {{ 'lakjsdflkjaskdlfjasdf' | filterHash(9) }}
+            {{ sender | filterHash(9) }}
           </router-link>
         </span>
       </div>

src/mixin/address.ts

-import { getAddressTxCount, getAddrTxList } from "@/service/api";
+import {
+  getAddressTxCount,
+  getAddrTxList,
+  getMakerAddr,
+  getMakerAddrCount,
+  getVoterAddr,
+  getVoterAddrCount,
+} from "@/service/api";
 import Rpc from "@/utils/Rpc";
 import Vue from "vue";
 
@@ -12,22 +19,23 @@ export default Vue.extend({
         pageSize: 10,
         total: 0,
       },
+      pages3: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+      },
+      pages2: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+      },
       selectedOption: "1",
       loadingTxRecordTable: false,
       txRecordList: [] as any[],
-      voteList: [
-        {
-          height: 30303,
-          hash: "102931jlakjsdflkajsdf",
-          sender: "alkdsjflkajsdf",
-          receiver: "aldskfjalkdsjfa",
-          reward: 987234,
-          time: 17602983409,
-        },
-      ],
+      voteList: [] as any[],
       selectedExecer: "",
-      execAccount: [],
-      packList: [],
+      execAccount: [] as any[],
+      packList: [] as any[],
       loadingVote: false,
       loadingPack: false,
     };
@@ -35,6 +43,8 @@ export default Vue.extend({
   mounted() {
     this.getAllExecBalance();
     this.getTxList();
+    this.getMaker();
+    this.getVoter();
   },
   computed: {
     tabList() {
@@ -135,6 +145,48 @@ export default Vue.extend({
     setValue(v: string) {
       this.value = v;
     },
+    sizeChange3(size: number) {
+      this.pages3.pageSize = size;
+      this.pageChange3(1);
+    },
+    pageChange3(page: number) {
+      this.pages3.currentPage = page;
+      getMakerAddr(
+        this.$route.query.address as string,
+        this.pages3.currentPage,
+        this.pages3.pageSize
+      ).then((res) => {
+        if (res.error === null) {
+          this.packList = res.result.map((i: any) => ({
+            ...i,
+            sender: i.from,
+            receiver: i.to,
+            time: i.block_time,
+          }));
+        }
+      });
+    },
+    sizeChange2(size: number) {
+      this.pages2.pageSize = size;
+      this.pageChange2(1);
+    },
+    pageChange2(page: number) {
+      this.pages2.currentPage = page;
+      getVoterAddr(
+        this.$route.query.address as string,
+        this.pages2.currentPage,
+        this.pages2.pageSize
+      ).then((res) => {
+        if (res.error === null) {
+          this.voteList = res.result.map((i: any) => ({
+            ...i,
+            sender: i.from,
+            receiver: i.to,
+            time: i.block_time,
+          }));
+        }
+      });
+    },
     sizeChange(size: number) {
       this.pages.pageSize = size;
       this.pageChange(1);
@@ -167,5 +219,47 @@ export default Vue.extend({
           return "";
       }
     },
+    getMaker() {
+      getMakerAddrCount(this.$route.query.address as string).then((res) => {
+        if (res.error === null) {
+          this.pages3.total = res.result;
+          getMakerAddr(
+            this.$route.query.address as string,
+            this.pages3.currentPage,
+            this.pages3.pageSize
+          ).then((res) => {
+            if (res.error === null) {
+              this.packList = res.result.map((i: any) => ({
+                ...i,
+                sender: i.from,
+                receiver: i.to,
+                time: i.block_time,
+              }));
+            }
+          });
+        }
+      });
+    },
+    getVoter() {
+      getVoterAddrCount(this.$route.query.address as string).then((res) => {
+        if (res.error === null) {
+          this.pages2.total = res.result;
+          getVoterAddr(
+            this.$route.query.address as string,
+            this.pages2.currentPage,
+            this.pages2.pageSize
+          ).then((res) => {
+            if (res.error === null) {
+              this.voteList = res.result.map((i: any) => ({
+                ...i,
+                sender: i.from,
+                receiver: i.to,
+                time: i.block_time,
+              }));
+            }
+          });
+        }
+      });
+    },
   },
 });

src/service/api.ts

@@ -252,3 +252,102 @@ export function getAddrTxList(addr: string, number: number, size: number) {
     },
   });
 }
+
+export function getMakerAddrCount(addr: string) {
+  return axios(expandApi, {
+    method: "post",
+    params: {
+      id: 1,
+      method: "Tx.TxCount",
+      params: [
+        {
+          match: [
+            {
+              key: "maker_addr",
+              value: addr,
+            },
+          ],
+        },
+      ],
+    },
+  });
+}
+export function getVoterAddrCount(addr: string) {
+  return axios(expandApi, {
+    method: "post",
+    params: {
+      id: 1,
+      method: "Tx.TxCount",
+      params: [
+        {
+          match: [
+            {
+              key: "voter_addr",
+              value: addr,
+            },
+          ],
+        },
+      ],
+    },
+  });
+}
+
+export function getMakerAddr(addr: string, number: number, size: number) {
+  return axios(expandApi, {
+    method: "post",
+    params: {
+      id: 1,
+      method: "Tx.TxList",
+      params: [
+        {
+          sort: [
+            {
+              key: "height",
+              ascending: false,
+            },
+          ],
+          match: [
+            {
+              key: "maker_addr",
+              value: addr,
+            },
+          ],
+          page: {
+            number,
+            size,
+          },
+        },
+      ],
+    },
+  });
+}
+
+export function getVoterAddr(addr: string, number: number, size: number) {
+  return axios(expandApi, {
+    method: "post",
+    params: {
+      id: 1,
+      method: "Tx.TxList",
+      params: [
+        {
+          sort: [
+            {
+              key: "height",
+              ascending: false,
+            },
+          ],
+          match: [
+            {
+              key: "voter_addr",
+              value: addr,
+            },
+          ],
+          page: {
+            number,
+            size,
+          },
+        },
+      ],
+    },
+  });
+}

src/views/mobile/address/index.vue

@@ -18,23 +18,97 @@
         :setFocusedTab="($event) => (focusedTab = $event)"
         :tabList="tabList"
       ></m-tabs>
-      <m-vote-pack :rewardAmount="30" :type="'lskjd'"></m-vote-pack>
+      <div v-if="focusedTab === 'txRecord'">
+        <m-tx-item
+          v-for="(n, i) in txRecordList"
+          :style="{
+            'border-bottom-left-radius':
+              i === txRecordList.length - 1 ? '2px' : 'none',
+            'border-bottom-right-radius':
+              i === txRecordList.length - 1 ? '2px' : 'none',
+          }"
+          :key="i"
+          :tradeG="n.tradeG"
+          :row="n"
+          :blockTime="n.time_block"
+          :amount="n.amount"
+          :txHash="n.hash"
+          :from="n.from"
+          :to="n.to"
+          :status="n.success"
+        ></m-tx-item>
       </div>
+      <div v-if="focusedTab === 'votingRecord'">
+        <vote-pack-table
+          v-for="(v, i) in voteList"
+          :key="i"
+          :height="n.height"
+          :timeBlock="n.time"
+          :sender="n.sender"
+          :txHash="n.hash"
+          :rewardAmount="30"
+          type="vote"
+        ></vote-pack-table>
+      </div>
+      <div v-if="focusedTab === 'packingRecord'">
+        <m-vote-pack
+          v-for="(n, i) in packList"
+          :key="i"
+          :height="n.height"
+          :timeBlock="n.time"
+          :sender="n.sender"
+          :txHash="n.hash"
+          :rewardAmount="30"
+          type="pack"
+        ></m-vote-pack>
+      </div>
+    </div>
+    <m-page-container
+      v-if="focusedTab === 'txRecord'"
+      @pageChange="pageChange"
+      @sizeChange="sizeChange"
+      :currentPage="pages.currentPage"
+      :pageSize="pages.pageSize"
+      :total="pages.total"
+      class="mt-5"
+    ></m-page-container>
+    <m-page-container
+      v-if="focusedTab === 'votingRecord'"
+      @pageChange="pageChange2"
+      @sizeChange="sizeChange2"
+      :currentPage="pages2.currentPage"
+      :pageSize="pages2.pageSize"
+      :total="pages2.total"
+      class="mt-5"
+    ></m-page-container>
+    <m-page-container
+      v-if="focusedTab === 'packingRecord'"
+      @pageChange="pageChange3"
+      @sizeChange="sizeChange3"
+      :currentPage="pages3.currentPage"
+      :pageSize="pages3.pageSize"
+      :total="pages3.total"
+      class="mt-5"
+    ></m-page-container>
   </div>
 </template>
 <script lang="ts">
 import MChainSearch from '@/components/mobile/m-chainSearch.vue'
 import MTabs from '@/components/mobile/m-tabs.vue'
+import MPageContainer from '@/components/mobile/m-pageContainer.vue'
 import MVotePack from '@/components/mobile/m-vote-pack.vue'
 import address from '@/mixin/address'
 import VueTypedMixins from 'vue-typed-mixins'
 import MAddressOverview from './components/m-address-overview/index.vue'
+import MTxItem from '@/components/mobile/m-txItem.vue'
 export default VueTypedMixins(address).extend({
   components: {
     MChainSearch,
     MAddressOverview,
     MTabs,
+    MPageContainer,
     MVotePack,
+    MTxItem,
   },
 })
 </script>

src/views/pc/address/components/votePackTable.vue

@@ -29,7 +29,7 @@
                 },
               }"
             >
-              {{ row.hash }}
+              {{ row.hash | filterHash(10) }}
             </router-link>
           </div>
         </template>
@@ -45,7 +45,7 @@
                 },
               }"
             >
-              {{ row.sender }}
+              {{ row.sender | filterHash }}
             </router-link>
           </div>
         </template>
@@ -66,7 +66,7 @@
                 },
               }"
             >
-              {{ row.receiver }}
+              {{ row.receiver | filterHash}}
             </router-link>
           </div>
         </template>

src/views/pc/address/index.vue

@@ -54,8 +54,9 @@
         :loading="loadingPack"
       ></vote-pack-table>
     </div>
-    <div class="flex justify-end" v-if="focusedTab === 'txRecord'">
+    <div class="flex justify-end">
       <page-container
+        v-if="focusedTab === 'txRecord'"
         style="margin-top: 30px;"
         :currentPage="pages.currentPage"
         :pageSize="pages.pageSize"
@@ -63,6 +64,24 @@
         @sizeChange="sizeChange"
         @pageChange="pageChange"
       ></page-container>
+      <page-container
+        v-if="focusedTab === 'votingRecord'"
+        @pageChange="pageChange2"
+        @sizeChange="sizeChange2"
+        :currentPage="pages2.currentPage"
+        :pageSize="pages2.pageSize"
+        :total="pages2.total"
+        class="mt-5"
+      ></page-container>
+      <page-container
+        v-if="focusedTab === 'packingRecord'"
+        @pageChange="pageChange3"
+        @sizeChange="sizeChange3"
+        :currentPage="pages3.currentPage"
+        :pageSize="pages3.pageSize"
+        :total="pages3.total"
+        class="mt-5"
+      ></page-container>
     </div>
   </div>
 </template>