|
@@ -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);
|