From: monky <monky@it709.com>
Date: Tue, 30 Oct 2018 14:34:31 +0000 (+0800)
Subject: feat: add fee for txInfo and update image of welcome
X-Git-Tag: v1.0.0.1~75
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=53717833a00e11d326cbb3593a3785ef9634d8c0;p=bytom%2FByone.git

feat: add fee for txInfo and update image of welcome
---

diff --git a/src/assets/welcome.jpeg b/src/assets/welcome.jpeg
index 0b5e66e..6022566 100644
Binary files a/src/assets/welcome.jpeg and b/src/assets/welcome.jpeg differ
diff --git a/src/popup/home/components/transfer-confirm.vue b/src/popup/home/components/transfer-confirm.vue
index 48586f9..ea69cc1 100644
--- a/src/popup/home/components/transfer-confirm.vue
+++ b/src/popup/home/components/transfer-confirm.vue
@@ -96,7 +96,7 @@
               <div class="col label" style="line-height: 50px;">{{ $t('transfer.total') }}</div>
               <div class="col value">
                 <p class="fee-intro">{{ $t('transfer.totalTip') }}</p>
-                {{transaction.amount+transaction.fee}}<span class="uint">BTM</span>
+                {{Number(transaction.amount)+Number(transaction.fee)}}<span class="uint">BTM</span>
               </div>
             </div>
             <div class="row" style="margin: 20px;">
@@ -128,7 +128,7 @@ export default {
         to: "",
         toShort: "",
         amount: 0,
-        fee: "",
+        fee: ""
       }
     };
   },
@@ -161,7 +161,7 @@ export default {
           this.close();
           this.$emit("on-success");
           this.$dialog.show({
-            body: this.$t("transfer.success"),
+            body: this.$t("transfer.success")
           });
         })
         .catch(error => {
diff --git a/src/popup/home/components/tx-info.vue b/src/popup/home/components/tx-info.vue
index d7d380f..9700f54 100644
--- a/src/popup/home/components/tx-info.vue
+++ b/src/popup/home/components/tx-info.vue
@@ -56,7 +56,8 @@
   display: inline-flex;
 }
 .transaction .info section {
-  margin-right: 29px;
+  margin-right: 30px;
+  width: 80px;
 }
 .transaction .txid {
   margin-top: 20px;
@@ -91,8 +92,8 @@
               <p class="time">{{transaction.timestamp | moment}}</p>
               <div class="info">
                 <section>
-                  <p class="label">{{ $t('transactionDetail.fee') }}</p>
-                  <p>0.02BTM</p>
+                  <p class="label">{{ $t('transactionDetail.fee') }}(BTM)</p>
+                  <p>{{transaction.fee}}</p>
                 </section>
                 <section>
                   <p class="label">{{ $t('transactionDetail.blockHeight') }}</p>
diff --git a/src/popup/home/main.vue b/src/popup/home/main.vue
index 5cc8109..7daa99d 100644
--- a/src/popup/home/main.vue
+++ b/src/popup/home/main.vue
@@ -149,7 +149,7 @@
       <vue-scroll @handle-scroll="handleScroll">
         <ul class="list">
             <li class="list-item" v-for="(transcation, index) in transcations" :key="index" @click="$refs.trxInfo.open(transcation, accountInfo.address)">
-              <div class="value">{{transcation.direct}} {{transcation.val}} BTM</div>
+              <div class="value">{{transcation.direct}} {{transcation.val.toFixed(2)}} BTM</div>
               <div>
                 <div class="time">{{transcation.timestamp | moment}}</div>
                 <div class="addr">{{transcation.address}}</div>
@@ -238,37 +238,41 @@ export default {
     transcationsFormat: function(transactions) {
       transactions.forEach(transaction => {
         let inputSum = 0;
-        let outoutSum = 0;
+        let outputSum = 0;
+        let selfInputSum = 0;
+        let selfoutputSum = 0;
         let inputAddresses = [];
         let outputAddresses = [];
         transaction.inputs.forEach(input => {
+          inputSum += input.amount;
           if (input.address == this.accountInfo.address) {
-            inputSum += input.amount;
+            selfInputSum += input.amount;
             return;
           }
 
           inputAddresses.push(input.address);
         });
         transaction.outputs.forEach(output => {
+          outputSum += output.amount;
           if (output.address == this.accountInfo.address) {
-            outoutSum += output.amount;
+            selfoutputSum += output.amount;
             return;
           }
 
           outputAddresses.push(output.address);
         });
 
-        console.log(transaction);
-        let val = outoutSum - inputSum;
+        let val = selfoutputSum - selfInputSum;
         if (val > 0) {
           transaction.direct = "+";
           transaction.address = utils.shortAddress(inputAddresses.pop());
         } else {
-          val = inputSum - outoutSum;
+          val = selfInputSum - selfoutputSum;
           transaction.direct = "-";
           transaction.address = utils.shortAddress(outputAddresses.pop());
         }
-        transaction.val = Number(val / 100000000).toFixed(8);
+        transaction.val = Number(val / 100000000);
+        transaction.fee = Number(inputSum - outputSum) / 100000000;
       });
     },
     refreshTransactions: function() {
diff --git a/src/popup/login/components/welcome.vue b/src/popup/login/components/welcome.vue
index 0692a70..f606be4 100644
--- a/src/popup/login/components/welcome.vue
+++ b/src/popup/login/components/welcome.vue
@@ -28,7 +28,7 @@
 <template>
     <div>
         <section class="welcome-top">
-            <p>{{ $t('welcome.title') }}</p>
+            <!-- <p>{{ $t('welcome.title') }}</p> -->
         </section>
         <section class="welcome-bottom bg-green">
             <div class="btn btn-primary btn-startup" @click="start">{{ $t('welcome.use') }}</div>
diff --git a/static/icons/main.png b/static/icons/main.png
deleted file mode 100644
index f3d2503..0000000
Binary files a/static/icons/main.png and /dev/null differ