From d124db54d5d4a35708859f8b97580b6d4a9ef7c0 Mon Sep 17 00:00:00 2001
From: time <diqiuxuxu@gmail.com>
Date: Sun, 23 Dec 2018 16:51:21 +0800
Subject: [PATCH] fix api bug && delete no use console.log

---
 src/app/entry/transfer.vue     |  5 ++---
 src/app/home/menu-creation.vue | 22 ++++++++++++++++++++--
 src/app/home/menu-recovery.vue |  2 +-
 src/app/transfer/confirm.vue   |  3 ---
 src/app/transfer/detail.vue    |  2 --
 src/app/transfer/transfer.vue  |  1 -
 src/app/welcome/form-addon.vue | 25 ++++++++++++++++++++++++-
 src/assets/language/cn.js      |  3 +++
 src/assets/language/en.js      |  3 +++
 src/background/index.js        |  6 +++---
 src/content/inject.js          |  4 ++--
 11 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/src/app/entry/transfer.vue b/src/app/entry/transfer.vue
index 5789aa0..1d91316 100644
--- a/src/app/entry/transfer.vue
+++ b/src/app/entry/transfer.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>aaa{{transfer}}</div>
+    <div>{{transfer}}</div>
 </template>
 
 <script>
@@ -14,8 +14,7 @@ export default {
   beforeCreate() {
     chrome.extension.onMessage.addListener((request, sender, sendResponse) => {
       this.transfer = request.cmd;
-      console.log(request, 222);
-    //   alert("前端/后端/Popup收到");
+      console.log("transfer", request);
         sendResponse("popup返回值");
     });
   }
diff --git a/src/app/home/menu-creation.vue b/src/app/home/menu-creation.vue
index a98f7ca..768e5ee 100644
--- a/src/app/home/menu-creation.vue
+++ b/src/app/home/menu-creation.vue
@@ -79,8 +79,26 @@ export default {
       this.$emit("on-exit", "creation");
     },
     create: function() {
+      if (this.formItem.accAlias == "") {
+        this.$dialog.show({
+          body: this.$t("createAccount.inputAlias")
+        });
+        return;
+      }
+      if (this.formItem.keyAlias == "") {
+        this.$dialog.show({
+          body: this.$t("createAccount.inputKey")
+        });
+        return;
+      }
+      if (this.formItem.passwd1 == "") {
+        this.$dialog.show({
+          body: this.$t("createAccount.inputPass")
+        });
+        return;
+      }
       if (this.formItem.passwd1 != this.formItem.passwd2) {
-        this.tips = "两次密码不一致，请检查后再试";
+        this.tips = this.$t('createAccount.passwordAgain');
         return;
       }
 
@@ -96,7 +114,7 @@ export default {
         this.formItem.passwd1
       )
         .then(res => {
-          console.log(res);
+          console.log("bytom.Account.create", res);
           this.formItem = {};
           loader.hide();
           this.back();
diff --git a/src/app/home/menu-recovery.vue b/src/app/home/menu-recovery.vue
index f11aec9..30a6533 100644
--- a/src/app/home/menu-recovery.vue
+++ b/src/app/home/menu-recovery.vue
@@ -47,7 +47,7 @@ export default {
         .restore(this.fileTxt)
         .then(res => {
           this.close();
-          console.log(res);
+          console.log("recovery", res);
         })
         .catch(error => {
           this.$dialog.show({
diff --git a/src/app/transfer/confirm.vue b/src/app/transfer/confirm.vue
index 58c24b6..2089ec4 100644
--- a/src/app/transfer/confirm.vue
+++ b/src/app/transfer/confirm.vue
@@ -138,7 +138,6 @@ export default {
   },
   methods: {
     open: function(account, transaction, data) {
-      console.log(transaction);
       this.account = account;
       this.transaction = transaction;
       this.transaction.toShort = utils.shortAddress(transaction.to, 4);
@@ -160,8 +159,6 @@ export default {
       bytom.Transaction.transfer(this.account.guid, this.rawData, passwd)
         .then(ret => {
           loader.hide();
-          console.log(ret);
-
           this.close();
           this.$emit("on-success");
           this.$dialog.show({
diff --git a/src/app/transfer/detail.vue b/src/app/transfer/detail.vue
index 2aea986..464ed82 100644
--- a/src/app/transfer/detail.vue
+++ b/src/app/transfer/detail.vue
@@ -148,8 +148,6 @@ export default {
   methods: {
     open: function(transaction, selfAddress) {
       this.show = true;
-
-      console.log(transaction);
       this.transaction = transaction;
       this.selfAddress = selfAddress;
     },
diff --git a/src/app/transfer/transfer.vue b/src/app/transfer/transfer.vue
index abe7531..9792a40 100644
--- a/src/app/transfer/transfer.vue
+++ b/src/app/transfer/transfer.vue
@@ -236,7 +236,6 @@ export default {
         this.transaction.fee
       )
         .then(ret => {
-          console.log(ret);
           loader.hide();
 
           this.transaction.fee = Number(ret.result.data.fee / 100000000);
diff --git a/src/app/welcome/form-addon.vue b/src/app/welcome/form-addon.vue
index 034883f..5b4e85f 100644
--- a/src/app/welcome/form-addon.vue
+++ b/src/app/welcome/form-addon.vue
@@ -71,7 +71,12 @@ export default {
     return {
       nets: [],
       selected: mainNet,
-      formItem: {}
+      formItem: {
+        accAlias: "",
+        keyAlias: "",
+        passwd1: "",
+        passwd2: ""
+      }
     };
   },
   computed : {
@@ -100,6 +105,24 @@ export default {
   },
   methods: {
     create: function() {
+      if (this.formItem.accAlias == "") {
+        this.$dialog.show({
+          body: this.$t("createAccount.inputAlias")
+        });
+        return;
+      }
+      if (this.formItem.keyAlias == "") {
+        this.$dialog.show({
+          body: this.$t("createAccount.inputKey")
+        });
+        return;
+      }
+      if (this.formItem.passwd1 == "") {
+        this.$dialog.show({
+          body: this.$t("createAccount.inputPass")
+        });
+        return;
+      }
       if (this.formItem.passwd1 != this.formItem.passwd2) {
         this.$dialog.show({
             body: this.$t('createAccount.passwordAgain'),
diff --git a/src/assets/language/cn.js b/src/assets/language/cn.js
index fb73bb6..dead3ad 100644
--- a/src/assets/language/cn.js
+++ b/src/assets/language/cn.js
@@ -72,6 +72,9 @@ const cn = {
     import: "导入",
     back: "返回",
     passwordAgain: "两次密码不一致，请检查后再试。",
+    inputAlias: "请输入账户别名",
+    inputKey: "请输入秘钥别名",
+    inputPass: "请输入密码",
   },
   help: {
     title: "帮助",
diff --git a/src/assets/language/en.js b/src/assets/language/en.js
index 7713260..221f25b 100644
--- a/src/assets/language/en.js
+++ b/src/assets/language/en.js
@@ -72,6 +72,9 @@ const en = {
     import: "Import",
     back: "Back",
     passwordAgain: "The passwords are inconsistent twice. Please check and try again.",
+    inputAlias: "Please enter the account alias.",
+    inputKey: "Please enter the key alias.",
+    inputPass: "Please enter your password.",
   },
   help: {
     title: "Help",
diff --git a/src/background/index.js b/src/background/index.js
index f4ea184..4b304fa 100644
--- 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.assets != null) {
-          item.assets.forEach(asset => {
+        if (item.balances != null) {
+          item.balances.forEach(asset => {
             if (asset.asset == ASSET_BTM) {
               balance += asset.balance;
             }
@@ -35,7 +35,7 @@ function refreshAccounts(success) {
   bytom.accounts
     .listAccountUseServer()
     .then(accounts => {
-      console.log(accounts);
+      console.log("refreshAccounts", accounts);
       globalAccounts = accounts;
       globalAccounts.forEach(account => {
         if (account.balance == null) {
diff --git a/src/content/inject.js b/src/content/inject.js
index 72dd0f8..230890e 100644
--- a/src/content/inject.js
+++ b/src/content/inject.js
@@ -10,10 +10,10 @@ window.addEventListener("message", function (event) {
         return;
     }
     
-    console.log(111, event.data);
+    console.log("event.data", event.data);
     if(event.data.bty == 'transfer'){
         chrome.runtime.sendMessage(event.data, function (response) {
-            console.log(222, response);
+            console.log("transfer response", response);
         });
     }
 
-- 
2.11.0