feat: support bytom classic

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

diff --git a/src/views/assetList.vue b/src/views/assetList.vue
index 7886e58..e80a6cf 100644 (file)
--- a/src/views/assetList.vue
+++ b/src/views/assetList.vue
@@ -205,13 +205,13 @@ export default {
         },
     },
     computed: {
-      address: function(){
-        if(this.netType === 'vapor'){
-          return this.currentAccount.vpAddress
-        }else{
-          return this.currentAccount.address
-        }
-      },
+      // address: function(){
+      //   if(this.netType === 'vapor'){
+      //     return this.currentAccount.vpAddress
+      //   }else{
+      //     return this.currentAccount.address
+      //   }
+      // },
         ...mapState([
           'bytom',
           'currentAsset',
@@ -222,7 +222,8 @@ export default {
           'currentAccount',
           'currency',
           'netType',
-          'net'
+          'net',
+          'currentAddress'
         ])
     },
     methods: {
@@ -319,7 +320,7 @@ export default {
                     break;
                 }
 
-                transaction.list(this.address, this.currentAsset.asset.assetId, start, limit, type_txs).then(transactions => {
+                transaction.list(this.currentAddress, this.currentAsset.asset.assetId, start, limit, type_txs).then(transactions => {
                   if (transactions == null) {
                         return;
                     }
@@ -341,11 +342,11 @@ export default {
               .filter(b => b.asset.assetId === assetID);
 
             const inputAddresses = transaction.inputs
-              .filter(input => input.asset.assetId === assetID && input.address !== this.address)
+              .filter(input => input.asset.assetId === assetID && input.address !== this.currentAddress)
               .map(input => input.address)
 
             const outputAddresses = transaction.outputs
-              .filter(output => output.asset.assetId === assetID && output.address !== this.address)
+              .filter(output => output.asset.assetId === assetID && output.address !== this.currentAddress)
               .map(output => output.address)
 
             if(balanceObject.length ===1 ){
@@ -372,7 +373,7 @@ export default {
                     transaction.type = this.$t("common.transfer_out");
                   }
 
-                  const resultAddr = outputAddresses.pop() || this.address
+                  const resultAddr = outputAddresses.pop() || this.currentAddress
                   transaction.address = (resultAddr && resultAddr.includes(' '))?resultAddr:address.short(resultAddr);
                 }
 
@@ -410,8 +411,8 @@ export default {
                 }
                 transaction.val =  0
                 let resultAddr =  transaction.outputs
-                  .find(output => output.address !== this.address)
-                resultAddr = resultAddr? resultAddr.address : this.address
+                  .find(output => output.address !== this.currentAddress)
+                resultAddr = resultAddr? resultAddr.address : this.currentAddress
 
                 transaction.address = address.short(resultAddr)