Merge pull request #139 from xyzshen/dev

en/zh bugs
WeBankBlockchain · Dec 20, 2019 · 23bbe7d · 23bbe7d
2 parents 03a94fb + 2ea74ca
commit 23bbe7d
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 27 deletions.
diff --git a/dist/dist.zip b/dist/dist.zip
diff --git a/dist/index.html b/dist/index.html
@@ -11,7 +11,7 @@
             vertical-align: -0.15em;
             fill: currentColor;
             overflow: hidden;
-        }</style></head><body><body><div id=app style="height: 100% !important;"></div><script type=text/javascript src=./static/js/0.3f65ef61a61bc77183ed.js></script><script type=text/javascript src=./static/js/3.5c960abf693ec7e03ff0.js></script><script type=text/javascript src=./static/js/runtime.84bc8915eb5048723ed0.js></script><script type=text/javascript src=./static/js/5.19a6f88148f8266d07b4.js></script></body><script src=./static/js/web3.min.js type=text/javascript></script><script>if (self == top) {
+        }</style></head><body><body><div id=app style="height: 100% !important;"></div><script type=text/javascript src=./static/js/0.465a5817238a165bef22.js></script><script type=text/javascript src=./static/js/3.541d9571b914c9a2b006.js></script><script type=text/javascript src=./static/js/runtime.84bc8915eb5048723ed0.js></script><script type=text/javascript src=./static/js/5.19a6f88148f8266d07b4.js></script></body><script src=./static/js/web3.min.js type=text/javascript></script><script>if (self == top) {
         var antiClickjack = document.getElementById("antiClickjack");
         antiClickjack.parentNode.removeChild(antiClickjack);
     } else {

diff --git a/dist/static/js/0.3f65ef61a61bc77183ed.js → dist/static/js/0.465a5817238a165bef22.js b/dist/static/js/0.3f65ef61a61bc77183ed.js → dist/static/js/0.465a5817238a165bef22.js
diff --git a/dist/static/js/3.541d9571b914c9a2b006.js b/dist/static/js/3.541d9571b914c9a2b006.js
diff --git a/dist/static/js/3.5c960abf693ec7e03ff0.js b/dist/static/js/3.5c960abf693ec7e03ff0.js
diff --git a/src/components/contentHead.vue b/src/components/contentHead.vue
@@ -52,9 +52,9 @@
                 </a>
             </el-popover>
         </div>
-        <div class="content-head-lang">
+        <!-- <div class="content-head-lang">
             <lang-select class="right-menu-item hover-effect" />
-        </div>
+        </div> -->
         <el-dialog :title="$t('head.changePassword')" :visible.sync="changePasswordDialogVisible" width="30%" style="text-align: center;">
             <change-password-dialog @success="success"></change-password-dialog>
         </el-dialog>

diff --git a/src/lang/en.js b/src/lang/en.js
@@ -4,13 +4,13 @@ export default {
         password: "Password",
         verificationCode: "Verification Code",
         login: "Login",
-        guomi: "sm3",
-        hash: "hash"
+        guomi: "GM",
+        hash: "Normal"
     },
     inputText: {
         user: "Please User",
         password: "Please Password",
-        verificationCode: "Please verificationCode",
+        verificationCode: "Verification Code",
         blockInput: "Search by Block / Txn Hash",
         contractSearch: "Please enter the contract name or address",
         transactionSearch: "Search by Block / Txn Hash"
@@ -147,7 +147,7 @@ export default {
         createTime: "Create Time"
     },
     nodes: {
-        nodeFront: "Fron Node",
+        nodeFront: "Front Node",
         addFront: "Add",
         frontId: "Front ID",
         ip: "IP",
@@ -345,7 +345,7 @@ export default {
         confirm: "Confirm",
         addFrontInfo: "Add Front Information",
         blockHeight: "Block Height",
-        pendingCount: "Number of transactions to be packaged",
+        pendingCount: "Pending Transactions",
         dateFormat: "dd-MM-yyyy",
         dateLabel: "dd-MM-yyyy",
         startTime: "Start Time",

diff --git a/src/lang/zh.js b/src/lang/zh.js
@@ -5,7 +5,7 @@ export default {
         verificationCode: "验证码",
         login: "登录",
         guomi: "国密",
-        hash: "非国密"
+        hash: "普通"
     },
     inputText: {
         user: "请输入账号",

diff --git a/src/views/home/components/chart.vue b/src/views/home/components/chart.vue
@@ -79,8 +79,8 @@ export default {
                             data[0].name +
                             '</span><br><table ><tr><td style="padding:0">' +
                             '<span style="font-size:10px;color:white">' + that.$t("home.chartTransactions") + '：' +
-                            data[0].value +
-                            "笔</a></span><br></td></tr></table>"
+                            data[0].value + that.$t('transaction.stroke') +
+                            "</a></span><br></td></tr></table>"
                         );
                     }
                 },

diff --git a/src/views/login/login.vue b/src/views/login/login.vue
@@ -19,7 +19,7 @@
             <lang-select class="right-menu-item hover-effect"></lang-select>
         </div>
         <div class="login-encrypt">
-            <el-radio-group v-model="encryption" @change="handleEncryption" size="mini" style="width: 190px">
+            <el-radio-group v-model="encryption" @change="handleEncryption" size="mini">
                 <el-radio-button label="hash">{{$t('login.hash')}}</el-radio-button>
                 <el-radio-button label="guomi">{{$t('login.guomi')}}</el-radio-button>
             </el-radio-group>
@@ -276,7 +276,7 @@ export default {
     position: absolute;
     width: 430px;
     /* height: 460px; */
-    top: 50%;
+    top: 52%;
     left: 70%;
     margin-top: -280px;
     margin-left: -201px;
@@ -367,14 +367,16 @@ export default {
     text-align: left;
 }
 .login-lang{
-    position: relative;
-    left: 86%;
+    position: absolute;
+    right: 10px;
     top: 20px;
+    min-width: 160px;
 }
 .login-encrypt{
-    position: relative;
-    left: 86%;  
-    top: 30px;
+    position: absolute;
+    right: 10px;
+    top: 60px;
+    min-width: 160px;
 }
 .login-encrypt .el-radio-button__inner{
     display: inline-block;

diff --git a/src/views/permission/index.vue b/src/views/permission/index.vue
@@ -118,13 +118,9 @@ export default {
         },
         preRivateKeyHead() {
             let data = [
-                {
-                    enName: "table_name",
-                    name: this.$t("system.tableName")
-                },
                 // {
                 //     enName: "table_name",
-                //     name: "表名称"
+                //     name: this.$t("system.tableName")
                 // },
                 {
                     enName: "address",