Merge branch 'yh319' into debug

src/lang/modules/Slides/pptPresent.js

@@ -10,9 +10,9 @@ export const presentEn = {
   default_size: "(Default)",
   return_to_list: "Return to list",
   default_publish: " Publish",
-  select_cover_page: "Select cover page",
+  select_cover_page: "Replace cover page",
   select_ground_page: "Replace background image",
-  select_back_page: "Replace the back cover image",
+  select_back_page: "Select the back cover image",
   more_cover_page: "More templates for cover images",
   more_templates:'More templates',
   operating_instructions: "Operating instructions",
@@ -120,9 +120,9 @@ export const presentZh = {
   default_size: "(默认)",
   return_to_list: "返回列表",
   default_publish: "（默认）发布",
-  select_cover_page: "选择封面页",
+  select_cover_page: "更换封面页",
   select_ground_page: "更换背景图",
-  select_back_page: "更换封底图",
+  select_back_page: "选择封底图",
   more_cover_page: "封面图更多模板",
   more_templates: "更多模板",
   operating_instructions: "操作说明",

src/views/ppt_manage/newVersion/components/selectImage.vue

@@ -50,7 +50,7 @@ export default {
     },
     data() {
         return {
-            momentChooseId: '',
+            momentChooseId: 0,
             momentChooseUrl: '',
             total: 0,
             list: [],
@@ -126,7 +126,7 @@ export default {
             }).then(res => {
                 this.list = res.Data ? res.Data.List : []
                 this.total = res.Data ? res.Data.Paging.Totals : 0
-                if (!this.momentChooseId) {
+                if (!this.momentChooseId&&this.imgType!=3) {
                     if (this.list.length) {
                         this.momentChooseId = this.list[0].ImageConfId
                         this.momentChooseUrl = this.list[0].Url
@@ -141,13 +141,14 @@ export default {
         },
         // 打开弹框
         showHandle(type, id, url) {
+            // console.log(type, id, url)
             this.showDialog = true
-            this.momentChoose = ''
-            this.momentChooseUrl = ''
             this.imgType = type
             this.keyword = ''
-            this.momentChooseId = id
-            this.momentChooseUrl = url
+            if (type != 3) {
+                this.momentChooseId = id
+                this.momentChooseUrl = url
+            }
             this.handleSearch()
         },
         // 关闭弹窗

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -567,7 +567,7 @@ export default {
     },
     // 选择图片保存
     saveChooseImage(item){
-        console.log(item)
+        // console.log(item)
         const key={
             1:'BackgroundImg',
             2:'CurrentBackgroundImg',