优化修改密码国际化

src/assets/languages/en.json

@@ -411,12 +411,23 @@
   },
   "password": {
     "title": "Change password",
-    "Oldpassword": "Old password",
-    "inputOldpassword": "Please enter the password",
-    "newpassword": "new password",
-    "inputnewpassword": "Enter a new password",
-    "Repeatnewpassword": "Repeat",
-    "inputRepeatnewpassword": "Please enter the new password again",
+    "oldPassword": {
+      "label": "Old password",
+      "placeholder": "Please enter the password",
+      "rule": "Please enter the password"
+    },
+    "newPassword": {
+      "label": "new password",
+      "placeholder": "Enter a new password",
+      "rule": "Enter a new password",
+      "rule2": "Please enter 6-20 letters, numbers and punctuation marks"
+    },
+    "repeatPassword": {
+      "label": "Repeat",
+      "placeholder": "Please enter the new password again",
+      "rule": "Please enter the new password again",
+      "rule2": "The two passwords are inconsistent!"
+    },
     "save": "Save"
   },
   "avatar": {

src/assets/languages/zh-CN.json

 {
-
   "action": {
     "courseAction": {
       "all": "全部",
@@ -415,12 +414,19 @@
   },
   "password": {
     "title": "修改密码",
-    "Oldpassword": "旧密码",
-    "inputOldpassword": "请输入密码",
-    "newpassword": "新密码",
-    "inputnewpassword": "请输入新密码",
-    "Repeatnewpassword": "重复新密码",
-    "inputRepeatnewpassword": "请重复输入新密码",
+    "oldPassword": { "label": "旧密码", "placeholder": "请输入密码", "rule": "请输入密码" },
+    "newPassword": {
+      "label": "新密码",
+      "placeholder": "请输入新密码",
+      "rule": "请输入新密码",
+      "rule2": "请输入6-20个字母、数字及标点符号"
+    },
+    "repeatPassword": {
+      "label": "重复新密码",
+      "placeholder": "请重复输入新密码",
+      "rule": "请输入密请重复输入新密码码",
+      "rule2": "两次输入密码不一致!"
+    },
     "save": "保存"
   },
   "avatar": {

src/pages/other/setPwd.vue

@@ -5,27 +5,27 @@
       <el-row>
         <el-col :xs="24" :sm="16" :md="12" :lg="10" :xl="8">
           <el-form ref="setpwdform" label-width="160px" :model="accountSetPwd" :rules="rules">
-            <el-form-item :label="$t('password.Oldpassword')" prop="oldPwd">
+            <el-form-item :label="$t('password.oldPassword.label')" prop="oldPwd">
               <el-input
                 v-model="accountSetPwd.oldPwd"
                 type="password"
-                :placeholder="$t('password.inputOldpassword')"
+                :placeholder="$t('password.oldPassword.placeholder')"
                 @keyup.enter.native="onSubmitSetPwd"
               ></el-input>
             </el-form-item>
-            <el-form-item :label="$t('password.newpassword')" prop="newPwd">
+            <el-form-item :label="$t('password.newPassword.label')" prop="newPwd">
               <el-input
                 v-model="accountSetPwd.newPwd"
                 type="password"
-                :placeholder="$t('password.inputnewpassword')"
+                :placeholder="$t('password.newPassword.placeholder')"
                 @keyup.enter.native="onSubmitSetPwd"
               ></el-input>
             </el-form-item>
-            <el-form-item :label="$t('password.Repeatnewpassword')" prop="newPwdAgain">
+            <el-form-item :label="$t('password.repeatPassword.label')" prop="newPwdAgain">
               <el-input
                 v-model="accountSetPwd.newPwdAgain"
                 type="password"
-                :placeholder="$t('password.inputRepeatnewpassword')"
+                :placeholder="$t('password.repeatPassword.placeholder')"
                 @keyup.enter.native="onSubmitSetPwd"
               ></el-input>
             </el-form-item>
@@ -48,7 +48,7 @@ export default {
     /* 校验两次输入密码是否一致 */
     const checkNewPwd = (rule, value, callback) => {
       if (value !== this.accountSetPwd.newPwd) {
-        callback(new Error('两次输入密码不一致!'))
+        callback(new Error(this.$t('password.repeatPassword.rule2')))
       } else {
         callback()
       }
@@ -57,48 +57,19 @@ export default {
       activeName: '1',
       accountSetPwd: {},
       rules: {
-        oldPwd: [
-          {
-            required: true,
-            message: '请输入密码',
-            trigger: 'blur'
-          },
-          {
-            pattern: /^[a-zA-Z0-9_+-]{6,12}$/,
-            message: '请输入6-20个字母、数字及标点符号',
-            trigger: 'change'
-          }
-        ],
+        oldPwd: [{ required: true, message: this.$t('password.oldPassword.rule'), trigger: 'blur' }],
         newPwd: [
-          {
-            required: true,
-            message: '请输入新密码',
-            trigger: 'blur'
-          },
-          {
-            pattern: /^[a-zA-Z0-9_+-]{6,12}$/,
-            message: '请输入6-20个字母、数字及标点符号',
-            trigger: 'change'
-          }
+          { required: true, message: this.$t('password.newPassword.rule'), trigger: 'blur' },
+          { pattern: /^[a-zA-Z0-9_+-]{6,12}$/, message: this.$t('password.newPassword.rule2'), trigger: 'change' }
         ],
         newPwdAgain: [
-          {
-            required: true,
-            message: '请重复输入新密码',
-            trigger: 'blur'
-          },
-          {
-            validator: checkNewPwd,
-            trigger: 'change'
-          }
+          { required: true, message: this.$t('password.repeatPassword.rule'), trigger: 'blur' },
+          { validator: checkNewPwd, trigger: 'change' }
         ]
       }
     }
   },
   methods: {
-    handleClick(tab, event) {
-      /* console.log(tab, event) */
-    },
     onSubmitSetPwd() {
       this.$refs.setpwdform.validate(valid => {
         if (valid) {