Merge: merge pro

[bytom/Byone.git] / src / views / delayTxList.vue

diff --git a/src/views/delayTxList.vue b/src/views/delayTxList.vue
index fc3a5df..ea2feb0 100644 (file)
--- a/src/views/delayTxList.vue
+++ b/src/views/delayTxList.vue
@@ -155,11 +155,12 @@ export default {
     },
     computed: {
       address: function(){
-        if(this.netType === 'vapor'){
-          return this.currentAccount.vpAddress
-        }else{
-          return this.currentAccount.address
-        }
+        return this.currentAddress
+        // if(this.netType === 'vapor'){
+        //   return this.currentAccount.vpAddress
+        // }else{
+        //   return this.currentAccount.address
+        // }
       },
         ...mapState([
           'bytom',
@@ -169,6 +170,7 @@ export default {
         ...mapGetters([
           'language',
           'currentAccount',
+          'currentAddress',
           'currency',
           'netType',
           'net'