Merge branch 'internationalization' into allTestUrgent

src/HDrpManagement/BrandManage/modules/edit.vue

@@ -17,7 +17,7 @@
             <uploadFile ref="upload" v-if="data.attinfos.length === 0" style="margin-top:10px" :folderid="folderid" accept=".JPG,.PNG,.jpg,.png" btntype="image" :bindData="{ownertable:'sa_brand',ownerid:form.sa_brandid,usetype:'default'}" @onSuccess="uploadSuccess"></uploadFile>
             <previewImage v-else  :image="data.attinfos[0]" :deletebtn="true"
               @onSuccess="clearCover"></previewImage>
-            <small style="display:block;margin-top:20px" class="info">{{$t(`注：建议上传图片大小1024x1024，大小不超过2M，格式为JPG/PNG`)}}</small>
+            <small style="display:block;margin-top:20px" class="info">{{$t(`注:建议上传图片大小`)}}1024x1024px，{{$t('大小不超过')}}2M，{{$t('格式为')}}JPG/PNG</small>
           </el-form-item>
         </el-form>
         <saleclass :data="data"></saleclass>

src/HDrpManagement/ProductMag/modules/add.vue

@@ -302,7 +302,7 @@
                 </uploadFile>
                 <!-- <previewImage  :image="form.attinfos[0]" :deletebtn="true"
                   @onSuccess="clearCover"></previewImage> -->
-                <small style="display:block;margin-top:20px" class="info">{{$t(`注：建议上传图片大小1024x1024，大小不超过2M，格式为JPG/PNG`)}}</small>
+                <small style="display:block;margin-top:20px" class="info">{{$t(`注:建议上传图片大小`)}}1024x1024px，{{$t('大小不超过')}}2M，{{$t('格式为')}}JPG/PNG</small>
               </el-form-item>
             </el-col>
           </el-form>

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -308,7 +308,7 @@
                   <previewImage style="margin-right: 10px;margin-bottom:10px" v-for="image in form.attinfos" :key="image.index" :image="image"  :deletebtn="true"
                               @onSuccess="clearCover"></previewImage>
                 </div>
-                <small style="display:block;margin-top:20px" class="info">{{$t(`注：建议上传图片大小1024x1024，大小不超过2M，格式为JPG/PNG`)}}</small>
+                <small style="display:block;margin-top:20px" class="info">{{$t(`注:建议上传图片大小`)}}1024x1024px，{{$t('大小不超过')}}2M，{{$t('格式为')}}JPG/PNG</small>
               </el-form-item>
             </el-col>
           </el-form>

src/HManagement/notice/list/modules/add_notice.vue

@@ -60,7 +60,7 @@
                         <upload v-else btntype="image" :folderid="folderid" accept=".JPG,.PNG"
                                 :bindData="{ ownertable: 'sat_notice', ownerid: form.sat_noticeid, usetype: 'cover' }"
                                 @onSuccess="onCoverSubmit"></upload>
-                        <p class="info">{{$t('注:建议上传图片大小')}}130x80,{{ $t('大小不超过') }}2M,{{$t('格式为')}}JPG/PNG</p>
+                        <p class="info">{{$t('注:建议上传图片大小')}}130x80px,{{ $t('大小不超过') }}2M,{{$t('格式为')}}JPG/PNG</p>
                       </el-form-item>
                     </el-col>
                   </el-form>

src/HManagement/notice/list/modules/detailed.vue

@@ -64,7 +64,7 @@
                         <upload v-else btntype="image" :folderid="folderid" accept=".JPG,.PNG"
                                 :bindData="{ ownertable: 'sat_notice', ownerid: form.sat_noticeid, usetype: 'cover' }"
                                 @onSuccess="onCoverSubmit"></upload>
-                        <p class="info">{{$t('注:建议上传图片大小')}}130x80,{{ $t('大小不超过') }}2M,{{$t('格式为')}}JPG/PNG</p>
+                        <p class="info">{{$t('注:建议上传图片大小')}}130x80px,{{ $t('大小不超过') }}2M,{{$t('格式为')}}JPG/PNG</p>
                       </el-form-item>
                     </el-col>
                   </el-form>

src/HManagement/notice/list/modules/edit.vue

@@ -73,7 +73,7 @@
                         <upload v-else btntype="image" :folderid="folderid" accept=".JPG,.PNG"
                                 :bindData="{ ownertable: 'sat_notice', ownerid: form.sat_noticeid, usetype: 'cover' }"
                                 @onSuccess="onCoverSubmit"></upload>
-                        <p class="info">{{$t('注:建议上传图片大小')}}130x80,{{ $t('大小不超过') }}2M,{{$t('格式为')}}JPG/PNG</p>
+                        <p class="info">{{$t('注:建议上传图片大小')}}130x80px,{{ $t('大小不超过') }}2M,{{$t('格式为')}}JPG/PNG</p>
                       </el-form-item>
                     </el-col>
                   </el-form>

src/HManagement/siteManage/securityConfig/modules/edit.vue

@@ -46,7 +46,7 @@
                   <img v-show="img.usetype === 'actionlogo'" v-for="img in siteinfo.attinfos" :key="img.index" style="width:100%" :src="img.url" alt="">
                 </div>
               </div>
-              <small style="display:block;margin-top:20px" class="info">{{$t('注:建议上传图片大小')}}1024x1024,{{ $t('大小不超过') }}2M,{{$t('格式为')}}JPG/PNG</small>
+              <small style="display:block;margin-top:20px" class="info">{{$t('注:建议上传图片大小')}}1024x1024px,{{ $t('大小不超过') }}2M,{{$t('格式为')}}JPG/PNG</small>
             </el-col>
           </el-form>
         </el-row>

src/HManagement/siteManage/securityConfig/modules/productImage.vue

@@ -10,7 +10,7 @@
             <!-- <img  style="width:100%" :src="image.url" alt=""> -->
             <viewImage :image="image" :deletebtn="true" @onSuccess="queryFileLink"></viewImage>
           </div>
-          <small style="display:block;margin-top:20px" class="info">{{$t('注:建议上传图片大小')}}1024x1024,{{ $t('大小不超过') }}2M,{{$t('格式为')}}JPG/PNG</small>
+          <small style="display:block;margin-top:20px" class="info">{{$t('注:建议上传图片大小')}}1024x1024px,{{ $t('大小不超过') }}2M,{{$t('格式为')}}JPG/PNG</small>
         </el-col>
       </el-row>
       <div class="dialog-footer">

src/HManagement/siteManage/securityConfig/modules/watermark.vue

@@ -10,7 +10,7 @@
             <!-- <img  style="width:100%" :src="image.url" alt=""> -->
             <viewImage :image="image" :deletebtn="true" @onSuccess="queryFileLink"></viewImage>
           </div>
-          <small style="display:block;margin-top:20px" class="info">{{$t('注:建议上传图片大小')}}1024x1024,{{ $t('大小不超过') }}2M,{{$t('格式为')}}JPG/PNG</small>
+          <small style="display:block;margin-top:20px" class="info">{{$t('注:建议上传图片大小')}}1024x1024px,{{ $t('大小不超过') }}2M,{{$t('格式为')}}JPG/PNG</small>
         </el-col>
       </el-row>
       <div class="dialog-footer">

src/WebsiteManagement/caseManage/modules/add.vue

@@ -88,7 +88,7 @@
                   @onSuccess="onCoverSubmit"
                 ></upload>
                 <p class="info">
-                  {{$t('注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG/jpg/png')}}
+                  {{$t('注:建议上传图片大小')}}130x80，{{$t('大小不超过')}}2M，{{$t('格式为')}}JPG/PNG/jpg/png
                 </p>
               </el-form-item>
             </el-col>

src/WebsiteManagement/caseManage/modules/detailInfo copy.vue

@@ -117,7 +117,7 @@
                   }"
                 ></upload>
                 <p class="info">
-                  {{$t('注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG')}}
+                  {{$t('注:建议上传图片大小')}}130x80px，{{$t('大小不超过')}}2M，{{$t('格式为')}}JPG/PNG
                 </p>
               </el-form-item>
             </el-col>

src/WebsiteManagement/caseManage/modules/detailInfo.vue

@@ -115,7 +115,7 @@
                   }"
                 ></upload>
                 <p class="info">
-                  {{$t('注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG')}}
+                  {{$t('注:建议上传图片大小')}}130x80px，{{$t('大小不超过')}}2M，{{$t('格式为')}}JPG/PNG
                 </p>
               </el-form-item>
             </el-col>

src/WebsiteManagement/caseManage/modules/edit.vue

@@ -89,7 +89,7 @@
                   @onSuccess="onCoverSubmit"
                 ></upload>
                 <p class="info">
-                  {{$t('注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG/jpg/png')}}
+                  {{$t('注:建议上传图片大小')}}130x80，{{$t('大小不超过')}}2M，{{$t('格式为')}}JPG/PNG/jpg/png
                 </p>
               </el-form-item>
             </el-col>

src/WebsiteManagement/consultManage/modules/add.vue

@@ -76,7 +76,7 @@
             @onSuccess="onCoverSubmit"
           ></upload>
           <p class="info">
-            {{$t('注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG/jpg/png')}}
+            {{$t('注:建议上传图片大小')}}130x80，{{$t('大小不超过')}}2M，{{$t('格式为')}}JPG/PNG/jpg/png
           </p>
         </div>
         <p style="font-size: 14px; margin-top: 10px">{{$t('附件上传')}}</p>

src/WebsiteManagement/consultManage/modules/detailInfo.vue

@@ -111,7 +111,7 @@
             @onSuccess="onCoverSubmit"
           ></upload>
           <p class="info">
-            {{$t('注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG')}}
+            {{$t('注:建议上传图片大小')}}130x80px，{{$t('大小不超过')}}2M，{{$t('格式为')}}JPG/PNG
           </p>
         </div>
         <p style="font-size: 14px; margin-top: 10px">{{$t('附件上传')}}</p>

src/WebsiteManagement/consultManage/modules/edit.vue

@@ -77,7 +77,7 @@
             @onSuccess="onCoverSubmit"
           ></upload>
           <p class="info">
-            {{$t('注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG/jpg/png')}}
+            {{$t('注:建议上传图片大小')}}130x80，{{$t('大小不超过')}}2M，{{$t('格式为')}}JPG/PNG/jpg/png
           </p>
         </div>
         <p style="font-size: 14px; margin-top: 10px">{{$t('附件上传')}}</p>

src/components/newLayout/modules/header.vue

@@ -71,10 +71,9 @@
           <el-dropdown-item
             v-for="item in langusge"
             :key="item.index"
-            @click.native="i18nChangeLanguage(item.languagecode)"
+            @click.native="changeLanguage(item.languagecode)"
             >{{ item.languagename }}</el-dropdown-item
           >
-          <!-- <el-dropdown-item @click.native="i18nChangeLanguage('EN')">English</el-dropdown-item> -->
         </el-dropdown-menu>
       </el-dropdown>
       <el-dropdown>
@@ -123,6 +122,11 @@
 </template>
 
 <script>
+import {
+  i18nGetResources,
+  i18nChangeLanguage,
+  i18nAddResources,
+} from "@wangeditor/editor";
 import { mapGetters } from "vuex";
 import axios from "axios";
 import Vue from "vue";
@@ -155,6 +159,31 @@ export default {
     },
   },
   methods: {
+    //修改富文本编辑器语言
+    editorChangeLanguage() {
+      console.log("zh-CN", i18nGetResources("zh-CN"));
+      const types = {
+        ZH: "zh-CN",
+        EN: "en",
+      };
+      if (types[this.nowType]) {
+        i18nChangeLanguage(types[this.nowType]);
+      } else {
+        let resources = i18nGetResources("zh-CN");
+        const handleResources = (obj) => {
+          for (const key in obj) {
+            if (typeof obj[key] == "object") {
+              handleResources(obj[key]);
+            } else {
+              obj[key] = this.$t(obj[key]);
+            }
+          }
+        };
+        handleResources(resources);
+        i18nAddResources(this.nowType, resources);
+        i18nChangeLanguage(this.nowType);
+      }
+    },
     // 选择登录账号
     async selectAccount(item) {
       let arr = ["module_info", "active_modules", "folderid"];
@@ -245,7 +274,6 @@ export default {
 
       this.$router.push({ path: clickApp[0].path });
     },
-
     async languagelist() {
       const res = await this.$api.requested({
         id: 10026401,
@@ -257,8 +285,9 @@ export default {
       this.languagename =
         this.langusge.find((v) => v.languagecode == this.nowType)
           .languagename || "简体中文";
+      this.editorChangeLanguage();
     },
-    async i18nChangeLanguage(type) {
+    async changeLanguage(type) {
       this.nowType = type;
       this.languagename =
         this.langusge.find((v) => v.languagecode == this.nowType)
@@ -266,6 +295,7 @@ export default {
       localStorage.setItem("lang", type);
       this.$nextTick(() => {
         this.$i18n.locale = type;
+        this.editorChangeLanguage();
         this.$api
           .requested({
             classname: "sysmanage.develop.userauthforweb.userauth",

src/optionSystem/attriteManage/modules/edit.vue

@@ -4,7 +4,7 @@
     <el-dialog append-to-body :visible.sync="drawer" width="500px" >
       <div slot="title" style="font-size: 15px">
          {{ $t('自定义分类') }}/
-        <el-tag size="mini" >{{classname}}</el-tag>
+        <el-tag size="mini" >{{$t(classname)}}</el-tag>
       </div>
       <div>
         <el-row :gutter="20">

src/views/message/index.vue

@@ -288,7 +288,6 @@ export default {
     },
 
     isCategory(data) {
-      console.log("sessionStorage.getItem('module_info')",sessionStorage.getItem('module_info'))
       JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
         item1.modules.forEach(item2 => {
           item2.apps.forEach(item3 => {