From 3e044660e75fc49461a6cf3b98df6e8234f73428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=99=B6=E6=99=B6=20=E5=BC=A0?=
 <zhangjingjing@geedgenetworks.com>
Date: Thu, 22 Jul 2021 16:59:24 +0800
Subject: [PATCH] =?UTF-8?q?CN-70=20fix=EF=BC=9A=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=81=E5=9B=BD=E9=99=85=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/rightBox/settings/I18nBox.vue | 31 +++++++++-----------
 src/components/table/settings/I18nTable.vue  |  4 +--
 src/utils/http.js                            |  1 +
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/components/rightBox/settings/I18nBox.vue b/src/components/rightBox/settings/I18nBox.vue
index 6d5ff7aa..a4d9b77c 100644
--- a/src/components/rightBox/settings/I18nBox.vue
+++ b/src/components/rightBox/settings/I18nBox.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-click-outside="{object: editObject, func: esc}" class="right-box right-box-user">
     <div class="right-box__header">
-      <div class="header__title">{{editObject.id ? $t('config.user.editUser') : $t('config.user.createUser')}}</div>
+      <div class="header__title">{{editObject.id ? $t('edit I18n') : $t('create I18n')}}</div>
       <div class="header__operation">
         <span v-cancel="{object: editObject, func: esc}"><i class="cn-icon cn-icon-close"></i></span>
       </div>
@@ -10,18 +10,18 @@
       <div class="container__form">
         <el-form ref="i18nForm" :model="editObject" :rules="editObject.id ? rules2 : rules" label-position="top" label-width="120px">
           <!--name-->
-          <el-form-item :label="$t('config.I18n.name')" prop="name">
-            <el-input id="account-input-name" v-model="editObject.name" :disabled="editObject.username==='admin' && editObject.id === 1"
+          <el-form-item :label="$t('name')" prop="name">
+            <el-input id="account-input-name" v-model="editObject.name" :disabled="editObject.name==='admin' && editObject.id === 1"
                       maxlength="64" placeholder="" show-word-limit size="small" type="text"></el-input>
           </el-form-item>
           <!--code-->
-          <el-form-item :label="$t('config.I18n.code')" prop="code">
-            <el-input id="account-input-username" v-model="editObject.code" :disabled="editObject.code==='admin' && editObject.id === 1"
+          <el-form-item :label="$t('code')" prop="code">
+            <el-input id="account-input-code" v-model="editObject.code" :disabled="editObject.code==='admin' && editObject.id === 1"
                       maxlength="64" placeholder="" show-word-limit size="small" type="text"></el-input>
           </el-form-item>
           <!--lang-->
-          <el-form-item :label="$t('config.I18n.lang')" prop="lang">
-            <el-select  placeholder="请选择"  v-model="editObject.lang" style="width:640px;">
+          <el-form-item :label="$t('lang')" prop="lang">
+            <el-select placeholder=""  v-model="editObject.lang" style="width:640px;">
               <el-option
                   v-for="item in  options"
                   :key="item.value"
@@ -34,8 +34,8 @@
                       show-word-limit size="small"  @blur="pinBlur" autocomplete="new-password"></el-input>-->
           </el-form-item>
           <!--value-->
-          <el-form-item :label="$t('config.I18n.value')" label-width="200px" prop="pinChange">
-            <el-input id="account-input-pinChange" v-model="editObject.value"  maxlength="64" placeholder=""
+          <el-form-item :label="$t('value')" label-width="200px" prop="value">
+            <el-input id="account-input-value" v-model="editObject.value"  maxlength="64" placeholder=""
                       show-word-limit size="small"></el-input>
           </el-form-item>
           <!--enable-->
@@ -83,9 +83,6 @@ export default {
       options: [{
         value: 'en',
         label: 'en'
-      }, {
-        value: 'zh',
-        label: 'zh'
       }, {
         value: 'cn',
         label: 'cn'
@@ -96,19 +93,19 @@ export default {
         name: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        username: [
+        code: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        pin: [
+        value: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       },
       rules2: { // 表单校验规则
-        username: [
+        code: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        pinChange: [
-          { validator: validatePin, trigger: 'blur' }
+        value: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       },
       roleData: []
diff --git a/src/components/table/settings/I18nTable.vue b/src/components/table/settings/I18nTable.vue
index a560bba0..c39417ed 100644
--- a/src/components/table/settings/I18nTable.vue
+++ b/src/components/table/settings/I18nTable.vue
@@ -111,12 +111,12 @@ export default {
           sortable: 'custom'
         },
         {
-          label: this.$t('config.i18n.lang'),
+          label: this.$t('lang'),
           prop: 'lang',
           show: true,
           sortable: 'custom'
         }, {
-          label: this.$t('config.i18n.value'),
+          label: this.$t('value'),
           prop: 'value',
           show: true,
           width: 150
diff --git a/src/utils/http.js b/src/utils/http.js
index c80834f6..ef327389 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -89,6 +89,7 @@ export function put (url, params, headers) {
     }).catch(err => {
       if (err.response) {
         resolve(err.response.data)
+        console.log(err)
       } else if (err.message) {
         resolve(err.message)
       }