fix api bug

diff --git a/package-lock.json b/package-lock.json
index 9ffbe33..68d3c55 100644 (file)
--- a/package-lock.json
+++ b/package-lock.json
@@ -1515,9 +1515,9 @@
       "dev": true
     },
     "bytom-js-sdk": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/bytom-js-sdk/-/bytom-js-sdk-1.3.10.tgz",
-      "integrity": "sha512-9e7hM8UzdI1Edll9hx744Z1RgJDpZvy6Y80xgrIbtsMphfVfJbCaOZV0w4ajTIZJwACztUs2X15f6YCUwb62gA==",
+      "version": "1.3.11",
+      "resolved": "https://registry.npmjs.org/bytom-js-sdk/-/bytom-js-sdk-1.3.11.tgz",
+      "integrity": "sha512-tJH0qMpY7dW6d5rG8YMvccX6Y/s4kkAH6JiHmOHpXHFd8Pj9BHgOyyEaSfHLD6X5RRFtxH0MLwJ0e8bGjH0l9Q==",
       "requires": {
         "axios": "0.18.0",
         "eslint": "5.9.0"

diff --git a/package.json b/package.json
index c4566bf..bee5bff 100644 (file)
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "dependencies": {
         "axios": "^0.18.0",
         "babel-preset-es2015": "^6.24.1",
-        "bytom-js-sdk": "^1.3.10",
+        "bytom-js-sdk": "^1.3.11",
         "clipboard": "^2.0.1",
         "file-saver": "^2.0.0-rc.3",
         "iview": "^3.0.0",

diff --git a/src/app/entry/home.vue b/src/app/entry/home.vue
index 57e09b5..1c59af4 100644 (file)
--- a/src/app/entry/home.vue
+++ b/src/app/entry/home.vue
@@ -288,7 +288,7 @@ export default {
 
       bytom.Transaction.list(this.accountInfo.guid, this.accountInfo.address)
         .then(ret => {
-          let transactions = ret.data.transactions;
+          let transactions = ret.result.data;
           if (transactions == null) {
             return;
           }
@@ -309,7 +309,7 @@ export default {
         this.limit
       )
         .then(ret => {
-          let transactions = ret.data.transactions;
+          let transactions = ret.result.data;
           if (transactions == null || ret._links.next == undefined) {
             return;
           }

diff --git a/src/app/transfer/transfer.vue b/src/app/transfer/transfer.vue
index 8b3c362..abe7531 100644 (file)
--- a/src/app/transfer/transfer.vue
+++ b/src/app/transfer/transfer.vue
@@ -173,7 +173,7 @@ export default {
     },
     "transaction.amount": function(newAmount) {
       bytom.Query.asset(this.transaction.asset).then(ret => {
-        this.transaction.cost = Number(ret.data.cny_price*newAmount).toFixed(2);
+        this.transaction.cost = Number(ret.result.data.cny_price*newAmount).toFixed(2);
       });
     },
     guid: function(newGuid) {
@@ -239,11 +239,11 @@ export default {
           console.log(ret);
           loader.hide();
 
-          this.transaction.fee = Number(ret.data.fee / 100000000);
+          this.transaction.fee = Number(ret.result.data.fee / 100000000);
           this.$refs.transferConfirm.open(
             this.account,
             this.transaction,
-            ret.data
+            ret.result.data
           );
         })
         .catch(error => {

diff --git a/src/background/index.js b/src/background/index.js
index 8caa2ed..f4ea184 100644 (file)
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -15,8 +15,8 @@ function refreshBalances() {
     bytom.accounts.listAddressUseServer(account.guid).then(addresses => {
       let balance = 0;
       addresses.forEach(item => {
-        if (item.asset != null) {
-          item.asset.forEach(asset => {
+        if (item.assets != null) {
+          item.assets.forEach(asset => {
             if (asset.asset == ASSET_BTM) {
               balance += asset.balance;
             }