update

packages/qjkankan-editor/.env.testdev

@@ -6,4 +6,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=
-VUE_APP_DEBBUG_FLAG=0423-01
+VUE_APP_DEBBUG_FLAG=0423-02

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-01
+VUE_APP_DEBBUG_FLAG=0423-02

packages/qjkankan-editor/src/lang/_en.json

@@ -609,7 +609,7 @@
     "serch_material": "Search",
     "rename": "Rename",
     "delete": "Delete",
-    "no_serch_result": "No resulrs found",
+    "no_serch_result": "No results found",
     "no_material_result": "No materials found",
     "had_load": "{msg} pieces of data have been loaded",
     "uploading": "Uploading {msg}",
@@ -689,7 +689,7 @@
     "coverVideoTit":"视频设置",
     "select_video":"选择视频",
     "coverImgInWay":"进入方式",
-    "coverImgInWayTit":"是否开启3秒倒计后自动进入",
+    "coverImgInWayTit":"是否开启3秒倒计时后自动进入",
     "coverVideoInWay":"进入方式",
     "coverVideoInWayTit":"视频播放完自动进入",
     "coverVideoControl":"视频控件",

packages/qjkankan-editor/src/lang/_zh.json

@@ -691,7 +691,7 @@
     "coverVideoTit":"视频设置",
     "select_video":"选择视频",
     "coverImageInWay":"进入方式",
-    "coverImageInWayTit":"是否开启3秒倒计后自动进入",
+    "coverImageInWayTit":"是否开启3秒倒计时后自动进入",
     "coverVideoInWay":"进入方式",
     "coverVideoInWayTit":"视频播放完自动进入",
     "coverVideoControl":"视频控件",

packages/qjkankan-view/src/components/assembly/Opening.vue

@@ -65,10 +65,10 @@
     }"
   >
     <div
-      @click="closeImg"
+      @click="jumpImage"
       class="image-front"
       :style="{
-        backgroundImage: `url(${coverData.coverMo})`,
+        backgroundImage: `url(${coverData.coverPc})`,
         backgroundSize: coverData.coverPcLoc == 'center' ? 'contain' : 'cover',
       }"
     ></div>
@@ -169,6 +169,12 @@ const jumpImage = () => {
       videoShow.value = true;
       startVideoCount();
     } else {
+      if (unref(isImageCountDone)) {
+        toApp();
+      }
+    }
+  } else {
+    if (unref(isImageCountDone)) {
       toApp();
     }
   }
@@ -184,6 +190,10 @@ const jumpVideo = () => {
     } else {
       toApp();
     }
+  } else {
+    if (unref(isVideoCountDone)) {
+      toApp();
+    }
   }
 };
 const handleVideoPlay = () => {
@@ -232,9 +242,11 @@ watch(
       }
     } else {
       if (unref(val2)) {
+        imgShow.value = true;
         startImageCount();
       }
       if (unref(val3)) {
+        videoShow.value = true;
         startVideoCount();
       }
       //非混合模式
@@ -250,6 +262,7 @@ watch(
   [isMixinMode, isImageCountDone, isVideoCountDone, showImageFirst],
   ([val1, val2, val3, val4]) => {
     //混合模式
+
     if (unref(val1)) {
       //图片优先
       if (unref(val4)) {
@@ -271,10 +284,16 @@ watch(
       }
     } else {
       //非混合模式
+      if (unref(val2)) {
+        if (unref(isImageAutoNext)) {
+          toApp();
+        }
+      }
     }
   },
   {
     deep: true,
+    immediate: true,
   }
 );
 

packages/qjkankan-view/src/components/assembly/OpeningMobile.vue

@@ -65,7 +65,7 @@
     }"
   >
     <div
-      @click="closeImg"
+      @click="jumpImage"
       class="image-front"
       :style="{
         backgroundImage: `url(${coverData.coverMo})`,
@@ -162,7 +162,7 @@ const videoIndex = ref(1);
 const currentScene = computed(() => store.getters["scene/currentScene"]);
 
 const handleVideoPlay = () => {
-  window.alert("play");
+  // window.alert("play");
   let video = unref(openvideo$);
   video && video.play();
 };
@@ -177,6 +177,10 @@ const jumpImage = () => {
     } else {
       toApp();
     }
+  } else {
+    if (unref(isImageCountDone)) {
+      toApp();
+    }
   }
 };
 
@@ -190,6 +194,10 @@ const jumpVideo = () => {
     } else {
       toApp();
     }
+  } else {
+    if (unref(isVideoCountDone)) {
+      toApp();
+    }
   }
 };
 
@@ -223,6 +231,7 @@ watch(
   [isMixinMode, isImageMode, isVideoMode, showImageFirst],
   ([val1, val2, val3, val4]) => {
     //混合模式
+
     if (unref(val1)) {
       //图片优先
       if (unref(val4)) {
@@ -233,13 +242,15 @@ watch(
         startVideoCount();
       }
     } else {
+      //非混合模式
       if (unref(val2)) {
+        imgShow.value = true;
         startImageCount();
       }
       if (unref(val3)) {
+        videoShow.value = true;
         startVideoCount();
       }
-      //非混合模式
     }
   },
   {
@@ -273,6 +284,11 @@ watch(
       }
     } else {
       //非混合模式
+      if (unref(val2)) {
+        if (unref(isImageAutoNext)) {
+          toApp();
+        }
+      }
     }
   },
   {