Merge pull request #7 from bluegene1/0.4.0

Modify the prompt and version number

Author: danielgogo

package.json

@@ -1,6 +1,6 @@
 {
     "name": "Samurai",
-    "version": "0.3.4",
+    "version": "0.4.1",
     "author": "www.platon.network<support@platon.network>",
     "description": "Samurai钱包客户端",
     "license": null,
@@ -22,7 +22,7 @@
     },
     "build": {
         "productName": "Samurai",
-        "buildVersion": "0.3.1.4",
+        "buildVersion": "0.4.0.1",
         "appId": "org.simulatedgreg.electron-vue",
         "directories": {
             "output": "dist"

src/lang/zh-cn.js

@@ -133,7 +133,7 @@ export default {
         tip1:'所有普通钱包余额为0，无法创建联名钱包！',
         tip2:'请先创建普通钱包，并转入相应资产',
         incorrectAddress:'接收地址不正确',
-        insufficientBalance:'余额不足',
+        insufficientBalance:'钱包余额不足！',
         incorrectValue:'发送数量输入格式有误，请重新输入',
         transactionFailed:'交易发送失败',
         invalidSignatures:'个人签名不可用或钱包不存在',

src/less/modules/color.less

@@ -1,3 +1,12 @@
 .danger{
   color:#F32E25;
 }
+
+.warn{
+    color:#F6BA3E;
+    /deep/ .el-message__group{
+        p{
+            color:#F6BA3E;
+        }
+    }
+}

src/views/contract/list.vue

@@ -111,7 +111,9 @@
             newContract(){
                 this.getOrd().then((data)=>{
                     if(data.length == 0){
-                        this.$message.error(this.$t('contracts.walletEmpty'))
+                        this.$message.warning({
+                            message:this.$t('contracts.walletEmpty'),customClass:'warn'
+                        })
                     }else if(this.nortotalBalance == 0){
                         this.$message.error(this.$t('contracts.balanceEmpty'))
                     }else{

src/views/wallet/ord/import.vue

@@ -311,7 +311,7 @@
                         let dirPath = file.path.replace(name,'');
                         fsObj.ReadFile(dirPath, name, (err, data) => {
                             if(err){
-                                this.$message.error(this.$t('form.wrongPsw'))
+                                this.$message.warning({message:this.$t('form.wrongPsw'),customClass:'warn'})
                             }
                             if(data) {
                                 try{
@@ -328,7 +328,7 @@
                                             }else if(err == -2){
                                                 this.$message.error(this.$t('wallet.invalidFile'))
                                             }else{
-                                                this.$message.error(this.$t('form.wrongPsw'))
+                                                this.$message.warning({message:this.$t('form.wrongPsw'),customClass:'warn'})
                                             }
                                         }
                                     )
@@ -368,7 +368,8 @@
                             flag = false;
                             this.$message({
                                 message: this.$t('wallet.alreadyExits'),
-                                type: 'error'
+                                type: 'warning',
+                                customClass:'warn'
                             });
                             return
                         }

src/views/wallet/send-transcation.vue

@@ -258,12 +258,12 @@
                     this.$message.error(this.$t('wallet.sendToSelf'));
                     return;
                 }
-                if(this.walletType==1){
-                    if(mathService.sub(mathService.add(this.sendTranscation.value-0,this.sendTranscation.gas-0),this.balance)>0){
-                        this.$message.error(this.$t('wallet.insufficientBalance'));
-                        return;
-                    }
+                // if(this.walletType==1){
+                if(mathService.sub(mathService.add(this.sendTranscation.value-0,this.sendTranscation.gas-0),this.balance)>0){
+                    this.$message.warning({message:this.$t('wallet.insufficientBalance'),customClass:'warn'});
+                    return;
                 }
+                // }
                 if(!/(0x)[0-9a-fA-F]{40}$/g.test(this.sendTranscation.to)){
                     this.$message.error(this.$t('wallet.incorrectAddress'));
                     return;

src/views/wallet/share/join.vue

@@ -99,7 +99,9 @@
                                         return item.address==this.newWallet.address
                                     });
                                     if(arr.length>0){
-                                        this.$message.warning(this.$t('wallet.shareAlreadyExits'));
+                                        this.$message.warning({message:this.$t('wallet.shareAlreadyExits'),
+                                        customClass:'warn'
+                                        });
                                     }else{
                                         //执行添加共享钱包逻辑
                                         //查询签名数