diff --git a/src/common/lang/en.js b/src/common/lang/en.js index a734cd5..3a2957d 100644 --- a/src/common/lang/en.js +++ b/src/common/lang/en.js @@ -749,7 +749,7 @@ Within their 50% share each consensus node will receive their share according to submit: 'Submit', updateSuccess: 'Update node info succeed', updateFailed: 'Update node info failed', - ledgerWalletNotSupportForNow: 'Nodes registered with ledger currently do not support updating node-related information ' + ledgerWalletNotSupportForNow: 'Nodes registered with ledger currently do not support updating node-related information. Please email to: ' }, exchange: { exchange: 'Exchange', diff --git a/src/common/lang/zh.js b/src/common/lang/zh.js index 313f58a..0470bae 100644 --- a/src/common/lang/zh.js +++ b/src/common/lang/zh.js @@ -744,7 +744,7 @@ export default { submit: '提交', updateSuccess: '更新成功', updateFailed: '更新失败', - ledgerWalletNotSupportForNow: '使用Ledger注册的节点,暂时不支持更新节点相关信息' + ledgerWalletNotSupportForNow: '使用Ledger注册的节点,暂时不支持更新节点相关信息.请发送邮件至:' }, exchange: { exchange: 'Exchange', diff --git a/src/renderer/components/Common/SignSendTx.vue b/src/renderer/components/Common/SignSendTx.vue index 37c4b80..c183b69 100644 --- a/src/renderer/components/Common/SignSendTx.vue +++ b/src/renderer/components/Common/SignSendTx.vue @@ -49,12 +49,20 @@ export default { }, mounted(){ - if(!this.wallet.key) {//common wallet - this.$store.dispatch('getLedgerStatus') + + }, + watch: { + visible(newV, oldV) { + if(newV) { + if(!this.wallet.key) {//common wallet + this.$store.dispatch('getLedgerStatus') + } + } else { + this.$store.dispatch('stopGetLedgerStatus') + } } }, beforeDestroy() { - clearInterval(this.intervalId); this.$store.dispatch('stopGetLedgerStatus') }, data(){ @@ -102,9 +110,11 @@ export default { const signature = pri.sign(tx) this.$store.dispatch("hideLoadingModals"); this.$emit('afterSign', signature) // 返回签名message结果 + this.walletPassword = '' } else { TransactionBuilder.signTransaction(tx, pri); this.sendTx(tx); + this.walletPassword = '' } } else { @@ -122,7 +132,6 @@ export default { }, err => { this.sending = false; - this.ledgerStatus = ""; this.$store.dispatch("hideLoadingModals"); this.$message.error(this.$t('ledgerWallet.signFailed')) } @@ -143,7 +152,6 @@ export default { }, err => { this.sending = false; - this.ledgerStatus = ""; this.$store.dispatch("hideLoadingModals"); this.$message.error(this.$t('ledgerWallet.signFailed')) } diff --git a/src/renderer/components/Node/NodeApply/Register.vue b/src/renderer/components/Node/NodeApply/Register.vue index a309599..0dc8e16 100644 --- a/src/renderer/components/Node/NodeApply/Register.vue +++ b/src/renderer/components/Node/NodeApply/Register.vue @@ -183,6 +183,7 @@ export default { return; } this.current += 1; + this.$store.dispatch('stopGetLedgerStatus') // 防止过多ledger请求 }, cancel() { this.current -= 1; diff --git a/src/renderer/components/Node/NodeStake/NodeInfo.vue b/src/renderer/components/Node/NodeStake/NodeInfo.vue index c340405..51c973b 100644 --- a/src/renderer/components/Node/NodeStake/NodeInfo.vue +++ b/src/renderer/components/Node/NodeStake/NodeInfo.vue @@ -1,7 +1,10 @@