update

packages/qjkankan-editor/src/framework/play/pano/components/list.vue

@@ -261,6 +261,7 @@ export default {
     },
     initMainSwiper() {
       this.$nextTick(() => {
+        console.warn("initMainSwiper");
         if (window.mainNatSwiper) {
           window.mainNatSwiper = null;
         }
@@ -272,10 +273,14 @@ export default {
     },
     mainNatSwiperFocus() {
       this.$nextTick(() => {
+        console.warn(
+          "catalogRoot-mainNatSwiperFocus",
+          this.metadata.catalogRoot
+        );
         const current = Array.from(this.metadata.catalogRoot).findIndex(
           (item) => item.id === this.currentCatalogRoot.id
         );
-        if (window.mainNatSwiper) {
+        if (window.mainNatSwiper && this.metadata.catalogRoot.length > 1) {
           const index = current < 0 ? 0 : current;
           window.mainNatSwiper.slideTo(index);
         }
@@ -331,7 +336,7 @@ export default {
   mounted() {
     // console.log(this.metadata,'metadata');
     // this.loadList();
-    this.initMainSwiper();
+    // this.initMainSwiper();
   },
 };
 </script>
@@ -351,7 +356,7 @@ export default {
   .swiper-container {
     width: 100%;
     position: relative;
-    margin:0 auto;
+    margin: 0 auto;
 
     > ul {
       margin: 0 auto;

packages/qjkankan-view/src/components/UIGather/logo.vue

@@ -12,8 +12,8 @@
 
 <script setup>
 import { useStore } from "vuex";
-import { ref, onMounted, computed, watch, nextTick } from "vue";
-import { useI18n, getLocale } from "@/i18n";
+import { computed } from "vue";
+import { getLocale } from "@/i18n";
 
 const store = useStore();
 const metadata = computed(() => store.getters["scene/metadata"]);

packages/qjkankan-view/src/components/UIGather/menu.vue

@@ -1,60 +1,128 @@
 <template>
   <ul class="menu">
-    <li @click="onIsShowList"
+    <li
+      @click="onIsShowList"
       v-tooltip="$t('menu.guide')"
-      v-if="!((metadata.catalogRoot && metadata.catalogRoot.length == 1) && scenes.length == 1 && secondaryList.length == 1)">
-      <img :src="require(`@/assets/images/icon/${isShowScenesList ? 'function_off@2x.png' : 'function_on@2x.png'}`)"
-        alt="" />
+      v-if="
+        !(
+          metadata.catalogRoot &&
+          metadata.catalogRoot.length == 1 &&
+          scenes.length == 1 &&
+          secondaryList.length == 1
+        )
+      "
+    >
+      <img
+        :src="
+          require(`@/assets/images/icon/${
+            isShowScenesList ? 'function_off@2x.png' : 'function_on@2x.png'
+          }`)
+        "
+        alt=""
+      />
     </li>
 
-
-    <div class="v-link"
+    <div
+      class="v-link"
       v-if="
-      (!((metadata.catalogRoot && metadata.catalogRoot.length == 1) && scenes.length == 1 && secondaryList.length == 1)) &&
-      currentScene.type == '4dkk' && fdkkmetadata && (fdkkmetadata.controls.showPanorama || fdkkmetadata.controls.showFloorplan || fdkkmetadata.controls.showDollhouse)">
-    </div>
+        !(
+          metadata.catalogRoot &&
+          metadata.catalogRoot.length == 1 &&
+          scenes.length == 1 &&
+          secondaryList.length == 1
+        ) &&
+        currentScene.type == '4dkk' &&
+        fdkkmetadata &&
+        (fdkkmetadata.controls.showPanorama ||
+          fdkkmetadata.controls.showFloorplan ||
+          fdkkmetadata.controls.showDollhouse)
+      "
+    ></div>
 
     <template v-if="currentScene.type == '4dkk'">
-
       <li
-      v-tooltip="$t('menu.panorama')"
-       v-if="fdkkmetadata && fdkkmetadata.controls.showPanorama" :class="{ disabled: isPlayTours || flying }"
-        @click="onModeChange('panorama')">
-        <img :src="require(`@/assets/images/icon/${mode == 'panorama' ? 'roaming_selected' : 'roaming_normal'}@2x.png`)"
-          alt="" />
+        v-tooltip="$t('menu.panorama')"
+        v-if="fdkkmetadata && fdkkmetadata.controls.showPanorama"
+        :class="{ disabled: isPlayTours || flying }"
+        @click="onModeChange('panorama')"
+      >
+        <img
+          :src="
+            require(`@/assets/images/icon/${
+              mode == 'panorama' ? 'roaming_selected' : 'roaming_normal'
+            }@2x.png`)
+          "
+          alt=""
+        />
       </li>
 
       <li
-      v-tooltip="$t('menu.floorplan')"
-      v-if="fdkkmetadata && fdkkmetadata.controls.showFloorplan" :class="{ disabled: isPlayTours || flying }"
-        @click="onModeChange('floorplan')">
-        <img :src="require(`@/assets/images/icon/${mode == 'floorplan' ? 'plane_selected' : 'plane_normal'}@2x.png`)"
-          alt="" />
+        v-tooltip="$t('menu.floorplan')"
+        v-if="fdkkmetadata && fdkkmetadata.controls.showFloorplan"
+        :class="{ disabled: isPlayTours || flying }"
+        @click="onModeChange('floorplan')"
+      >
+        <img
+          :src="
+            require(`@/assets/images/icon/${
+              mode == 'floorplan' ? 'plane_selected' : 'plane_normal'
+            }@2x.png`)
+          "
+          alt=""
+        />
       </li>
 
       <li
-      v-tooltip="$t('menu.dollhouse')"
-       v-if="fdkkmetadata && fdkkmetadata.controls.showDollhouse" :class="{ disabled: isPlayTours || flying }"
-        @click="onModeChange('dollhouse')">
-        <img :src="require(`@/assets/images/icon/${mode == 'dollhouse' ? '3d_selected' : '3d_normal'}@2x.png`)"
-          alt="" />
+        v-tooltip="$t('menu.dollhouse')"
+        v-if="fdkkmetadata && fdkkmetadata.controls.showDollhouse"
+        :class="{ disabled: isPlayTours || flying }"
+        @click="onModeChange('dollhouse')"
+      >
+        <img
+          :src="
+            require(`@/assets/images/icon/${
+              mode == 'dollhouse' ? '3d_selected' : '3d_normal'
+            }@2x.png`)
+          "
+          alt=""
+        />
       </li>
 
-      <div class="v-link"
-        v-if="toursList.length > 0 && fdkkmetadata && (fdkkmetadata.controls.showPanorama || fdkkmetadata.controls.showFloorplan || fdkkmetadata.controls.showDollhouse)">
-      </div>
+      <div
+        class="v-link"
+        v-if="
+          toursList.length > 0 &&
+          fdkkmetadata &&
+          (fdkkmetadata.controls.showPanorama ||
+            fdkkmetadata.controls.showFloorplan ||
+            fdkkmetadata.controls.showDollhouse)
+        "
+      ></div>
 
       <li
-      v-tooltip="$t('menu.tour')"
-       class="daolan" @click.stop="playTour" v-if="toursList.length > 0">
-        <img :src="require(`@/assets/images/icon/${isPlayTours ? 'pause01' : 'playing01'}@2x.png`)" alt="" />
-        <span>{{$t('menu.tour')}}</span>
-        <img @click.stop="openTours" :class="{ active: showTours }" class="jiantou"
-          :src="require(`@/assets/images/icon/expand_arrows@2x.png`)" alt="" />
+        v-tooltip="$t('menu.tour')"
+        class="daolan"
+        @click.stop="playTour"
+        v-if="toursList.length > 0"
+      >
+        <img
+          :src="
+            require(`@/assets/images/icon/${
+              isPlayTours ? 'pause01' : 'playing01'
+            }@2x.png`)
+          "
+          alt=""
+        />
+        <span>{{ $t("menu.tour") }}</span>
+        <img
+          @click.stop="openTours"
+          :class="{ active: showTours }"
+          class="jiantou"
+          :src="require(`@/assets/images/icon/expand_arrows@2x.png`)"
+          alt=""
+        />
       </li>
-
     </template>
-
   </ul>
 </template>
 
@@ -64,58 +132,56 @@ import { useStore } from "vuex";
 const store = useStore();
 const toursList = computed(() => store.getters["fdkk/toursList"]);
 
-const isShowScenesList = computed(() => store.getters["functions/isShowScenesList"]);
+const isShowScenesList = computed(
+  () => store.getters["functions/isShowScenesList"]
+);
 const toursStatus = computed(() => store.getters["fdkk/toursStatus"]);
 const isPlayTours = computed(() => store.getters["fdkk/isPlayTours"]);
 const flying = computed(() => store.getters["fdkk/isFlying"]);
 const mode = computed(() => store.getters["fdkk/mode"]);
 
-
 const showTours = computed(() => store.getters["fdkk/isShowToursList"]);
 
-
 const currentScene = computed(() => store.getters["scene/currentScene"]);
 const metadata = computed(() => store.getters["scene/metadata"]);
 const scenes = computed(() => store.getters["scene/list"]);
 const secondaryList = computed(() => store.getters["scene/secondaryList"]);
 const fdkkmetadata = computed(() => store.getters["fdkk/metadata"]);
 
-
 const openTours = () => {
   if (isShowScenesList.value) {
     store.commit("functions/setShowScenesList", false);
   }
 
-  store.commit('fdkk/setShowToursList', !showTours.value)
-}
+  store.commit("fdkk/setShowToursList", !showTours.value);
+};
 
 const playTour = () => {
-  store.commit('fdkk/setToursStatus', !toursStatus.value)
-}
+  store.commit("fdkk/setToursStatus", !toursStatus.value);
+};
 
 const onIsShowList = (data) => {
   if (showTours.value) {
-    store.commit('fdkk/setShowToursList', false)
+    store.commit("fdkk/setShowToursList", false);
   }
   store.commit("functions/setShowScenesList", !isShowScenesList.value);
 };
 
-const onModeChange = name => {
-  document.querySelector('#fdkkifr') && document.querySelector('#fdkkifr').contentWindow.postMessage(
-    {
-      source: "qjkankan",
-      event: "setMode",
-      params: {
-        name: name
-      }
-    },
-    "*"
-  );
-}
-
+const onModeChange = (name) => {
+  document.querySelector("#fdkkifr") &&
+    document.querySelector("#fdkkifr").contentWindow.postMessage(
+      {
+        source: "qjkankan",
+        event: "setMode",
+        params: {
+          name: name,
+        },
+      },
+      "*"
+    );
+};
 
-onMounted(() => {
-})
+onMounted(() => {});
 </script>
 
 <style lang="scss" scoped>
@@ -126,13 +192,13 @@ onMounted(() => {
   display: flex;
   z-index: 9;
 
-  >li {
+  > li {
     margin: 0 10px;
     cursor: pointer;
     display: flex;
     justify-content: center;
     align-items: center;
-    >img {
+    > img {
       width: 26px;
       height: 26px;
     }
@@ -141,7 +207,12 @@ onMounted(() => {
   .v-link {
     width: 1px;
     height: 26px;
-    background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #FFFFFF 49%, rgba(255, 255, 255, 0) 100%);
+    background: linear-gradient(
+      180deg,
+      rgba(255, 255, 255, 0) 0%,
+      #ffffff 49%,
+      rgba(255, 255, 255, 0) 100%
+    );
   }
 
   .daolan {
@@ -149,7 +220,7 @@ onMounted(() => {
     width: auto;
     align-items: center;
 
-    >img {
+    > img {
       width: 26px;
       height: 26px;
     }
@@ -157,14 +228,15 @@ onMounted(() => {
     .jiantou {
       margin-left: -4px;
       transform: rotate(180deg);
-      transition: .3s ease transform;
+      transition: 0.3s ease transform;
 
       &.active {
         transform: none;
       }
     }
 
-    >span {}
+    > span {
+    }
   }
 }
 </style>

packages/qjkankan-view/src/locales/zh copy.json

@@ -1,63 +0,0 @@
-{
-  "common": {
-    "none": "无",
-    "confirm": "确定",
-    "cancel": "取消",
-    "tips": "提示",
-    "hide": "隐藏",
-    "show": "显示",
-    "review": "预览",
-    "open": "开",
-    "close": "关",
-    "pauseTour": "暂停导览",
-    "playTour": "播放导览",
-    "passwordTips": "请输入浏览密码",
-    "passwordError": "密码错误",
-    "tour": "导览",
-    "support": "四维时代提供技术支持",
-    "all": "全部",
-    "model": "三维模式"
-  },
-  "limit": {
-    "viewInVr": "请在手机展示页面观看VR效果"
-  },
-  "share": {
-    "wechat": "微信",
-    "friends": "朋友圈",
-    "qq": "QQ",
-    "facebook": "Facebook",
-    "whatsApp": "WhatsApp",
-    "copyLink": "复制链接",
-    "shareLink": "分享链接",
-    "shareLinkTips": "分享作品",
-    "vrMode": "VR模式",
-    "fastCopy": "复制链接"
-  },
-  "toast": {
-    "copySuccess": "复制成功",
-    "inputPassword": "请输入密码",
-    "checkBrowser": "无法打开页面，请升级或更换浏览器后重新打开",
-    "changeBrowser": "建议使用以下浏览器"
-  },
-  "mode": {
-    "panorama": "漫游",
-    "floorplan": "平面",
-    "dollhouse": "三维",
-    "dollhouseModel": "三维模型",
-    "vr": "VR功能",
-    "music": "音乐",
-    "fullScene": "全屏",
-    "exitFullScene": "退出全屏"
-  },
-  "code": "操作失败，请稍后再试",
-  "model": {
-    "enter": "入户门"
-  },
-  "guide": {
-    "title": "操作提示",
-    "pano": "行走<br />点击任意方向移动",
-    "rotate": "旋转视角<br />左右滑动屏幕，旋转视觉",
-    "zoom": "缩放<br />双指滑动放大或缩小视图",
-    "set": "我知道了"
-  }
-}