Merge branch 'dev' into fm-dev

packages/qjkankan-editor/src/views/hotspot/hotspotIconType/personalized_tag.vue

@@ -12,7 +12,7 @@
 
     <div class="remark-highlight">{{ $i18n.t("hotspot.hotspot_title") }}</div>
 
-    <div class="title-input-wrapper">
+    <!-- <div class="title-input-wrapper">
       <input
         v-model.trim="hotspot.hotspotTitle"
         type="text"
@@ -20,20 +20,20 @@
         :placeholder="$i18n.t('hotspot.title_placeholder')" 
       />
       <span class="count">{{ hotspot.hotspotTitle.length }}/50</span>
-    </div>
-    <!-- <div class="title-input-wrapper has-textarea">
+    </div> -->
+    <div class="title-input-wrapper has-textarea">
       <Input
         ref="titleTextarea"
         class="titleTextarea"
         v-model="hotspot.hotspotTitle"
         type="textarea"
         maxlength="50"
-        :autosize="{ minRows: 3}"
+        :autosize="{ minRows: 1}"
         :placeholder="$i18n.t('hotspot.title_placeholder')"
       />
       
       <span class="count">{{ hotspot.hotspotTitle.length }}/50</span>
-    </div> -->
+    </div>
 
     <div class="remark">{{ $i18n.t("hotspot.shape_filling_color") }}</div>
     <div class="color-picker-wrap">
@@ -506,57 +506,20 @@ export default {
     border: 1px solid #404040;
   }
 
-  // > .title-input-wrapper {
-  //   position: relative;
-  //   border: 1px solid rgba(151, 151, 151, 0.2);
-  //   padding: 5px 0;
-  //   background: #1a1b1d;
-  //   border-radius: 2px;
-  //   height: 36px;
-  //   width: 100%;
-  //   margin-top: 18px;
-  //   &:focus-within {
-  //     border-color: #0076f6;
-  //   }
-  //   > input,
-  //   textarea {
-  //     border: none;
-  //     background: transparent;
-  //     outline: none;
-  //     height: 100%;
-  //     width: calc(100% - 50px);
-  //     padding: 0;
-  //     color: #fff;
-  //     letter-spacing: 1px;
-  //     font-size: 14px;
-  //   }
-  //   &.has-textarea {
-  //     min-height: 72px;
-  //     height: auto;
-  //     position: relative;
-  //   }
-  //   > .count {
-  //     position: absolute;
-  //     bottom: 10px;
-  //     // transform: translateY(-50%);
-  //     right: 10px;
-  //     font-size: 14px;
-  //     color: rgba(255, 255, 255, 0.2);
-  //   }
-  // }
   > .title-input-wrapper {
     position: relative;
     border: 1px solid rgba(151, 151, 151, 0.2);
-    padding: 0 16px;
+    padding: 5px 0;
     background: #1a1b1d;
     border-radius: 2px;
-    height: 36px;
+    min-height: 36px;
     width: 100%;
     margin-top: 18px;
     &:focus-within {
       border-color: #0076f6;
     }
-    > input {
+    > input,
+    textarea {
       border: none;
       background: transparent;
       outline: none;
@@ -567,15 +530,21 @@ export default {
       letter-spacing: 1px;
       font-size: 14px;
     }
+    &.has-textarea {
+      // min-height: 72px;
+      // height: auto;
+      // position: relative;
+    }
     > .count {
       position: absolute;
-      top: 50%;
-      transform: translateY(-50%);
-      right: 16px;
+      bottom: 10px;
+      // transform: translateY(-50%);
+      right: 10px;
       font-size: 14px;
       color: rgba(255, 255, 255, 0.2);
     }
   }
+  //
   > .color-picker-wrap {
     margin-top: 16px;
     height: 36px;

packages/qjkankan-editor/src/views/mask/setting.vue

@@ -31,12 +31,12 @@
           <span> {{ $i18n.t("mask.follow_the_scene") }} </span>
           <switcher :value="currentMask.data.sky.antidistorted" @change="(sa) => (currentMask.data.sky.antidistorted = Boolean(sa))"></switcher>
         </div>
-        <div class="swi-col">
-          <span> {{ $i18n.t("mask.apply_to_all_pano") }} </span>
-          <switcher :value="isApplySkyToAll" @change="(sat) => (isApplySkyToAll = Boolean(sat))"></switcher>
-        </div>
       </template>
       <!-- sky end -->
+      <div class="swi-col">
+        <span> {{ $i18n.t("mask.apply_to_all_pano") }} </span>
+        <switcher :value="isApplySkyToAll" @change="(sat) => (isApplySkyToAll = Boolean(sat))"></switcher>
+      </div>
       <div style="margin: 30px 0"></div>
       <!-- earth start -->
       <div class="swi-col">
@@ -62,11 +62,11 @@
           <span> {{ $i18n.t("mask.follow_the_scene") }} </span>
           <switcher :value="currentMask.data.earth.antidistorted" @change="(ve) => (currentMask.data.earth.antidistorted = Boolean(ve))"></switcher>
         </div>
-        <div class="swi-col">
-          <span> {{ $i18n.t("mask.apply_to_all_pano") }} </span>
-          <switcher :value="isApplyEarthToAll" @change="(vet) => (isApplyEarthToAll = Boolean(vet))"></switcher>
-        </div>
       </template>
+      <div class="swi-col">
+        <span> {{ $i18n.t("mask.apply_to_all_pano") }} </span>
+        <switcher :value="isApplyEarthToAll" @change="(vet) => (isApplyEarthToAll = Boolean(vet))"></switcher>
+      </div>
       <!-- earth end -->
     </template>
 

packages/qjkankan-view/.env.testdev

@@ -1,13 +1,13 @@
 VUE_APP_STATIC_DIR=showviewer
-VUE_APP_CDN=https://ossxiaoan.4dage.com
-# VUE_APP_CDN=https://4dkk.4dage.com
-VUE_APP_PROXY_URL_ROOT='https://test.4dkankan.com'
-VUE_APP_RESOURCE_URL='https://test.4dkankan.com/panorama/'
-VUE_APP_PROXY_URL='https://test.4dkankan.com/qjkankan/'
+# VUE_APP_CDN=https://ossxiaoan.4dage.com
+VUE_APP_CDN=https://4dkk.4dage.com
+VUE_APP_PROXY_URL_ROOT='https://www.4dkankan.com'
+VUE_APP_RESOURCE_URL='https://www.4dkankan.com/panorama/'
+VUE_APP_PROXY_URL='https://www.4dkankan.com/qjkankan/'
 VUE_APP_URL_FILL=
 
 # 接口请求地址
-VUE_APP_APIS_URL=https://test.4dkankan.com/
+VUE_APP_APIS_URL=https://www.4dkankan.com/
 VUE_APP_DEBBUG_FLAG=0516-03
 VUE_APP_DEBBUG_NOTIFY=0
 VUE_APP_DEBBUG_V4=1

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

@@ -258,22 +258,25 @@ onMounted(async () => {
       if (!coverInfo.value?.isShowCover) {
         app.render();
       }
-
       if (isHavePano) {
         app.Scene.on("sceneReady", () => {
           if (app.krpanoDom) {
             let customMask = workCustomMaskList.find((item) => item.navigationId == currentScene.value.id);
             // const { sky, earth } = currentScene.value.customMask;
-            const { sky, earth } = customMask.data;
-            handleMasksUpdate(sky, earth, app);
+            if (customMask) {
+              const { sky, earth } = customMask.data;
+              handleMasksUpdate(sky, earth, app);
+            }
+
             app.krpanoDom.set(`layer[webvr_exitbutton].html`, t("common.exit_vr"));
           }
           // let hotspots = [];
           // 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)
           if (currentHotspots.length) {
             // hotspots.forEach((item, index) => {
             //   if (item.content) {

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

@@ -72,7 +72,7 @@ const isShowOpeningAnimation = ref(0);
 onBeforeMount(() => {
   const vlog = browser.getURLParam("vlog");
   if (vlog) {
-  var vConsole = new window.VConsole();
+    var vConsole = new window.VConsole();
   }
 });
 
@@ -257,8 +257,12 @@ onMounted(async () => {
           if (app.krpanoDom) {
             // const { sky, earth } = currentScene.value.customMask;
             let customMask = workCustomMaskList.find((item) => item.navigationId == currentScene.value.id);
-            const { sky, earth } = customMask.data;
-            handleMasksUpdate(sky, earth, app);
+
+            if (customMask) {
+              const { sky, earth } = customMask.data;
+              handleMasksUpdate(sky, earth, app);
+            }
+
             app.krpanoDom.set(`layer[webvr_exitbutton].html`, t("common.exit_vr"));
           }
 
@@ -270,7 +274,7 @@ onMounted(async () => {
           if (currentHotspots.length) {
             app.Tags.initHotspot(currentHotspots, false);
           }
-          handleVisualLimit(app, currentScene.value,workVisualAngleList);
+          handleVisualLimit(app, currentScene.value, workVisualAngleList);
         });
       }
       initWxShare(lang);
@@ -284,7 +288,7 @@ onMounted(async () => {
 const handlePass = () => {
   hasPasswordLock.value = false;
 };
-const handleVisualLimit = (app, currentScene,workVisualAngleList) => {
+const handleVisualLimit = (app, currentScene, workVisualAngleList) => {
   // const { vlookatmax, vlookatmin } = currentScene.initVisual;
   // console.log('initVisual',currentScene.initVisual)
   // let currnetVisual = workVisualAngleList.find((item) => item.navigationId == currentScene.value.id);