feat: add page confirm for transaction v2

diff --git a/src/popup/home/components/transfer-confirm.vue b/src/popup/home/components/transfer-confirm.vue
index 7bfd064..29332a1 100644 (file)
--- a/src/popup/home/components/transfer-confirm.vue
+++ b/src/popup/home/components/transfer-confirm.vue
@@ -91,7 +91,7 @@
               <div class="col value">{{transaction.fee}}<span class="uint">BTM</span></div>
             </div>
 
-            <div class="divider" style="margin-top: 30px; margin-bottom: 10px;"></div>
+            <div class="divider" style="margin-top: 130px; margin-bottom: 10px;"></div>
             <div class="row" style="text-align: right;">
               <div class="col label" style="line-height: 50px;">总计</div>
               <div class="col value">

diff --git a/src/popup/home/components/transfer.vue b/src/popup/home/components/transfer.vue
index e03704e..3e95e7f 100644 (file)
--- a/src/popup/home/components/transfer.vue
+++ b/src/popup/home/components/transfer.vue
@@ -116,11 +116,8 @@
 
 <script>
 import bytom from "../../script/bytom";
-<<<<<<< Updated upstream
 import getLang from "../../../assets/language/sdk"
-=======
 import TransferConfirm from "./transfer-confirm";
->>>>>>> Stashed changes
 export default {
   components: {
     TransferConfirm