update

packages/qjkankan-editor/package.json

@@ -9,7 +9,6 @@
     "serve-prod": "vue-cli-service serve --mode prod",
     "serve-eurdev": "vue-cli-service serve --mode eurdev",
     "serve-eurtestdev": "vue-cli-service serve --mode eurtestdev",
-    "build": "vue-cli-service build",
     "build-testprod": "vue-cli-service build --mode testprod",
     "build-prod": "vue-cli-service build --mode prod",
     "build-eurtestprod": "vue-cli-service build --mode eurtestprod",

packages/qjkankan-view/public/showMobile.html

@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontVR/iconfont.css"/>
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontV1.2.0/iconfont.css"/>
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/swiper/swiper-bundle.min.css" />
-    <script src="http://res.wx.qq.com/open/js/jweixin-1.4.0.js"></script> 
+    <script src="http://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script> 
     <link rel="icon" href="./favicon.png" />
     <title>-</title>
   </head>
@@ -23,9 +23,9 @@
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/howler/howler.min.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/swiper/swiper-bundle.min.js"></script>
     <!-- <script src="<%= VUE_APP_STATIC_DIR %>/lib/jssor/jssor.slider-28.1.0.min.js"></script> -->
-    <!-- <script src="https://4dkk.4dage.com/v4-test/www/viewer/static/lib/vconsole.js"></script>
+    <script src="https://4dkk.4dage.com/v4-test/www/viewer/static/lib/vconsole.js"></script>
     <script>
       var vConsole = new window.VConsole()
-  </script> -->
+  </script>
   </body>
 </html>

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

@@ -1,32 +1,64 @@
 <template>
   <!-- 视频 -->
-  <div class="videocon" :class="{ zidxhigh: coverData.coverVideoOrder == 'before' }"
-    v-if="coverData.coverSelect.indexOf('video') > -1 && showVideo" :style="{
+  <div
+    class="videocon"
+    :class="{ zidxhigh: coverData.coverVideoOrder == 'before' }"
+    v-if="coverData.coverSelect.indexOf('video') > -1 && showVideo"
+    :style="{
       backgroundColor: `${coverData.videoColorSelec}`,
-    }">
-    <video v-if="coverData.videoMo" x5-playsinline="true" playsinline="true" webkit-playsinline="true" class="video"
-      ref="openvideo$" preload autoplay :poster="coverData.videoMoIcon"
-      :class="coverData.videoMoLoc == 'center' ? 'contain' : 'cover'" :src="coverData.videoMo"
-      :controls="Boolean(coverData.coverVideoControl)" muted></video>
-      
-    <img v-show="bofanging" @click.stop="bofang" class="bofang" :src="require('@/assets/images/default/bofang.png')"
-      alt="" />
+    }"
+  >
+    <video
+      v-if="coverData.videoMo"
+      x5-playsinline="true"
+      playsinline="true"
+      webkit-playsinline="true"
+      class="video"
+      ref="openvideo$"
+      preload
+      autoplay
+      :poster="coverData.videoMoIcon"
+      :class="coverData.videoMoLoc == 'center' ? 'contain' : 'cover'"
+      :src="coverData.videoMo"
+      :controls="Boolean(coverData.coverVideoControl)"
+      muted
+    ></video>
+
+    <img
+      v-show="bofanging"
+      @click.stop="bofang"
+      class="bofang"
+      :src="require('@/assets/images/default/bofang.png')"
+      alt=""
+    />
 
     <div @click.stop="jumpVideo" class="jump">
-      {{ countdownVideo > 0 ? $t('common.jumpTips', { second: countdownVideo }) : $t('common.jump')}}</div>
-
+      {{
+        countdownVideo > 0
+          ? $t("common.jumpTips", { second: countdownVideo })
+          : $t("common.jump")
+      }}
+    </div>
   </div>
 
   <!-- 图片 -->
-  <div class="imgcon" v-if="coverData.coverSelect.toLowerCase().indexOf('img') > -1 && showImg" @click="closeImg"
+  <div
+    class="imgcon"
+    v-if="coverData.coverSelect.toLowerCase().indexOf('img') > -1 && showImg"
+    @click="closeImg"
     :style="{
       backgroundImage: `url(${coverData.coverPc})`,
       backgroundColor: `${coverData.imgColorSelec}`,
-      backgroundSize: coverData.coverPcLoc == 'center' ? 'contain' : 'cover'
-    }">
+      backgroundSize: coverData.coverPcLoc == 'center' ? 'contain' : 'cover',
+    }"
+  >
     <div @click.stop="closeImg" class="jump">
-      {{ countdownImg> 0 ? $t('common.jumpTips', { second: countdownImg }) : $t('common.jump') }}</div>
-
+      {{
+        countdownImg > 0
+          ? $t("common.jumpTips", { second: countdownImg })
+          : $t("common.jump")
+      }}
+    </div>
   </div>
 </template>
 <script setup>
@@ -39,9 +71,11 @@ const { t } = useI18n({ useScope: "global" });
 
 const props = defineProps({
   coverData: {
-    type: [Boolean,Object],
-    default: () => { return {} },
-  }
+    type: [Boolean, Object],
+    default: () => {
+      return {};
+    },
+  },
 });
 const store = useStore();
 const openvideo$ = ref(null);
@@ -60,98 +94,94 @@ const currentScene = computed(() => store.getters["scene/currentScene"]);
 const closeImg = (isCall = false) => {
   useApp().then((app) => {
     showImg.value = false;
-    if (props.coverData.coverSelect.toLowerCase().indexOf('and') > -1) {
-      if (props.coverData.coverVideoOrder == 'later') {
-        showVideo.value = true
-        showVideoDaoji()
+    if (props.coverData.coverSelect.toLowerCase().indexOf("and") > -1) {
+      if (props.coverData.coverVideoOrder == "later") {
+        showVideo.value = true;
+        showVideoDaoji();
       }
-      app.render()
+      app.render();
     } else {
-      app.render()
+      app.render();
     }
   });
-}
+};
 
 const closeVideo = (isCall = false) => {
   useApp().then((app) => {
     showVideo.value = false;
     if (!isCall) {
-      app.render()
+      app.render();
     }
   });
-}
+};
 
-const showImgDaoji = (cb = () => { }) => {
+const showImgDaoji = (cb = () => {}) => {
   timer.value = setInterval(() => {
-    countdownImg.value--
+    countdownImg.value--;
     if (countdownImg.value == 0) {
-      clearInterval(timer.value)
-      timer.value = null
-      cb()
+      clearInterval(timer.value);
+      timer.value = null;
+      cb();
 
-      return
+      return;
     }
   }, 1000);
-}
+};
 
 const showVideoDaoji = (isCall = false) => {
   timer.value = setInterval(() => {
-    countdownVideo.value--
+    countdownVideo.value--;
     if (countdownVideo.value == 0) {
-      clearInterval(timer.value)
-      timer.value = null
-      return
+      clearInterval(timer.value);
+      timer.value = null;
+      return;
     }
   }, 1000);
-}
+};
 
 const jumpVideo = (isCall = false) => {
-  closeVideo(isCall)
+  closeVideo(isCall);
   if (isCall) {
-    showImg.value = true
-    showImgDaoji()
+    showImg.value = true;
+    showImgDaoji();
   }
-}
+};
 
 // 执行图片封面
 const executeImg = () => {
   showImgDaoji(() => {
-    closeImg()
-
-  })
-}
-
+    closeImg();
+  });
+};
 
 onMounted(() => {
-  console.log('coverData',unref(props.coverData));
+  console.log("coverData", unref(props.coverData));
   switch (true) {
-    case props.coverData.coverSelect.toLowerCase().indexOf('and') > -1:
-      if (props.coverData.coverVideoOrder == 'before') {
+    case props.coverData.coverSelect.toLowerCase().indexOf("and") > -1:
+      if (props.coverData.coverVideoOrder == "before") {
         // 倒计时结束需要唤起图片
-        showVideoDaoji(true)
-        showImg.value = false
+        showVideoDaoji(true);
+        showImg.value = false;
       } else {
-        showImgDaoji(true)
-        showVideo.value = false
+        showImgDaoji(true);
+        showVideo.value = false;
       }
 
       break;
-    case props.coverData.coverSelect.toLowerCase().indexOf('video') > -1:
-
+    case props.coverData.coverSelect.toLowerCase().indexOf("video") > -1:
       break;
-    case props.coverData.coverSelect.toLowerCase().indexOf('img') > -1:
-
+    case props.coverData.coverSelect.toLowerCase().indexOf("img") > -1:
       break;
     default:
       break;
   }
   if (props.coverData.coverSelect) {
-
   }
+
   if (openvideo$.value) {
     openvideo$.value.addEventListener("ended", () => {
       if (props.coverData.coverVideoInWay) {
-        closeVideo()
+        closeVideo();
       }
     });
 
@@ -168,17 +198,15 @@ onMounted(() => {
     });
 
     document.addEventListener(
-      "WeixinJSBridgeReady",
-      () => {
-        window.alert('weixin');
-        openvideo$.value.play();
-      },
-      false
-    );
+        "WeixinJSBridgeReady",
+        () => {
+          console.log("WeixinJSBridgeReady", openvideo$.value);
+          openvideo$.value.play();
+        },
+        false
+      );
   }
-
 }),
-
   useApp().then((app) => {
     app.Scene.on("ready", () => {
       if (show.value) {
@@ -207,7 +235,7 @@ onMounted(() => {
 .videocon {
   text-align: center;
 
-  >video {
+  > video {
     max-width: inherit;
     height: auto;
     min-height: 100%;