Merge pull request #11 from bluegene1/0.5.0

Implemented the function of voting for the node
PlatONnetwork · Feb 28, 2019 · 36b7ac4 · 36b7ac4
2 parents 7bb6a7d + 5a864c2
commit 36b7ac4
Show file tree

Hide file tree

Showing 48 changed files with 1,081 additions and 663 deletions.
diff --git a/build/build.nsi b/build/build.nsi
@@ -4,7 +4,7 @@
 
 ; 安装程序初始定义常量
 !define PRODUCT_NAME "Samurai"
-!define PRODUCT_VERSION " 0.4.0.1"; 加版本号，开头多加一个空格！
+!define PRODUCT_VERSION " 0.3.0.9"; 加版本号，开头多加一个空格！
 !define PRODUCT_PUBLISHER "www.platon.network<[email protected]>"
 !define PRODUCT_WEB_SITE "https://www.platon.network"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Samurai.exe"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "Samurai",
-    "version": "0.4.1",
+    "version": "0.3.9",
     "author": "www.platon.network<[email protected]>",
     "description": "Samurai钱包客户端",
     "license": null,
@@ -22,7 +22,7 @@
     },
     "build": {
         "productName": "Samurai",
-        "buildVersion": "0.4.0.1",
+        "buildVersion": "0.3.0.9",
         "appId": "org.simulatedgreg.electron-vue",
         "directories": {
             "output": "dist"
@@ -106,12 +106,9 @@
         "bignumber": "^1.1.0",
         "bignumber.js": "^8.0.1",
         "console-utility": "git+ssh://http://luchenqun:[email protected]/Juzix-ethereum/console-utility.git#develop",
-        "crypto": "^1.0.1",
-        "crypto-js": "^3.1.9-1",
         "decimal.js": "^10.0.1",
         "element-ui": "^1.4.3",
         "ethereumjs-tx": "^1.3.7",
-        "jssha": "^2.3.1",
         "keythereum": "^1.0.4",
         "less": "^2.7.2",
         "less-loader": "^4.0.5",
@@ -153,7 +150,6 @@
         "less": "^2.7.2",
         "less-loader": "^4.0.5",
         "multispinner": "^0.2.1",
-        "sha3": "^2.0.0",
         "style-loader": "^0.18.1",
         "url-loader": "^0.5.7",
         "vue-html-loader": "^1.2.2",

diff --git a/src/components/loading/loading.vue b/src/components/loading/loading.vue
@@ -46,7 +46,7 @@
         height: 100%;
         border-radius: 4px;
         background: #FFFFFF;
-        -webkit-animation: load 0.75s ease infinite;
+        -webkit-animation: load 1s ease infinite;
     }
     @-webkit-keyframes load{
         0% {

diff --git a/src/components/loading/pageLoading.vue b/src/components/loading/pageLoading.vue
@@ -1,15 +1,16 @@
 <template>
-    <div v-if="pageLoading" class="page-loading">
+    <div class="modal" v-if="pageLoading">
+        <!-- <div class="modal-main" style="background-color: transparent">
+            <i class="el-icon-loading" style="font-size:80px;"></i>
+        </div> -->
         <div class="loading">
             <span></span>
             <span></span>
             <span></span>
             <span></span>
             <span></span>
         </div>
-        <p class="load-txt">{{loadTxt}}</p>
     </div>
-
 </template>
 
 <script>
@@ -24,7 +25,6 @@
         computed:{
             ...mapGetters(['pageLoading'])
         },
-        props:(['loadTxt']),
         methods: {
 
 
@@ -33,26 +33,21 @@
 </script>
 
 <style lang="less" scoped>
-    .page-loading{
-        text-align: center;
-        color: #9EABBE;
-    }
-    .load-txt{
-        margin-top:20px;
-    }
     .loading{
-        margin-top:100px;
-        width: 100%;
+        width: 80px;
         height: 40px;
-        text-align: center;
+        margin-top:300px;
+        margin-left: 500px;
+        // margin: 300 auto 0 550px;
+        /* background: #800080 */
     }
     .loading span{
         display: inline-block;
         width: 8px;
         height: 100%;
         border-radius: 4px;
-        background:  #9EABBE;
-        -webkit-animation: load 0.75s ease infinite;
+        background: #FFFFFF;
+        -webkit-animation: load 1s ease infinite;
     }
     @-webkit-keyframes load{
         0% {

diff --git a/src/components/select/index.vue b/src/components/select/index.vue
@@ -1,11 +1,11 @@
 <template>
     <div class="select-self" :style="{width:sWidth+'px'}"  ref="sel-ref" style="-webkit-app-region: no-drag">
-        <span class="model" @click="selBtn" :style="{fontSize:page=='/trade-list'?'15px':'16px'}">
+        <span class="model" @click="selBtn">
             {{sel}}
             <i class="el-icon-caret-top" v-if="showOptions"></i>
             <i class="el-icon-caret-bottom" v-else></i>
         </span>
-        <ul v-if="showOptions" :style="{minWidth:sWidth>100?sWidth:100+'px'}">
+        <ul v-if="showOptions" :style="{minWidth:sWidth+'px'}">
             <li v-for="item in optionVs" @click="selOption(item)" :class="[((item.address==curWallet&&sel==item.account) || (item.address==''&&sel==$t('wallet.allWallet')))?'active':'']">
                 {{item.account}}
             </li>
@@ -27,10 +27,7 @@
         },
         props:(['optionVs','defaultSel']),
         computed:{
-            ...mapGetters(['curWallet']),
-            page: function(){
-                 return this.$route.path
-            }
+            ...mapGetters(['curWallet'])
         },
         watch:{
             'curWallet':function(val){

diff --git a/src/components/sideBar/sideBar.vue b/src/components/sideBar/sideBar.vue
@@ -1,11 +1,9 @@
 <template>
     <div class="side-bar">
        <el-menu class="menu" default-active="1" @select="handleSelect">
-               <el-menu-item v-for="(item, index) in menu"
-                             :key='index'
-                             :style="{color: item.icon? 'inherint': '#fff',opacity:item.parent?'1':'0.6',pointerEvents:item.parent?'none':'auto'}"
-                              @click.native="changeRoute(item.path)" :index="index + ''">
-                              <i v-if="item.icon" class="iconfont" :class="item.icon"></i> {{item.name}}
+               <el-menu-item v-for="(item, index) in menu" :style="{color: item.icon? 'inherint': '#fff',opacity:item.parent?'1':'0.6'}"
+                        @click.native="changeRoute(item.path)" :index="index + ''" :key='index' disabled >
+                   <i v-if="item.icon" class="iconfont" :class="item.icon"></i> {{item.name}}
                </el-menu-item>
        </el-menu>
     </div>