gemercheung před 1 rokem
rodič
revize
c6527d04d2

+ 14 - 8
packages/qjkankan-kankan-view/src/components/Controls/FloorSwitch.vue

@@ -1,13 +1,10 @@
 <template>
   <div
     class="floor-switch"
-    :class="{ disable: flying, showTours: showTours }"
-    v-if="floors.length > 1 && mode != 'panorama'"
+    :class="{ disable: flying }"
+    v-if="floors.length > 1 && mode != 'panorama' && !toursIsplay"
   >
     <ul>
-      {{
-        floors
-      }}
       <li
         v-if="mode != 'floorplan'"
         :class="{ active: 'all' == floorId }"
@@ -27,24 +24,33 @@
   </div>
 </template>
 <script setup>
-import { computed } from "vue";
+import { computed, watch, onMounted } from "vue";
 import { useStore } from "vuex";
 import { useApp } from "@/app";
-import { onMounted } from "vue";
+
 const store = useStore();
 const mode = computed(() => store.getters.mode);
 const flying = computed(() => store.getters["flying"]);
 const floors = computed(() => store.getters["scene/floors"]);
 const floorId = computed(() => store.getters.floorId);
 const showTours = computed(() => store.getters["tour/showTours"]);
+const toursIsplay = computed(() => store.getters["tour/isPlay"]);
+
 const onGotoFloor = (id) => {
   store.commit("setFloor", id);
 };
+// watch(toursIsplay, (newVal, oldVal) => {
+//   if (oldVal && !newVal) {
+//     // debugger;
+//     store.commit("setMode", 'panorama');
+//   }
+// });
+
 onMounted(() => {
   useApp().then((sdk) =>
     sdk.Camera.on("mode.beforeChange", ({ toMode, floorIndex }) => {
       console.log("mode.beforeChange,", toMode, floorIndex);
-      // store.commit("mode", toMode);
+      // store.commit("mode", toMode);wa
       if (toMode && toMode !== "dollhouse") {
         store.commit("setFloorId", floorIndex);
       }

+ 1 - 1
packages/qjkankan-kankan-view/src/components/Controls/LeftButtons.vue

@@ -129,7 +129,7 @@ const onModeChange = name => {
 const playTour = async () => {
     let player = await getApp().TourManager.player
     if (isPlay.value) {
-        store.commit('tour/setData', { isPlay: true })
+        store.commit('tour/setData', { isPlay: false })
         player.pause()
     } else {
         store.commit('tour/setData', { isPlay: true })

+ 1 - 1
packages/qjkankan-kankan-view/src/components/Controls/tours.mobile.vue

@@ -149,7 +149,7 @@ const onModeChange = (name) => {
 const playTour = async () => {
   let player = await getApp().TourManager.player;
   if (isPlay.value) {
-    store.commit("tour/setData", { isPlay: true });
+    store.commit("tour/setData", { isPlay: false });
     player.pause();
   } else {
     store.commit("tour/setData", { isPlay: true });

+ 6 - 1
packages/qjkankan-kankan-view/src/components/Controls/tours.vue

@@ -151,7 +151,7 @@ const onModeChange = (name) => {
 const playTour = async () => {
   let player = await getApp().TourManager.player;
   if (isPlay.value) {
-    store.commit("tour/setData", { isPlay: true });
+    store.commit("tour/setData", { isPlay: false });
     player.pause();
   } else {
     store.commit("tour/setData", { isPlay: true });
@@ -356,6 +356,11 @@ watch(isPlay, () => {
     },
     "*"
   );
+  if (!isPlay.value) {
+    console.log("tour-kk-isPlay", isPlay);
+    store.commit("setMode", "panorama");
+    store.commit("setFlying", false);
+  }
 });
 
 onMounted(() => {

+ 2 - 1
packages/qjkankan-kankan-view/src/components/Information/View.Pc.vue

@@ -43,6 +43,7 @@ const onShowDescription = () => {
   height: 100%;
   cursor: pointer;
   transition: all 0.1s;
+
   background: linear-gradient(
     90deg,
     rgba(0, 0, 0, 0) 0%,
@@ -88,7 +89,7 @@ const onShowDescription = () => {
     }
   }
   .text {
-    // width: 190px;
+    // max-width: 540px;
     text-align: center;
     min-width: 240px;
     transition: width 0.3s;

+ 1 - 1
packages/qjkankan-kankan-view/src/store/index.js

@@ -59,7 +59,7 @@ const store = createStore({
         setMode(state, payload) {
             if (payload == state.mode || !payload) {
                 // debugger
-                store.commit('setFlying', false)
+                // store.commit('setFlying', false)
                 console.log('设置相机模式相同')
                 return
             }

+ 1 - 0
packages/qjkankan-kankan-view/src/utils/messageHandler.js

@@ -27,6 +27,7 @@ export const listenMessage = () => {
       //导览列表开关
       if (event == "openTours") {
         isOpenTours.value = params.showTours;
+        console.warn("收到切换openTours", params.showTours);
       }
 
       //相机模式改变