瀏覽代碼

fix: 地面默认logo 国际化

jinx 2 月之前
父節點
當前提交
73e72cf174

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

@@ -149,28 +149,27 @@ watch(
         hadGetInfo.value = true;
 
         let isVersion = 0;
-        if(config.isOfflineMode){
-          if(unref(currentScene).version && unref(currentScene).version == 'V4'){
+        if (config.isOfflineMode) {
+          if (unref(currentScene).version && unref(currentScene).version == "V4") {
             isVersion = isUpgradeAdapter(data.isUpgrade);
           } else {
-            isVersion = isUpgradeAdapter((data && data.isUpgrade) ? data.data.isUpgrade : 0);
+            isVersion = isUpgradeAdapter(data && data.isUpgrade ? data.data.isUpgrade : 0);
           }
         } else {
-          isVersion = isUpgradeAdapter((data.data && data.data.isUpgrade) ? data.data.isUpgrade : 0);
+          isVersion = isUpgradeAdapter(data.data && data.data.isUpgrade ? data.data.isUpgrade : 0);
         }
         console.log("当前-version", isVersion);
         store.dispatch("audio/setLock", true);
         store.commit("scene/setFdkkCurrentVersion", isVersion);
         // v3
         if (isVersion === "V3") {
-          let flag = ""
+          let flag = "";
           // 离线包模式,接口返回的是data,没有嵌套.data
-          if(config.isOfflineMode){
+          if (config.isOfflineMode) {
             flag = data.bgMusic && data.bgMusic != "0" && data.bgMusic != "Cheerful" && data.bgMusic != "noMusic";
           } else {
             flag = data.data.bgMusic && data.data.bgMusic != "0" && data.data.bgMusic != "Cheerful" && data.data.bgMusic != "noMusic";
           }
-          
 
           console.error("是否有V3--BGM", flag);
           store.commit("fdkk/setV3FdkkBGM", flag);
@@ -287,6 +286,8 @@ const handleMasksUpdate = (skyMask, earthMask, app) => {
     }
     if (earthMask.icon) {
       app.krpanoDom.set(`hotspot[nadirlogo].url`, earthMask.icon);
+    } else {
+      app.krpanoDom.set(`hotspot[nadirlogo].url`, defaultMask);
     }
     if ("scale" in earthMask) {
       app.krpanoDom.set(`hotspot[nadirlogo].scale`, earthMask.scale);

+ 5 - 5
packages/qjkankan-view/src/pages/show.vue

@@ -230,9 +230,7 @@ onMounted(async () => {
     // store.commit("scene/setCurrnetVisual", currnetVisual);
     const app = createApp({
       // xml: "%HTMLPATH%/static/template/tour.xml",
-      xml: config.isOfflineMode 
-      ? `${config.offlineResourePath}/${config.projectNum}/tour.xml` 
-      : `${process.env.VUE_APP_CDN}/720yun_fd_manage/${config.projectNum}/tour.xml?rnd=${Math.random()}`,
+      xml: config.isOfflineMode ? `${config.offlineResourePath}/${config.projectNum}/tour.xml` : `${process.env.VUE_APP_CDN}/720yun_fd_manage/${config.projectNum}/tour.xml?rnd=${Math.random()}`,
       swf: "%HTMLPATH%/showviewer/lib/krpano/tour.swf",
       target: "pano",
       html5: "auto",
@@ -274,9 +272,9 @@ onMounted(async () => {
           // if (currentScene.value.someData) {
           //   hotspots = typeof currentScene.value.someData == "string" ? JSON.parse(currentScene.value.someData).hotspots : currentScene.value.someData.hotspots;
           // }
-      
+
           let currentHotspots = hotspots.value.filter((item) => item.navigationId == currentScene.value.id);
-          console.error('sceneReady',currentHotspots)
+          console.error("sceneReady", currentHotspots);
           if (currentHotspots.length) {
             // hotspots.forEach((item, index) => {
             //   if (item.content) {
@@ -357,6 +355,8 @@ const handleMasksUpdate = (skyMask, earthMask, app) => {
     }
     if (earthMask.icon) {
       app.krpanoDom.set(`hotspot[nadirlogo].url`, earthMask.icon);
+    } else {
+      app.krpanoDom.set(`hotspot[nadirlogo].url`, defaultMask);
     }
     if ("scale" in earthMask) {
       app.krpanoDom.set(`hotspot[nadirlogo].scale`, earthMask.scale);

+ 3 - 3
packages/qjkankan-view/src/pages/showMobile.vue

@@ -225,9 +225,7 @@ onMounted(async () => {
 
     const app = createApp({
       // xml: "%HTMLPATH%/static/template/tour.xml",
-      xml: config.isOfflineMode 
-      ? `${config.offlineResourePath}/${config.projectNum}/tour.xml` 
-      : `${process.env.VUE_APP_CDN}/720yun_fd_manage/${config.projectNum}/tour.xml?rnd=${Math.random()}`,
+      xml: config.isOfflineMode ? `${config.offlineResourePath}/${config.projectNum}/tour.xml` : `${process.env.VUE_APP_CDN}/720yun_fd_manage/${config.projectNum}/tour.xml?rnd=${Math.random()}`,
       swf: "%HTMLPATH%/showviewer/lib/krpano/tour.swf",
       target: "pano",
       html5: "auto",
@@ -327,6 +325,8 @@ const handleMasksUpdate = (skyMask, earthMask, app) => {
     }
     if (earthMask.icon) {
       app.krpanoDom.set(`hotspot[nadirlogo].url`, earthMask.icon + "?x-oss-process=image/resize,w_1000");
+    } else {
+      app.krpanoDom.set(`hotspot[nadirlogo].url`, defaultMask);
     }
     if ("scale" in earthMask) {
       app.krpanoDom.set(`hotspot[nadirlogo].scale`, earthMask.scale);