1.0.5版本：

1.币币交易 2.添加Mtr币种支持，优化APL币种字段支持 3.添加状态：未激活，出租中，节点故障，区块高度 5.添加NXT出租功能 6.修改手续费计算，从服务器获取最小手续费 7.添加本地验证交易：unsignedTransactionBytes，避免节点造假 8.扫码支付 9.代码优化 1. Currency transaction 2. Add Mtr currency support, optimize APL currency field support 3. Add status: not activated, in the rental, node failure, block height 5. Add NXT rental function 6. Modify the fee calculation and get the minimum commission from the server. 7. Add a local verification transaction: unsignedTransactionBytes to avoid node fraud 8. Scan code payment 9. Code optimization
317482454 · Jul 5, 2018 · a017cb1 · a017cb1
1 parent b504adb
commit a017cb1
Show file tree

Hide file tree

Showing 72 changed files with 17,022 additions and 3,996 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -66,6 +66,7 @@
     "eruda": "^1.3.2",
     "less": "^2.7.3",
     "less-loader": "^4.0.5",
+    "mtrjs": "^1.0.3",
     "nxtjs": "^0.1.1",
     "onsenui": "^2.8.3",
     "qrcode": "^1.0.0",

diff --git a/src/index.ejs b/src/index.ejs
@@ -17,7 +17,7 @@
 
       }
     </style>
-    <script src="http://sdk.talkingdata.com/app/h5/v1?appid=B328A7C42F554730BE1A4145AECB2649&vn=Nxt Wallet&vc=1.0"></script>
+    <!--<script src="http://sdk.talkingdata.com/app/h5/v1?appid=B328A7C42F554730BE1A4145AECB2649&vn=Nxt Wallet&vc=1.0"></script>-->
     <!--<script src="http://sdk.talkingdata.com/app/h5/v1?appid=ED795888C3F245BA8ACB303FC14FB0ED&vn=H5 WalletNxt&vc=1.0"></script>-->
   </head>
   <body>

diff --git a/src/renderer/App.vue b/src/renderer/App.vue
@@ -1,5 +1,5 @@
 <template>
-    <v-ons-splitter>
+    <v-ons-splitter style="        background-color:transparent !important;">
         <v-ons-splitter-side width="190px"
                 swipeable  collapse="" side="right"
                 :animation="'reveal'"
@@ -28,15 +28,17 @@
                 </div>
             </v-ons-page>
         </v-ons-splitter-side>
-        <v-ons-splitter-content>
-            <div style="height: 100%;">
+        <v-ons-splitter-content style="        background-color:transparent !important;
+">
+            <div style="height: 100%;        background-color:transparent !important;
+width: 100%">
                 <v-ons-navigator id="app" swipeable
                                  :page-stack="$store.state.pageStack"
                                  @push-page="$store.state.pageStack.push($event)"
                                  @prepop="list"
                 ></v-ons-navigator>
                 <div id="scan" style="width: 100%;height: 100%;display: none;
-        position: relative;background-color:rgba(0,0,0,0.2); ">
+        position: relative;        background-color:transparent !important; ">
                     <div class="zhs_head" style="background-color:rgba(0,0,0,0.4);">
                         <div class="zhs_txt">
                             Scan QR Code
@@ -97,23 +99,24 @@
                 if (this.$store.state.wallet.name&&this.$store.state.wallet.list) {
                     let model = [];
                     this.$store.state.wallet.list.forEach((v, k) => {
-                        this.$g.wallet.getAccount(this, v).then(sum => {
-                            if (sum== 'errorCode') {
-                                v.sum=0;
+                        this.$g.wallet.getAccount(this, v).then(model => {
+                            v.model=model;
+                            if (model.balanceNQT) {
+
+                                v.sum= this.$g.wallet.amount(model.balanceNQT);
                             } else {
-                                v.sum = sum;
-                            }
-                            if(sum=='errorCode404'){
                                 v.sum=0;
+                            }
+                            if(model=='errorCode404'){
                                 v.is = true;
+                                v.price=0;
                             }else{
                                 v.is = false;
                             }
                         })
                         model.push(v);
                     })
                     this.$store.commit('setWalletList2',model)
-
                 }
                 this.ticker()
             },
@@ -170,11 +173,34 @@
                 this.list();
             }, 3000);
             this.update()
+//            var app = {
+//                // Application Constructor
+//                initialize: function () {
+//                    document.addEventListener('deviceready', this.onDeviceReady.bind(this), false);
+//                },
+//                onDeviceReady: function () {
+//                    console.log(device.uuid);
+//                },
+//            };
+//            app.initialize();
+
         }
     }
 </script>
 
 <style lang="less">
+    .exchange{
+        .list-item__center{
+            padding: 0;
+        }
+    }
+    .select{
+        width: 100%;
+        .select-input{
+            font-size: 14px;
+        }
+    }
+
     .app_walletList{
         padding-bottom: 20px;margin-top: 60px;border-bottom: 1px solid rgb(74, 98, 123);
         .app_walletList_div{
@@ -218,11 +244,14 @@
             border: none;
         }
     }
-    body {
-        background: none transparent;
+    html,body {
+        background-color:transparent !important;
     }
 
     .page__content {
         top: 0 !important;
     }
+    .toolbar+.page__background {
+        top: 0 !important;
+    }
 </style>
diff --git a/src/renderer/components/Camera.vue b/src/renderer/components/Camera.vue
diff --git a/src/renderer/components/PullHook.vue b/src/renderer/components/PullHook.vue