1
0
tremble 2 лет назад
Родитель
Сommit
b4251da3f0

+ 0 - 1
packages/qjkankan-editor/src/framework/showMobile/index.vue

@@ -180,7 +180,6 @@ export default {
           if (data.data.bgMusic == 'user') {
             this.bgmUrl = data.data.bgMusic ? `https://4dkk.4dage.com/images/images${data.data.num}/${data.data.bgMusicName}` : "";
           }
-
         }
       });
     },

+ 0 - 2
packages/qjkankan-editor/src/views/base/Toolbar.vue

@@ -182,8 +182,6 @@ export default {
       border: 1px solid #404040;
       img {
         height: 100%;
-        width: 100%;
-        object-fit: contain;
       }
       .setting-cover-btn {
         position: absolute;

BIN
packages/qjkankan-view/src/assets/images/default/img_noresults@2x.png


+ 0 - 2
packages/qjkankan-view/src/components/Fdkk/index.vue

@@ -30,8 +30,6 @@ import { useMusicPlayer } from '@/utils/sound'
 import v3mobile from "./v3fdkkmobile/iframe.vue";
 import { getApp } from '@/app'
 
-//背景音乐
-const musicPlayer = useMusicPlayer()
 
 const store = useStore();
 const isMobile = computed(() => browser.isMobile());

+ 1 - 1
packages/qjkankan-view/src/components/Fdkk/v3fdkkmobile/iframe.vue

@@ -65,7 +65,7 @@ export default {
           // this.$bus.emit("currentMode", e.data.params);
 
           if (e.data.params.type == "playMusic") {
-            console.log(e.data.params.data.status, "e.data");
+            console.log(e.data.params.data.status, "e.daplayMusicplayMusicta");
             this.bgmstatus = e.data.params.data.status;
           }
 

+ 6 - 6
packages/qjkankan-view/src/components/Pano/index.vue

@@ -28,11 +28,11 @@ const currentPlaying = computed(() => store.getters["functions/currentPlaying"])
 const loadScene = async (currentScene) => {
   let app = await getApp();
   if (app.krpanoDom) {
-    let { sceneCode, initVisual,someData } = currentScene;
+    let { sceneCode, initVisual, someData } = currentScene;
     app.krpanoDom.call(`skin_loadscene('scene_${sceneCode}',${initVisual ? initVisual.vlookat : '0'},${initVisual ? initVisual.hlookat : '0'})`);
-    console.log(sceneCode,someData);
+    console.log(sceneCode, someData);
 
-    if (someData && someData.hotspots &&someData.hotspots.length > 0) {
+    if (someData && someData.hotspots && someData.hotspots.length > 0) {
       app.Tags.initHotspot(someData.hotspots, false);
     }
   }
@@ -58,10 +58,10 @@ watch(currentScene, (newVal) => {
         store.commit("scene/setFdkkCurrentVersion", data.data.isUpgrade !== 0 ? 'v4' : 'v3');
         if (data.data.isUpgrade === 0) {
           // 该v3场景有背景音乐
-          if (data.data.bgMusic) {
-            if (!browser.isMobile()) {
+          if (!browser.isMobile()) {
+            if (data.data.bgMusic && data.data.bgMusic != 'noMusic') {
               musicPlayer.pause()
-            }
+            } 
           }
         }
       }

+ 2 - 1
packages/qjkankan-view/src/components/UIGather/control.vue

@@ -1,5 +1,5 @@
 <template>
-  <ul class="control">
+  <ul class="control"  v-show="fdkkCurrentVersion == 'v4'">
 
     <!-- 自定义链接 -->
     <li @click="onLink" v-if="customLink && customLink.isShow">
@@ -74,6 +74,7 @@ const soundPlayer = useSoundPlayer()
 const store = useStore();
 
 const metadata = computed(() => store.getters["scene/metadata"]);
+const fdkkCurrentVersion = computed(() => store.getters["scene/fdkkCurrentVersion"]);
 
 
 const isAutoRotate = computed(() => store.getters["functions/isAutoRotate"]);

+ 1 - 1
packages/qjkankan-view/src/components/UIGather/index.vue

@@ -2,7 +2,7 @@
       <Logo />
       <Tips />
       <div v-show="showUI">
-            <Control v-if="fdkkCurrentVersion == 'v4'" />
+            <Control />
             <Menu v-if="fdkkCurrentVersion == 'v4'" />
             <div @click="onIsShowList" v-else class="v3daolan" :class="{ active: isShowScenesList }">
                   <img :src="require(`@/assets/images/icon/${isShowScenesList ? 'function_off@2x.png' : 'function_on@2x.png'}`)"

+ 2 - 1
packages/qjkankan-view/src/components/UIGather/logo.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="logo" v-if="metadata.isLogo">
+  <div class="logo" v-if="metadata.isLogo&&fdkkCurrentVersion!='v3'">
     <img :src="metadata.logo || require('@/assets/images/default/logo_white.svg')" alt="">
   </div>
 </template>
@@ -10,6 +10,7 @@ import { ref, onMounted, computed, watch, nextTick } from "vue";
 
 const store = useStore();
 const metadata = computed(() => store.getters['scene/metadata'])
+const fdkkCurrentVersion = computed(() => store.getters["scene/fdkkCurrentVersion"]);
 
 </script>
 

+ 1 - 1
packages/qjkankan-view/src/components/UIGather/mobile/control.right.vue

@@ -122,7 +122,7 @@ const onShare = () => {
 watch(currentScene, () => {
   store.commit("functions/setVrStatus", false);
   useApp().then((app) => {
-    app.krpanoDom.call('webvr.exitVR()')
+    app.krpanoDom && app.krpanoDom.call('webvr.exitVR()')
   });
 })
 

+ 3 - 0
packages/qjkankan-view/src/components/assembly/Error.vue

@@ -27,6 +27,9 @@
       color: #909090;
       text-align: center;
       font-size: 18px;
+      >img{
+        width: 120px;
+      }
       > p {
         margin-top: 20px;
       }

+ 0 - 1
packages/qjkankan-view/src/pages/show.vue

@@ -66,7 +66,6 @@ onMounted(async () => {
   let res = await checkWork();
   if (!res.data) {
     workEnable.value = res.data;
-    console.log(res, 'wqdqdqwdqw');
     return;
   }
   getPanoInfo().then(async (data) => {