gemercheung 2 gadi atpakaļ
vecāks
revīzija
02d1b404ac

+ 1 - 1
packages/qjkankan-editor/.env.testprod

@@ -7,4 +7,4 @@ VUE_APP_PROXY_URL_ROOT='https://test.4dkankan.com'
 VUE_APP_PROXY_URL='https://test.4dkankan.com/qjkankan/'
 VUE_APP_ORIGIN=
 VUE_APP_URL_FILL=/qjkankan
-VUE_APP_DEBBUG_FLAG=0423-03
+VUE_APP_DEBBUG_FLAG=0425-01

+ 1 - 0
packages/qjkankan-editor/src/lang/_en.json

@@ -915,6 +915,7 @@
     "change_pdf": "更换PDF",
     "pdf_invalid_tip": "请选择50MB以内、PDF格式的文件",
     "add_article": "添加文章内容",
+    "edit_article":"编辑文章内容",
     "cancel_add_hotspot": "已编辑内容将不会保存,确定要关闭吗?"
   },
   "explanation": {

+ 1 - 0
packages/qjkankan-editor/src/lang/_zh.json

@@ -919,6 +919,7 @@
     "change_pdf": "更换PDF",
     "pdf_invalid_tip": "请选择50MB以内、PDF格式的文件",
     "add_article": "添加文章内容",
+    "edit_article":"编辑文章内容",
     "cancel_add_hotspot": "已编辑内容将不会保存,确定要关闭吗?"
 
   },

+ 5 - 9
packages/qjkankan-editor/src/views/hotspot/hotspotType/imageText.vue

@@ -129,6 +129,10 @@ export default {
     },
     onImageSelected(data) {
       this.hotspot.imageTextInfo.imageList = this.hotspot.imageTextInfo.imageList.concat(data)
+      if (this.hotspot.imageTextInfo.imageList.length > 20) {
+        this.$alert({ content: this.$i18n.t("hotspot.img_size") });
+        this.hotspot.imageTextInfo.imageList.length = 20;
+      }
       this.isShowImageSelect = false
     },
     onEditorChange(content) {
@@ -144,21 +148,13 @@ export default {
         this.$refs['my-audio'].switchPlayPause()
       }
     },
+
     onAudioSelected(data){
       console.log('sadf', data);
       this.hotspot.imageTextInfo.audio = {...data[0]}
       this.isShowAudioSelect = false
     },
   },
-  watch: {
-    'hotspot.imageTextInfo.imageList': {
-      handler(newVal) {
-        if (newVal.length > 20) {
-          return this.$alert({ content: this.$i18n.t('hotspot.img_size') });
-        }
-      }
-    },
-  }
 }
 </script>
 

+ 1 - 1
packages/qjkankan-editor/src/views/material/style.less

@@ -176,7 +176,7 @@
       }
     }
     .upload-task-list {
-      z-index: 1;
+      z-index: 100000;
       position: absolute;
       right: 0;
       bottom: 32px;

+ 2 - 0
packages/qjkankan-view/src/components/assembly/OpeningMobile.vue

@@ -27,6 +27,8 @@
       x5-playsinline="true"
       playsinline="true"
       webkit-playsinline="true"
+      x5-video-orientation="portraint"
+      x5-video-player-fullscreen="true"
       class="video"
       ref="openvideo$"
       preload