jinx hai 6 meses
pai
achega
ee1b205abb

+ 2 - 2
packages/qjkankan-editor/.env.testdev

@@ -4,8 +4,8 @@ VUE_APP_STATIC_DIR=static
 VUE_APP_CDN=https://ossxiaoan.4dage.com
 VUE_APP_PROXY_URL_ROOT='https://test.4dkankan.com'
 # VUE_APP_PROXY_URL='https://test.4dkankan.com/qjkankan/'
-# VUE_APP_PROXY_URL='http://192.168.0.73:8002/qjkankan/'
-VUE_APP_PROXY_URL='http://192.168.0.17:8002/qjkankan/'
+VUE_APP_PROXY_URL='http://192.168.0.73:8002/qjkankan/'
+# VUE_APP_PROXY_URL='http://192.168.0.17:8002/qjkankan/'
 VUE_APP_ORIGIN=
 VUE_APP_URL_FILL=
 VUE_APP_DEBBUG_FLAG=0112-02

+ 2 - 2
packages/qjkankan-view/.env.testdev

@@ -4,8 +4,8 @@ VUE_APP_PROXY_URL_ROOT='https://test.4dkankan.com'
 VUE_APP_RESOURCE_URL='https://test.4dkankan.com/panorama/'
 VUE_APP_URL_FILL=
 # VUE_APP_PROXY_URL='https://test.4dkankan.com/qjkankan/'
-# VUE_APP_PROXY_URL='http://192.168.0.41:8002/qjkankan/'
-VUE_APP_PROXY_URL='http://192.168.0.17:8002/qjkankan/'
+VUE_APP_PROXY_URL='http://192.168.0.73:8002/qjkankan/'
+# VUE_APP_PROXY_URL='http://192.168.0.17:8002/qjkankan/'
 # 接口请求地址
 VUE_APP_APIS_URL=https://test.4dkankan.com/
 VUE_APP_DEBBUG_FLAG=0516-03

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

@@ -107,9 +107,9 @@ onMounted(async () => {
     let { workOpeningAnimation, work, navigationTrees, workVisualAngleList, workCustomMaskList, workHotList } = data;
 
     store.commit("tags/setData", { hotspots: workHotList });
-    isShowOpeningAnimation.value = workOpeningAnimation.isShowOpeningAnimation ? Number(workOpeningAnimation?.isShowOpeningAnimation) : 0;
+    isShowOpeningAnimation.value = workOpeningAnimation && workOpeningAnimation?.isShowOpeningAnimation ? Number(workOpeningAnimation?.isShowOpeningAnimation) : 0;
     //TODO 兼容1.2.0或以下数据
-    if (!("isShowOpeningAnimation" in workOpeningAnimation) && "openingAnimationType" in workOpeningAnimation && workOpeningAnimation.openingAnimationType.length > 0) {
+    if (workOpeningAnimation && !("isShowOpeningAnimation" in workOpeningAnimation) && "openingAnimationType" in workOpeningAnimation && workOpeningAnimation.openingAnimationType.length > 0) {
       console.log("小行星没有开关,但有openingAnimationType强制开启");
       isShowOpeningAnimation.value = 1;
     }
@@ -241,7 +241,7 @@ onMounted(async () => {
         "view.vlookat": currnetVisual ? currnetVisual.vlookat : 0,
         "view.hlookat": currnetVisual ? currnetVisual.hlookat : 0,
         "autorotate.enabled": !!work.isAuto,
-        "skin_settings.littleplanetintro": typeof workOpeningAnimation.openingAnimationType === "number" ? workOpeningAnimation.openingAnimationType : 1,
+        "skin_settings.littleplanetintro": typeof workOpeningAnimation && workOpeningAnimation?.openingAnimationType === "number" ? workOpeningAnimation?.openingAnimationType : 1,
         "skin_settings.lptswitch": unref(isShowOpeningAnimation),
       },
       passQueryParameters: true,