From d1cb06d2e94683fee06c0e6df642401be627ac9f Mon Sep 17 00:00:00 2001
From: MickeyWang <1244134672@qq.com>
Date: Thu, 1 Aug 2019 15:17:33 +0800
Subject: [PATCH 1/3] update form validation error words

---
 src/common/lang/en.js                         | 11 ++++++++
 src/common/lang/zh.js                         | 11 ++++++++
 src/core/consts.js                            | 20 +++++++++++++-
 src/renderer/App.vue                          |  1 +
 .../components/Identitys/Create/BasicInfo.vue |  4 +--
 .../components/Identitys/Import/BasicInfo.vue |  4 +--
 .../JsonWallet/Create/BasicInfo.vue           |  2 +-
 .../JsonWallet/Import/BasicInfo.vue           | 26 +++++++++++--------
 .../components/JsonWallet/View/Details.vue    |  6 ++---
 src/renderer/main.js                          | 13 +++++++---
 10 files changed, 75 insertions(+), 23 deletions(-)

diff --git a/src/common/lang/en.js b/src/common/lang/en.js
index 381ebfe..09f4b40 100644
--- a/src/common/lang/en.js
+++ b/src/common/lang/en.js
@@ -49,6 +49,17 @@ export default {
     contractHash: 'Contract hash: '
   },
 
+  FormField: {
+    label: 'name',
+    password: 'password',
+    passwordConfirmation: 'password confirmation',
+    mnemonic: 'mnemonic',
+    privateKey: 'private key',
+    oldPassword: 'old password',
+    newPassword: 'new password',
+    newPasswordConfirmation: 'new password confirmation'
+  },
+
   TopNav: {
     new: 'New',
     edit: 'Edit'
diff --git a/src/common/lang/zh.js b/src/common/lang/zh.js
index d54ba12..10be3f2 100644
--- a/src/common/lang/zh.js
+++ b/src/common/lang/zh.js
@@ -49,6 +49,17 @@ export default {
     contractHash: '合约哈希：'
   },
 
+  FormField: {
+    label: '名称',
+    password: '密码',
+    passwordConfirmation: '确认密码',
+    mnemonic: '助记词',
+    privateKey: '私钥',
+    oldPassword: '旧密码',
+    newPassword: '新密码',
+    newPasswordConfirmation: '确认新的密码'
+  },
+
   TopNav: {
     new: '新建',
     edit: '编辑'
diff --git a/src/core/consts.js b/src/core/consts.js
index 72f3cb5..f6472ec 100644
--- a/src/core/consts.js
+++ b/src/core/consts.js
@@ -79,4 +79,22 @@ export const PAX_API = {
 export const PAX_SC_HASH = {
   MAIN: '6bbc07bae862db0d7867e4e5b1a13c663e2b4bc8',
   TEST: 'b06f8eaf757030c7a944ce2a072017bde1e72308'
-} 
\ No newline at end of file
+} 
+
+export const VALIDATE_DICTIONARY = {
+  zh: {
+    messages: {
+      required: (field, val) => `字段 ${field} 是必填项`,
+      min: (field, val) => `字段 ${field} 的长度不能少于${val[0]}`,
+      length: (field, val) => `字段 ${field} 的长度必须是${val[0]}`
+    },
+    attributes: {
+      password: '密码',
+      name: '名称',
+      label: '名称',
+      rePassword: '确认密码',
+      keystore: 'keystore',
+      keystorePassword: ''
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 8b1fe1f..0b5a09d 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -183,6 +183,7 @@
   .v-validate-span-errors {
     color: red;
     font-size: 12px;
+    display: block;
   }
 
   .refresh-icon {
diff --git a/src/renderer/components/Identitys/Create/BasicInfo.vue b/src/renderer/components/Identitys/Create/BasicInfo.vue
index 5d228c0..30d5529 100644
--- a/src/renderer/components/Identitys/Create/BasicInfo.vue
+++ b/src/renderer/components/Identitys/Create/BasicInfo.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="basic-label">
       <a-input class="input" :placeholder="$t('createIdentity.label')" v-model="label"
-          v-validate="{required: true}" name="label"
+          v-validate="{required: true}" name="label" 
       ></a-input>
       <span class="v-validate-span-errors" v-show="errors.has('label')">{{ errors.first('label') }}</span>
       
@@ -12,7 +12,7 @@
       <span class="v-validate-span-errors" v-show="errors.has('password')">{{ errors.first('password') }}</span>
 
       <a-input type="password" class="input input-repassword"
-               v-validate="{required: true , min:6, is:password}" data-vv-as="password confirmation" name="rePassword"
+               v-validate="{required: true , min:6, is:password}" :data-vv-as="$t('FormField.passwordConfirmation')" name="rePassword"
                v-model="rePassword" :placeholder="$t('createIdentity.rePassword')"></a-input>
       <span class="v-validate-span-errors" v-show="errors.has('rePassword')">{{ errors.first('rePassword') }}</span>
 
diff --git a/src/renderer/components/Identitys/Import/BasicInfo.vue b/src/renderer/components/Identitys/Import/BasicInfo.vue
index 416373d..5da6d89 100644
--- a/src/renderer/components/Identitys/Import/BasicInfo.vue
+++ b/src/renderer/components/Identitys/Import/BasicInfo.vue
@@ -13,12 +13,12 @@
            aria-labelledby="import-identity-keystore-pills-tab">
 
         <textarea class="import-identity-keystore" id="import-identity-keystore" rows="6"
-                  v-validate="{required: true} " data-vv-as="keystore" name="keystore"
+                  v-validate="{required: true} " name="keystore"
                   :placeholder="$t('importIdentity.keystore')" v-model="keystore"></textarea>
         <span class="v-validate-span-errors" v-show="errors.has('keystore')">{{ errors.first('keystore') }}</span>
 
         <a-input type="password" class="input input-password"
-                 v-validate="{required: true ,min:6}" data-vv-as="password" name="keystorePassword"
+                 v-validate="{required: true ,min:6}" :data-vv-as="$t('FormField.password')" name="keystorePassword"
                  v-model="keystorePassword" :placeholder="$t('importIdentity.ontidPassword')"></a-input>
         <span class="v-validate-span-errors" v-show="errors.has('keystorePassword')">{{ errors.first('keystorePassword') }}</span>
       </div>
diff --git a/src/renderer/components/JsonWallet/Create/BasicInfo.vue b/src/renderer/components/JsonWallet/Create/BasicInfo.vue
index 339cb2b..db844fb 100644
--- a/src/renderer/components/JsonWallet/Create/BasicInfo.vue
+++ b/src/renderer/components/JsonWallet/Create/BasicInfo.vue
@@ -12,7 +12,7 @@
       <span class="v-validate-span-errors" v-show="errors.has('password')">{{ errors.first('password') }}</span>
 
       <a-input type="password" class="input input-repassword"
-               v-validate="{required: true , min:6, is:password}" data-vv-as="password confirmation" name="rePassword"
+               v-validate="{required: true , min:6, is:password}" :data-vv-as="$t('FormField.passwordConfirmation')" name="rePassword"
                v-model="rePassword" :placeholder="$t('createJsonWallet.rePassword')"></a-input>
       <span class="v-validate-span-errors" v-show="errors.has('rePassword')">{{ errors.first('rePassword') }}</span>
     </div>
diff --git a/src/renderer/components/JsonWallet/Import/BasicInfo.vue b/src/renderer/components/JsonWallet/Import/BasicInfo.vue
index 5559bf2..a56ff47 100644
--- a/src/renderer/components/JsonWallet/Import/BasicInfo.vue
+++ b/src/renderer/components/JsonWallet/Import/BasicInfo.vue
@@ -155,7 +155,10 @@
     <div class="tab-content" id="pills-tabContent">
       <div class="tab-pane fade show active" id="import-json-wif-pills" role="tabpanel"
            aria-labelledby="import-json-wif-pills-tab">
-        <a-input class="input" :placeholder="$t('importJsonWallet.label')" v-model="wifLabel"></a-input>
+        <a-input class="input" :placeholder="$t('importJsonWallet.label')" 
+                v-validate="{required: true}" name="wifLabel" :data-vv-as="$t('FormField.label')"
+                v-model="wifLabel"></a-input>
+        <span class="v-validate-span-errors" v-show="errors.has('wifLabel')">{{ errors.first('wifLabel') }}</span>
 
         <a-input class="input input-wif"
                  v-validate="{required: true}" name="wif"
@@ -163,11 +166,11 @@
         <span class="v-validate-span-errors" v-show="errors.has('wif')">{{ errors.first('wif') }}</span>
 
         <a-input type="password" class="input input-password"
-                 v-validate="{required: true ,min:6}" data-vv-as="password" name="wifPassword"
+                 v-validate="{required: true ,min:6}" :data-vv-as="$t('FormField.password')" name="wifPassword"
                  v-model="wifPassword" :placeholder="$t('importJsonWallet.setPassword')"></a-input>
         <span class="v-validate-span-errors" v-show="errors.has('wifPassword')">{{ errors.first('wifPassword') }}</span>
         <a-input type="password" class="input input-repassword"
-                 v-validate="{required: true ,min:6, is:wifPassword}" data-vv-as="password confirmation"
+                 v-validate="{required: true ,min:6, is:wifPassword}"  :data-vv-as="$t('FormField.passwordConfirmation')"
                  name="wifRePassword"
                  v-model="wifRePassword" :placeholder="$t('importJsonWallet.rePassword')"></a-input>
         <span class="v-validate-span-errors"
@@ -177,15 +180,15 @@
            aria-labelledby="import-json-private-key-pills-tab">
         <a-input class="input" :placeholder="$t('importJsonWallet.label')" v-model="pkLabel"></a-input>
         <a-input class="input input-wif"
-                 v-validate="{required: true, length:64}" data-vv-as="private key" name="pk"
+                 v-validate="{required: true, length:64}" :data-vv-as="$t('FormField.privateKey')" name="pk"
                  v-model="pk" :placeholder="$t('importJsonWallet.privateKeyTip')"></a-input>
         <span class="v-validate-span-errors" v-show="errors.has('pk')">{{ errors.first('pk') }}</span>
         <a-input type="password" class="input input-password"
-                 v-validate="{required: true, min:6}" data-vv-as="password" name="pkPassword"
+                 v-validate="{required: true, min:6}" :data-vv-as="$t('FormField.password')" name="pkPassword"
                  v-model="pkPassword" :placeholder="$t('importJsonWallet.setPassword')"></a-input>
         <span class="v-validate-span-errors" v-show="errors.has('pkPassword')">{{ errors.first('pkPassword') }}</span>
         <a-input type="password" class="input input-repassword"
-                 v-validate="{required: true, min:6, is:pkPassword}" data-vv-as="password confirmation" name="pkRePassword"
+                 v-validate="{required: true, min:6, is:pkPassword}" :data-vv-as="$t('FormField.passwordConfirmation')" name="pkRePassword"
                  v-model="pkRePassword" :placeholder="$t('createJsonWallet.rePassword')"></a-input>
         <span class="v-validate-span-errors"
               v-show="errors.has('pkRePassword')">{{ errors.first('pkRePassword') }}</span>
@@ -197,7 +200,7 @@
           <a-icon type="info-circle-o" class="redeem-info-icon" />
           <span class="tip">{{$t('importJsonWallet.importFirstDefault')}}</span>
         </p>
-        <a-input class="input" :placeholder="$t('importJsonWallet.label')" v-model="datLabel" name="datLabel"
+        <a-input class="input" :placeholder="$t('importJsonWallet.label')" v-model="datLabel" name="datLabel" :data-vv-as="$t('FormField.label')"
                  v-validate="{required: true}"></a-input>
         <span class="v-validate-span-errors" v-show="errors.has('datLabel')">{{ errors.first('datLabel') }}</span>
         <a class="upload-dat-file">{{ datPath }}
@@ -205,7 +208,7 @@
         </a>
 
         <a-input type="password" class="input"
-                 v-validate="{required: true}" data-vv-as="password" name="datPassword"
+                 v-validate="{required: true}" :data-vv-as="$t('FormField.password')" name="datPassword"
                  v-model="datPassword" :placeholder="$t('importJsonWallet.datImportPassword')"></a-input>
         <span class="v-validate-span-errors" v-show="errors.has('datPassword')">{{ errors.first('datPassword') }}</span>
       </div>
@@ -215,16 +218,16 @@
         <a-input class="input" :placeholder="$t('importJsonWallet.label')" v-model="mnemonicLabel"></a-input>
 
         <textarea class="import-json-mnemonic" id="import-json-mnemonic" rows="6"
-                  v-validate="{required: true} " data-vv-as="mnemonic" name="mnemonic"
+                  v-validate="{required: true} " :data-vv-as="$t('FormField.mnemonic')" name="mnemonic"
                   :placeholder="$t('importJsonWallet.mnemonic')" v-model="mnemonic"></textarea>
         <span class="v-validate-span-errors" v-show="errors.has('mnemonic')">{{ errors.first('mnemonic') }}</span>
 
         <a-input type="password" class="input input-password"
-                 v-validate="{required: true ,min:6}" data-vv-as="password" name="mnemonicPassword"
+                 v-validate="{required: true ,min:6}" :data-vv-as="$t('FormField.password')" name="mnemonicPassword"
                  v-model="mnemonicPassword" :placeholder="$t('importJsonWallet.setPassword')"></a-input>
         <span class="v-validate-span-errors" v-show="errors.has('mnemonicPassword')">{{ errors.first('mnemonicPassword') }}</span>
         <a-input type="password" class="input input-repassword"
-                 v-validate="{required: true ,min:6, is:mnemonicPassword}" data-vv-as="password confirmation"
+                 v-validate="{required: true ,min:6, is:mnemonicPassword}" :data-vv-as="$t('FormField.passwordConfirmation')"
                  name="mnemonicRePassword"
                  v-model="mnemonicRePassword" :placeholder="$t('importJsonWallet.rePassword')"></a-input>
         <span class="v-validate-span-errors" v-show="errors.has('mnemonicRePassword')">{{ errors.first('mnemonicRePassword') }}</span>
@@ -322,6 +325,7 @@
           })
         } else if (this.tabName === 'wif') {
           this.$validator.validateAll({
+            wifLabel: this.wifLabel,
             wif: this.wif,
             wifPassword: this.wifPassword,
             wifRePassword: this.wifRePassword
diff --git a/src/renderer/components/JsonWallet/View/Details.vue b/src/renderer/components/JsonWallet/View/Details.vue
index 2f4e2a2..4863e19 100644
--- a/src/renderer/components/JsonWallet/View/Details.vue
+++ b/src/renderer/components/JsonWallet/View/Details.vue
@@ -63,21 +63,21 @@
           <div class="change-password-input">
             <div>
               <a-input type="password" class="input change-password"
-               v-validate="{required: true ,min:6}" name="oldPassword" data-vv-as="old password"
+               v-validate="{required: true ,min:6}" name="oldPassword" :data-vv-as="$t('FormField.oldPassword')"
                v-model="oldPassword" :placeholder="$t('wallets.oldPassword')"></a-input>
               <span class="v-validate-span-errors" v-show="errors.has('oldPassword')">{{ errors.first('oldPassword') }}</span>
             </div>
 
             <div>
               <a-input type="password" class="input change-password"
-               v-validate="{required: true ,min:6}" name="newPassword" data-vv-as="new password"
+               v-validate="{required: true ,min:6}" name="newPassword" :data-vv-as="$t('FormField.newPassword')"
                v-model="newPassword" :placeholder="$t('wallets.newPassword')"></a-input>
               <span class="v-validate-span-errors" v-show="errors.has('newPassword')">{{ errors.first('newPassword') }}</span>
             </div>
 
             <div>
               <a-input type="password" class="input change-password"
-                      v-validate="{required: true , min:6, is:newPassword}" data-vv-as="new password confirmation" name="reNewPassword"
+                      v-validate="{required: true , min:6, is:newPassword}" :data-vv-as="$t('newPasswordConfirmation')" name="reNewPassword"
                       v-model="reNewPassword" :placeholder="$t('wallets.reNewPassword')"></a-input>
               <span class="v-validate-span-errors" v-show="errors.has('reNewPassword')">{{ errors.first('reNewPassword') }}</span> 
             </div>
diff --git a/src/renderer/main.js b/src/renderer/main.js
index 7d42c02..4c1dfa2 100644
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -15,10 +15,17 @@ import VueClipboard from 'vue-clipboard2'
 VueClipboard.config.autoSetContainer = true // add this line
 Vue.use(VueClipboard)
 
-import VeeValidate from 'vee-validate'
-Vue.use(VeeValidate)
-
 import i18n from '../common/lang'
+import VeeValidate from 'vee-validate'
+import { VALIDATE_DICTIONARY } from '../core/consts'
+import validationMessages from 'vee-validate/dist/locale/en';
+Vue.use(VeeValidate, {
+  i18n,
+  dictionary: {
+    en: validationMessages,
+    zh: VALIDATE_DICTIONARY.zh
+  }
+})  
 import service from '../core/utils'
 Vue.prototype.httpService = service;
 

From d2dfedbd0fd85fd6b2606ca3e00b6b5728412816 Mon Sep 17 00:00:00 2001
From: MickeyWang <1244134672@qq.com>
Date: Thu, 1 Aug 2019 17:58:27 +0800
Subject: [PATCH 2/3] add redeem init pos

---
 src/common/lang/en.js                         |  7 ++-
 src/common/lang/zh.js                         |  7 ++-
 .../Node/NodeStake/NodeStakeInfo.vue          | 49 +++++++++++++++++--
 src/renderer/store/modules/NodeStake.js       | 13 +++--
 4 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/src/common/lang/en.js b/src/common/lang/en.js
index 09f4b40..5aab708 100644
--- a/src/common/lang/en.js
+++ b/src/common/lang/en.js
@@ -621,7 +621,12 @@ Within their 50% share each consensus node will receive their share according to
     profitONG: 'This is the transaction fee profit you have made. This will update at the beginning of each new consensus round.',
     getProfitPart: 'Already receiving profit portion',
     newStakePart: 'New stake portion',
-    claimableONT: 'Claimable ONT'
+    claimableONT: 'Claimable ONT',
+    redeemInitPos: 'Redeem Init Pos',
+    initPosInLock: "Locked",
+    initPosRedeemable: 'Claimable',
+    noClaimbleInitPos: 'No claimble ONT.',
+    redeemInitPosOk: 'Redeem'
 },
 exchange: {
   exchange: 'Exchange',
diff --git a/src/common/lang/zh.js b/src/common/lang/zh.js
index 10be3f2..da53f65 100644
--- a/src/common/lang/zh.js
+++ b/src/common/lang/zh.js
@@ -616,7 +616,12 @@ export default {
     profitONG: '这是您已获得的交易费收益。该收益会在每轮共识周期开始时更新。',
     getProfitPart: '产生收益中',
     newStakePart: '新的质押',
-    claimableONT: '可提取ONT'
+    claimableONT: '可提取ONT',
+    redeemInitPos: '提取初始质押',
+    initPosInLock: "锁定中",
+    initPosRedeemable: '可提取',
+    noClaimbleInitPos: '没有可提取的初始质押。',
+    redeemInitPosOk: '确认提取'
   },
   exchange: {
     exchange: 'Exchange',
diff --git a/src/renderer/components/Node/NodeStake/NodeStakeInfo.vue b/src/renderer/components/Node/NodeStake/NodeStakeInfo.vue
index 28bae15..8b58b56 100644
--- a/src/renderer/components/Node/NodeStake/NodeStakeInfo.vue
+++ b/src/renderer/components/Node/NodeStake/NodeStakeInfo.vue
@@ -46,7 +46,7 @@
 }
 .initPos-btns {
     margin:10px auto;
-    width:540px;
+    width:640px;
 }
 .initPos-btns button {
     margin-right: 20px;
@@ -119,7 +119,8 @@
                     <a-button class="add-initPos-btn" @click="handleAddInitPos">{{$t('nodeMgmt.addInitPos')}}</a-button>
                     <a-button class="add-initPos-btn" @click="handleReduceInitPos"
                     v-if="current_peer.initPos> detail.commitmentquantity"
-                    >{{$t('nodeMgmt.reduceInitPos')}}</a-button>                    
+                    >{{$t('nodeMgmt.reduceInitPos')}}</a-button>    
+                    <a-button class="add-initPos-btn" @click="()=>{this.redeemPosVisible = true;}">{{$t('nodeMgmt.redeemInitPos')}}</a-button>
             </div>
         </div>
         <div class="footer-btns">
@@ -165,6 +166,18 @@
             </div>
         </a-modal>
 
+        <a-modal
+          :title="$t('nodeMgmt.redeemInitPos')"
+          :visible="redeemPosVisible"
+          :okText="$t('nodeMgmt.redeemInitPosOk')"
+          @ok="handleRedeemPosOk"
+          @cancel="handleRedeemPosCancel">
+            <div>
+              <p class="font-medium-black">{{$t('nodeMgmt.initPosInLock')}}: {{authorizationInfo.locked}} ONT</p>
+              <p class="font-medium-black">{{$t('nodeMgmt.initPosRedeemable')}}: {{authorizationInfo.claimable}} ONT</p>
+            </div>
+        </a-modal>
+
         <a-modal 
         :title="$t('nodeStake.signWithWallet')"
         :visible="walletPassModal"
@@ -221,7 +234,10 @@ export default {
       reducePosVisible: false,
       reducePos: 0,
       validReducePos: true,
-      isDelegateSendTx:true
+      isDelegateSendTx:true,
+
+      redeemPosVisible: false,
+
     };
   },
   mounted() {
@@ -232,10 +248,16 @@ export default {
     this.$store.dispatch("fetchStakeDetail", this.stakeIdentity.ontid);
     this.$store.dispatch('fetchPeerItem', this.detail.publickey);
     this.$store.dispatch('fetchPosLimit')
+    this.$store.dispatch('fetchAuthorizationInfo', 
+      {pk: this.detail.publickey, address: this.stakeWallet.address}
+      )
     const intervalId = setInterval(() => {
       this.$store.dispatch("fetchStakeDetail", this.stakeIdentity.ontid);
       this.$store.dispatch('fetchPeerItem', this.detail.publickey);
       this.$store.dispatch('fetchPosLimit')
+      this.$store.dispatch('fetchAuthorizationInfo', 
+      {pk: this.detail.publickey, address: this.stakeWallet.address}
+      )
     }, this.interval);
     this.intervalId = intervalId
   },
@@ -259,7 +281,8 @@ export default {
       status3: state => state.NodeStake.status3,
       current: state => state.NodeStake.current,
       statusTip: state => state.NodeStake.statusTip,
-      btnText: state => state.NodeStake.btnText
+      btnText: state => state.NodeStake.btnText,
+      authorizationInfo: state => state.NodeAuthorization.authorizationInfo
     })
   },
   methods: {
@@ -512,6 +535,24 @@ export default {
     },
     handleReducePosCancel() {
       this.reducePosVisible = false;
+    },
+    handleRedeemPosOk() {
+      if(this.authorizationInfo && this.authorizationInfo.claimableVal === 0) {
+        this.$message.warning(this.$t('nodeMgmt.noClaimbleInitPos'))
+        return;
+      }
+      this.redeemPosVisible = false;
+      const userAddr = new Crypto.Address(this.stakeWallet.address);
+      const peerPubkeys = [this.detail.publickey]
+      const withdrawList = [this.authorizationInfo.claimableVal]        
+      const payer = userAddr
+      const tx = GovernanceTxBuilder.makeWithdrawTx(userAddr, peerPubkeys, withdrawList, payer, GAS_PRICE, GAS_LIMIT)
+      this.tx = tx;
+      this.walletPassModal = true;
+      this.isDelegateSendTx = false;
+    },
+    handleRedeemPosCancel() {
+      this.redeemPosVisible = false;
     }
   }
 };
diff --git a/src/renderer/store/modules/NodeStake.js b/src/renderer/store/modules/NodeStake.js
index ed552ab..02d3b58 100644
--- a/src/renderer/store/modules/NodeStake.js
+++ b/src/renderer/store/modules/NodeStake.js
@@ -3,9 +3,16 @@ import en from '../../../common/lang/en'
 import zh from '../../../common/lang/zh'
 import {ONT_PASS_NODE, ONT_PASS_NODE_PRD, ONT_PASS_URL} from '../../../core/consts'
 const state = {
-    detail: '',
-    stakeWallet: '',
-    stakeIdentity:'',
+    detail: {
+        publickey: ''
+    },
+    stakeWallet: {
+        address: '',
+        key: ''
+    },
+    stakeIdentity: {
+        ontid: ''
+    },
     status1: '',
     status2: '',
     status3: '',

From 88a104610eefddab8836339a90fa8ed929780aea Mon Sep 17 00:00:00 2001
From: MickeyWang <1244134672@qq.com>
Date: Thu, 1 Aug 2019 19:05:23 +0800
Subject: [PATCH 3/3] udpate node list url

---
 .../Node/NodeAuthorize/AuthorizationMgmt.vue  |  2 +-
 .../Node/NodeAuthorize/NodeList.vue           | 25 ++++++++---
 .../store/modules/NodeAuthorization.js        | 43 ++++++++++++++++++-
 3 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/src/renderer/components/Node/NodeAuthorize/AuthorizationMgmt.vue b/src/renderer/components/Node/NodeAuthorize/AuthorizationMgmt.vue
index fa0f7f2..1c04057 100644
--- a/src/renderer/components/Node/NodeAuthorize/AuthorizationMgmt.vue
+++ b/src/renderer/components/Node/NodeAuthorize/AuthorizationMgmt.vue
@@ -102,7 +102,7 @@
                     <span class="label font-medium-black">{{$t('nodeMgmt.inAuthorization')}}: </span>
                     <span class="font-medium">{{authorizationInfo.inAuthorization}} ONT</span>
                     <a-tooltip placement="top" :title="$t('nodeMgmt.refresh')">
-                        <span class="refresh-icon" @click="handleRefresh"><a-icon type="reload" /></span>
+                        <span class="common-icon refresh-icon" @click="handleRefresh"></span>
                     </a-tooltip>
                 </div>
                 <div>
diff --git a/src/renderer/components/Node/NodeAuthorize/NodeList.vue b/src/renderer/components/Node/NodeAuthorize/NodeList.vue
index 327960d..ea05f76 100644
--- a/src/renderer/components/Node/NodeAuthorize/NodeList.vue
+++ b/src/renderer/components/Node/NodeAuthorize/NodeList.vue
@@ -53,6 +53,12 @@
     font-size:18px;
     cursor: pointer;
 }
+.node-name {
+    /* color: #227EEC !important; */
+}
+.node-name:hover {
+    color: #227EEC !important;
+}
 </style>
 <template>
     <div>
@@ -82,7 +88,7 @@
                     <a-icon type="info-circle-o" class="proportion-info-icon" @click="showProportionTip"/>
                 </p>
                 </div>
-            <a slot="name" slot-scope="text, record" :class="record.status ===2 ? 'node-consensus' : 'node-candidate' "
+            <a slot="name" slot-scope="text, record" class="node-name" :class="record.status ===2 ? 'node-consensus' : 'node-candidate' "
                 @click="handleNodeDetail(record)">
                 
                 <a-tooltip placement="top" :title="$t('nodeMgmt.consensusNode')">
@@ -159,10 +165,16 @@ export default {
         //loop to fetch data
         // this.$store.dispatch('showLoadingModals');
         this.requesting = true;
-        this.$store.dispatch('fetchAllSortedNodeList').then(res => {
-            this.pagination.total = res.length;
-             this.fetchList()
-        })
+        const net = localStorage.getItem('net')
+        if(net === 'TEST_NET') {
+            this.$store.dispatch('fetchAllSortedNodeList').then(res => {
+                this.pagination.total = res.length;
+                this.fetchList()
+            })
+        } else {
+            this.fetchList()
+        }
+        
         this.$store.dispatch('fetchBlockCountdown')
         this.intervalId = setInterval(()=>{
             // this.$store.dispatch('fetchNodeList')
@@ -199,11 +211,12 @@ export default {
         },
         fetchList() {
             this.requesting = true;
-            this.$store.dispatch('fetchNodeList', {
+            this.$store.dispatch('fetchNodeListNew', {
                 pageSize: this.pagination.pageSize,
                 pageNum: this.pagination.current - 1
             }).then(res => {
                 this.requesting = false;
+                this.pagination.total = res;
             })
         },
         showProportionTip() {
diff --git a/src/renderer/store/modules/NodeAuthorization.js b/src/renderer/store/modules/NodeAuthorization.js
index f43a175..f463ffc 100644
--- a/src/renderer/store/modules/NodeAuthorization.js
+++ b/src/renderer/store/modules/NodeAuthorization.js
@@ -378,11 +378,50 @@ const actions = {
             
             commit('UPDATE_NODE_LIST', {list});
             dispatch('hideLoadingModals')
-            return list;
+            return list.length;
         } catch(err) {
             console.log(err) 
             dispatch('hideLoadingModals')
-            return [];
+            return 0;
+        }
+    },
+
+    async fetchNodeListNew({commit, dispatch}, {pageSize, pageNum}) {
+        const net = localStorage.getItem('net')
+        if(net === 'TEST_NET') {
+            return dispatch('fetchNodeList', {pageSize, pageNum})
+        } else {
+            try {
+                const url = 'https://explorer.ont.io/v2/nodes/current-stakes'
+                const res = await axios.get(url)
+                console.log(res)
+                if(res.data.code === 0 && res.data.result) {
+                    const result = res.data.result;
+                    const total = result.length;
+                    const list = result.slice(pageNum * pageSize, (pageNum + 1) * pageSize).map(item => {
+                        item.rank = item.node_rank;
+                        item.nodeProportion = item.node_proportion;
+                        item.currentStake = numeral(item.current_stake).format('0,0');
+                        item.process = item.progress;
+                        item.maxAuthorize = item.max_authorize;
+                        item.maxAuthorizeStr = numeral(item.max_authorize).format('0,0')
+                        item.totalPos = item.total_pos;
+                        item.initPos = item.init_pos;
+                        item.pk = item.public_key;
+                        item.detailUrl = item.detail_url;
+                        item.totalPosStr = numeral(item.totalPos).format('0,0')
+                        return item;
+                    })
+                    commit('UPDATE_NODE_LIST', {list})
+                    return total;
+                } else {
+                    return 0;
+                }
+            }catch(err) {
+                console.log(err)
+                dispatch('hideLoadingModals')
+                return 0;
+            }
         }
     },
     async fetchBlockCountdown({commit}) {