Merge pull request #138 from xyzshen/dev

Dev
WeBankBlockchain · Dec 20, 2019 · 03a94fb · 03a94fb
2 parents ecb90ee + 401db80
commit 03a94fb
Show file tree

Hide file tree

Showing 52 changed files with 294 additions and 239 deletions.
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.5f382d4bbdce165a10a1.js></script><script type=text/javascript src=./static/js/3.9c092f672f77b90833bc.js></script><script type=text/javascript src=./static/js/runtime.3b3ce3a07b1ffbe27563.js></script><script type=text/javascript src=./static/js/5.a3fd349a55a77c83539a.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.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) {
         var antiClickjack = document.getElementById("antiClickjack");
         antiClickjack.parentNode.removeChild(antiClickjack);
     } else {

diff --git a/dist/static/js/0.3f65ef61a61bc77183ed.js b/dist/static/js/0.3f65ef61a61bc77183ed.js
diff --git a/dist/static/js/0.5f382d4bbdce165a10a1.js b/dist/static/js/0.5f382d4bbdce165a10a1.js
diff --git a/dist/static/js/1.bdf9cd411a9fe9f2573e.js → dist/static/js/1.60152a8a1377e2ee6ae0.js b/dist/static/js/1.bdf9cd411a9fe9f2573e.js → dist/static/js/1.60152a8a1377e2ee6ae0.js
diff --git a/dist/static/js/10.d5f33bf12ea552a7bce8.js → dist/static/js/10.2f52dfbe96836b0e67ae.js b/dist/static/js/10.d5f33bf12ea552a7bce8.js → dist/static/js/10.2f52dfbe96836b0e67ae.js
diff --git a/dist/static/js/11.fa8994f499b2865d3f4b.js → dist/static/js/11.e1a42e23deda055eb130.js b/dist/static/js/11.fa8994f499b2865d3f4b.js → dist/static/js/11.e1a42e23deda055eb130.js
diff --git a/dist/static/js/12.0f5df32718484b6ebd93.js → dist/static/js/12.8b3ae72b1f658bba13a9.js b/dist/static/js/12.0f5df32718484b6ebd93.js → dist/static/js/12.8b3ae72b1f658bba13a9.js
diff --git a/dist/static/js/13.ddf6d5214511b247737c.js → dist/static/js/13.898ac4a2ae62aaafe374.js b/dist/static/js/13.ddf6d5214511b247737c.js → dist/static/js/13.898ac4a2ae62aaafe374.js
diff --git a/dist/static/js/14.485c4ff30beccdd2335f.js → dist/static/js/14.85f90966b442e68a64a6.js b/dist/static/js/14.485c4ff30beccdd2335f.js → dist/static/js/14.85f90966b442e68a64a6.js
diff --git a/dist/static/js/15.6006d3a3bc0143bf6c65.js → dist/static/js/15.42e4aec82d74043fb0bd.js b/dist/static/js/15.6006d3a3bc0143bf6c65.js → dist/static/js/15.42e4aec82d74043fb0bd.js
diff --git a/dist/static/js/16.45b2609a21876fa0b0f7.js → dist/static/js/16.007635f0b3c902ee247f.js b/dist/static/js/16.45b2609a21876fa0b0f7.js → dist/static/js/16.007635f0b3c902ee247f.js
diff --git a/dist/static/js/17.83a643092bd942df57cc.js → dist/static/js/17.0cc2b9a289e7ec958d62.js b/dist/static/js/17.83a643092bd942df57cc.js → dist/static/js/17.0cc2b9a289e7ec958d62.js
diff --git a/dist/static/js/18.3473b095bafc2cee3615.js → dist/static/js/18.3945440d3d97f3506c41.js b/dist/static/js/18.3473b095bafc2cee3615.js → dist/static/js/18.3945440d3d97f3506c41.js
diff --git a/dist/static/js/19.d5e4856298eadcb5d3bb.js → dist/static/js/19.9ffc7752e9f1cb473806.js b/dist/static/js/19.d5e4856298eadcb5d3bb.js → dist/static/js/19.9ffc7752e9f1cb473806.js
diff --git a/dist/static/js/2.47ca19f2d105f99a5173.js → dist/static/js/2.249d2d917e221138707a.js b/dist/static/js/2.47ca19f2d105f99a5173.js → dist/static/js/2.249d2d917e221138707a.js
diff --git a/dist/static/js/20.731da7c446680d44770f.js → dist/static/js/20.5894b4932f3874fe45a7.js b/dist/static/js/20.731da7c446680d44770f.js → dist/static/js/20.5894b4932f3874fe45a7.js
diff --git a/dist/static/js/21.db99a59e7e8a32f2a53b.js → dist/static/js/21.e76354ad117c355b45dd.js b/dist/static/js/21.db99a59e7e8a32f2a53b.js → dist/static/js/21.e76354ad117c355b45dd.js
diff --git a/dist/static/js/22.80b65ea7c720c12e8dea.js → dist/static/js/22.c879a35a3040e6d5f667.js b/dist/static/js/22.80b65ea7c720c12e8dea.js → dist/static/js/22.c879a35a3040e6d5f667.js
diff --git a/dist/static/js/23.d7da9f34f28bda878088.js → dist/static/js/23.7b5c1c73c43e4e7a4cc9.js b/dist/static/js/23.d7da9f34f28bda878088.js → dist/static/js/23.7b5c1c73c43e4e7a4cc9.js
diff --git a/dist/static/js/24.e770e413d43dde1fab1e.js → dist/static/js/24.b0793608bcddc82676bb.js b/dist/static/js/24.e770e413d43dde1fab1e.js → dist/static/js/24.b0793608bcddc82676bb.js
diff --git a/dist/static/js/25.76691b37637b0f8eb02d.js → dist/static/js/25.d470858cfadad36532a7.js b/dist/static/js/25.76691b37637b0f8eb02d.js → dist/static/js/25.d470858cfadad36532a7.js
diff --git a/dist/static/js/26.f5d474978f9e3e9ccfcc.js → dist/static/js/26.a0262059698c40296307.js b/dist/static/js/26.f5d474978f9e3e9ccfcc.js → dist/static/js/26.a0262059698c40296307.js
diff --git a/dist/static/js/27.d1af47f00db61d00f983.js → dist/static/js/27.32dce336945d105909cd.js b/dist/static/js/27.d1af47f00db61d00f983.js → dist/static/js/27.32dce336945d105909cd.js
diff --git a/dist/static/js/28.799780cfb2e47341d0c0.js → dist/static/js/28.ca5bd54b58b3807228b2.js b/dist/static/js/28.799780cfb2e47341d0c0.js → dist/static/js/28.ca5bd54b58b3807228b2.js
diff --git a/dist/static/js/29.6bb0651f21659237c629.js → dist/static/js/29.67242f03d1a148c9e81b.js b/dist/static/js/29.6bb0651f21659237c629.js → dist/static/js/29.67242f03d1a148c9e81b.js
diff --git a/dist/static/js/3.5c960abf693ec7e03ff0.js b/dist/static/js/3.5c960abf693ec7e03ff0.js
diff --git a/dist/static/js/3.9c092f672f77b90833bc.js b/dist/static/js/3.9c092f672f77b90833bc.js
diff --git a/dist/static/js/30.0dc4d992e9331936b9e9.js → dist/static/js/30.959e4c2399896205be2a.js b/dist/static/js/30.0dc4d992e9331936b9e9.js → dist/static/js/30.959e4c2399896205be2a.js
diff --git a/dist/static/js/5.19a6f88148f8266d07b4.js b/dist/static/js/5.19a6f88148f8266d07b4.js
diff --git a/dist/static/js/5.a3fd349a55a77c83539a.js b/dist/static/js/5.a3fd349a55a77c83539a.js
diff --git a/dist/static/js/6.312279e4a1e186dc40e9.js b/dist/static/js/6.312279e4a1e186dc40e9.js
diff --git a/dist/static/js/6.c2382be11c4754a725a0.js b/dist/static/js/6.c2382be11c4754a725a0.js
diff --git a/dist/static/js/7.64f96e5fff2e75172fd2.js → dist/static/js/7.1d1fd4670db1d2346d85.js b/dist/static/js/7.64f96e5fff2e75172fd2.js → dist/static/js/7.1d1fd4670db1d2346d85.js
diff --git a/dist/static/js/8.8e99c54719d90fcef799.js → dist/static/js/8.aeeb1267244f9a4ab89e.js b/dist/static/js/8.8e99c54719d90fcef799.js → dist/static/js/8.aeeb1267244f9a4ab89e.js
diff --git a/dist/static/js/9.c24429ac818b3dbc88c4.js → dist/static/js/9.fcb7a00d3ab3e66da45e.js b/dist/static/js/9.c24429ac818b3dbc88c4.js → dist/static/js/9.fcb7a00d3ab3e66da45e.js
diff --git a/dist/static/js/runtime.3b3ce3a07b1ffbe27563.js b/dist/static/js/runtime.3b3ce3a07b1ffbe27563.js
diff --git a/dist/static/js/runtime.84bc8915eb5048723ed0.js b/dist/static/js/runtime.84bc8915eb5048723ed0.js
diff --git a/src/components/changePasswordDialog.vue b/src/components/changePasswordDialog.vue
@@ -15,19 +15,19 @@
  */
 <template>
     <div>
-        <el-form :model="rulePasswordForm" status-icon :rules="rules2" ref="rulePasswordForm" label-width="100px" class="demo-ruleForm">
-            <el-form-item label="旧密码" prop="oldPass">
+        <el-form :model="rulePasswordForm" status-icon :rules="rules2" ref="rulePasswordForm" label-width="130px" class="demo-ruleForm">
+            <el-form-item :label="$t('main.oldPassword')" prop="oldPass">
                 <el-input type="password" v-model="rulePasswordForm.oldPass" autocomplete="off"></el-input>
             </el-form-item>
-            <el-form-item label="新密码" prop="pass">
+            <el-form-item :label="$t('main.newPassword')" prop="pass">
                 <el-input type="password" v-model="rulePasswordForm.pass" autocomplete="off"></el-input>
             </el-form-item>
-            <el-form-item label="确认密码" prop="checkPass">
+            <el-form-item :label="$t('main.confirmPassword')" prop="checkPass">
                 <el-input type="password" v-model="rulePasswordForm.checkPass" autocomplete="off"></el-input>
             </el-form-item>
             <el-form-item>
-                <el-button type="primary" @click="submitForm('rulePasswordForm')">提交</el-button>
-                <el-button @click="resetForm('rulePasswordForm')">重置</el-button>
+                <el-button type="primary" @click="submitForm('rulePasswordForm')">{{$t('main.submit')}}</el-button>
+                <el-button @click="resetForm('rulePasswordForm')">{{$t('main.reset')}}</el-button>
             </el-form-item>
         </el-form>
     </div>
@@ -42,7 +42,7 @@ export default {
     data() {
         var validatePass = (rule, value, callback) => {
             if (value === "") {
-                callback(new Error("请输入密码"));
+                callback(new Error(this.$t('main.inputPassword')));
             } else {
                 if (this.rulePasswordForm.checkPass !== "") {
                     this.$refs.rulePasswordForm.validateField("checkPass");
@@ -52,9 +52,9 @@ export default {
         };
         var validatePass2 = (rule, value, callback) => {
             if (value === "") {
-                callback(new Error("请再次输入密码"));
+                callback(new Error(this.$t('main.againPassword')));
             } else if (value !== this.rulePasswordForm.pass) {
-                callback(new Error("两次输入密码不一致!"));
+                callback(new Error(this.$t('main.passwordError')));
             } else {
                 callback();
             }
@@ -69,13 +69,13 @@ export default {
                 oldPass: [
                     {
                         required: true,
-                        message: "请输入旧密码",
+                        message: this.$t('main.inputOldPassword'),
                         trigger: "blur"
                     },
                     {
                         min: 6,
                         max: 12,
-                        message: "长度在 6 到 12 个字符",
+                        message:  this.$t('main.longPassword'),
                         trigger: "blur"
                     }
                 ],
@@ -88,12 +88,12 @@ export default {
                     {
                         min: 6,
                         max: 12,
-                        message: "长度在 6 到 12 个字符",
+                        message: this.$t('main.longPassword'),
                         trigger: "blur"
                     },
                     {
                         pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{6,12}$/,
-                        message: "字母,数字组成,且至少包含一个大写字母和一个小写字母",
+                        message: this.$t('main.passwordPattern'),
                         trigger: "blur"
                     }
                 ],
@@ -106,7 +106,7 @@ export default {
                     {
                         min: 6,
                         max: 12,
-                        message: "长度在 6 到 12 个字符",
+                        message: this.$t('main.longPassword'),
                         trigger: "blur"
                     }
                 ]
@@ -138,7 +138,7 @@ export default {
                     if (res.data.code === 0) {
                         this.$message({
                             type: "success",
-                            message: "密码修改成功"
+                            message: this.$t('main.updatePsdSuccess')
                         });
                         this.rulePasswordForm =  {
                             oldPass: "",
@@ -158,7 +158,7 @@ export default {
                 .catch(err => {
                     this.$message({
                         type: "error",
-                        message: "密码修改失败"
+                        message: this.$t('text.systemError'),
                     });
                 });
         }

diff --git a/src/components/contentHead.vue b/src/components/contentHead.vue
@@ -22,7 +22,7 @@
             <span :class="{ 'font-color-9da2ab': headSubTitle}">{{title}}</span>
             <span v-show="headSubTitle" class="font-color-9da2ab">/</span>
             <span>{{headSubTitle}}</span>
-            <el-tooltip effect="dark"  placement="bottom-start" v-if="headTooltip">
+            <el-tooltip effect="dark"  placement="bottom-start" v-if="headTooltip" offset='0'>
                  <div slot="content">{{headTooltip}}</div>
                 <i class="el-icon-info contract-icon font-15" ></i>
             </el-tooltip>
@@ -55,7 +55,7 @@
         <div class="content-head-lang">
             <lang-select class="right-menu-item hover-effect" />
         </div>
-        <el-dialog title="修改密码" :visible.sync="changePasswordDialogVisible" width="30%" style="text-align: center;">
+        <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>
         <!-- <v-dialog v-if="dialogShow" :show="dialogShow" @success="changeNetwork" @close='close' @changGroupSucess="changGroupSucess"></v-dialog> -->