jinx 1 rok temu
rodzic
commit
1361c127df

+ 1 - 1
hot/src/views/Home.vue

@@ -241,7 +241,7 @@ export default {
   },
   mounted() {
     this.getData();
-    this.getConfig()
+    // this.getConfig()
   },
 };
 </script>

BIN
scene/public/favicon.ico


+ 4 - 25
scene/src/pages/Home.vue

@@ -32,25 +32,13 @@
         <v-title />
 
         <!-- 底部菜单 -->
-        <v-menu  :hideTools="hideTools" @toHome="showWelcome = true" />
+        <v-menu :hideTools="hideTools" @toHome="showWelcome = true" />
 
         <!-- 导览 -->
         <v-guide />
 
         <!-- logo -->
-        <div
-          id="myCompany"
-          style="
-            width: 100%;
-            position: absolute;
-            bottom: 0px;
-            text-align: center;
-            font-size: 14px;
-            font-family: '微软雅黑';
-            font-weight: 580;
-            color: rgba(255, 255, 255, 0.8);
-          "
-        >
+        <div id="myCompany" style="width: 100%; position: absolute; bottom: 0px; text-align: center; font-size: 14px; font-family: '微软雅黑'; font-weight: 580; color: rgba(255, 255, 255, 0.8)">
           <!-- 四维时代提供技术支持 -->
         </div>
       </div>
@@ -137,13 +125,7 @@ export default {
     },
     getHotSpotList() {
       $.ajax({
-        url:
-          g_Prefix +
-          "data/" +
-          window.number +
-          "/hot/js/data.js" +
-          "?" +
-          Math.random(),
+        url: g_Prefix + "data/" + window.number + "/hot/js/data.js" + "?" + Math.random(),
         type: "get",
         dataType: "json",
         contentType: "application/json",
@@ -159,11 +141,9 @@ export default {
       window.evt.initEvent("loadfinish", false, false);
       window.addEventListener("loadfinish", () => {
         this.loading = false;
-        // document.title = "珠海高新区中共党史学习教育园地线上展厅";
         this.getHotSpotList();
         window.player.on("openTips", () => {
           this.$showTips();
-       
         });
 
         window.player.on("openHotspot", (data) => {
@@ -175,7 +155,7 @@ export default {
     });
   },
   async created() {
-    // 雷锋故居场景需求,会携带 hideCover=1
+    // 需要直接进入场景 hideCover=1
     this.hideTools = Boolean(Number(this.$route.query.hideCover));
     this.showWelcome = !this.hideTools;
 
@@ -220,5 +200,4 @@ export default {
   top: 30px;
   left: 30px;
 }
-
 </style>

+ 3 - 0
scene/src/views/gui/components/guide.vue

@@ -313,6 +313,9 @@ export default {
             top: 50%;
             transform: translateY(-50%);
           }
+          .tip-box {
+            display: none;
+          }
         }
       }
     }

+ 0 - 157
scene/src/views/gui/components/hotList copy.vue

@@ -1,157 +0,0 @@
-<template>
-  <div class="hotList">
-    <div class="title">
-      <div class="titleLL">热点列表</div>
-      <div class="titleRR" @click="$emit('close')">
-        <img src="../../../assets/img/close.png" alt="" />
-      </div>
-    </div>
-    <div class="main">
-      <div class="txtNone" v-if="data.length === 0">暂无热点</div>
-      <div class="txt" v-else>
-        <span
-          :class="{ active: hotInd === index }"
-          @click="openHot(item, index)"
-          v-for="(item, index) in data"
-          :key="index"
-          >{{ item.info.title ? item.info.title : "热点" }}</span
-        >
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  components: {},
-  data() {
-    return {
-      data: [],
-      hotInd: null,
-    };
-  },
-  computed: {},
-  watch: {},
-  methods: {
-    openHot(e, index) {
-      // 停止自动导览
-      window.player.director.stopTour();
-      setTimeout(() => {
-        e && e.examine(window.player, true);
-        this.hotInd = index;
-      }, 200);
-    },
-  },
-  created() {
-    this.data = window.myHotList || [];
-  },
-  mounted() {},
-  beforeCreate() {}, //生命周期 - 创建之前
-  beforeMount() {}, //生命周期 - 挂载之前
-  beforeUpdate() {}, //生命周期 - 更新之前
-  updated() {}, //生命周期 - 更新之后
-  beforeDestroy() {}, //生命周期 - 销毁之前
-  destroyed() {}, //生命周期 - 销毁完成
-  activated() {}, //如果页面有keep-alive缓存功能,这个函数会触发
-};
-</script>
-<style lang='less' scoped>
-.hotList {
-  position: absolute;
-  width: 940px;
-  height: 640px;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  background-image: url("../../../assets/img/open/bg-list.png");
-  background-size: 100% 100%;
-  padding: 60px 80px;
-  .title {
-    height: 60px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    .titleLL {
-      font-size: 24px;
-      color: #d6b970;
-    }
-    .titleRR {
-      cursor: pointer;
-    }
-  }
-  .main {
-    margin-top: 20px;
-    width: calc(100% - 14px);
-    height: calc(100% - 100px);
-    overflow-y: auto;
-    .txtNone {
-      height: 100%;
-      color: #d6b970;
-      font-size: 20px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-    .txt {
-      width: calc(100% - 10px);
-      color: #fff;
-      font-size: 16px;
-      & > span {
-        border-top: 1px solid #f0e2c0;
-        padding: 15px 0;
-        cursor: pointer;
-        display: block;
-        width: 100%;
-        &:last-child {
-          margin-bottom: 60px;
-          border-bottom: 1px solid #f0e2c0;
-        }
-        &:hover {
-          color: #d6b970;
-        }
-      }
-      .active {
-        color: #d6b970;
-      }
-    }
-    &::-webkit-scrollbar-thumb {
-      outline: 2px solid #d6b970;
-    }
-    &::-webkit-scrollbar {
-      width: 2px;
-    }
-  }
-}
-@media screen and (max-width: 1000px) {
-  .hotList {
-    max-width: 500px;
-    width: 94%;
-    height: 90%;
-    padding: 30px 10px 30px 30px;
-    .title {
-      .titleLL {
-        font-size: 18px;
-      }
-      .titleRR {
-        position: absolute;
-        right: -5px;
-        top: 5px;
-      }
-    }
-    .main {
-      margin-top: 10px;
-      .txt {
-        font-size: 14px;
-        & > span {
-          &:hover {
-            color: #fff;
-          }
-        }
-        .active {
-          color: #d6b970 !important;
-        }
-      }
-    }
-  }
-}
-</style>

+ 0 - 497
scene/src/views/gui/menu copy.vue

@@ -1,497 +0,0 @@
-<template>
-  <div class="pinBottom-container" @touchstart.stop @keydown.stop>
-    <div class="pinBottom center">
-      <div id="view-controllers"></div>
-    </div>
-    <div class="pinBottom left">
-      <!-- <div v-if="isMobile" id="myClickBox" style="">
-        <div id="go" />
-        <div id="back" />
-      </div> -->
-
-      <div>
-        <div class="viewContainer">
-          <div id="previous" class="previous desktop-only ui-icon" style="display: none">
-            <a>
-              <img rel="tooltip" title="" :src="require('@/assets/images/play.png')" width="24" height="24" data-original-title="播放" />
-            </a>
-          </div>
-          <div id="play" class="ui-icon" rel="tooltip" data-original-title="播放">
-            <!-- 鼠标移入的显示 -->
-            <div class="hoverTit">自动漫游</div>
-            <a>
-              <img :src="require('@/assets/image/icon/tour-play.png')" width="24" height="24" />
-            </a>
-          </div>
-          <div id="pause" class="ui-icon" v-show="false">
-            <!-- 鼠标移入的显示 -->
-            <div class="hoverTit">自动漫游</div>
-
-            <a>
-              <img rel="tooltip" title="" :src="require('@/assets/image/icon/tour-pause.png')" width="24" height="24" data-original-title="暂停" />
-            </a>
-          </div>
-          <div id="next" class="next desktop-only ui-icon wide" style="display: none">
-            <a>
-              <i rel="tooltip" title="" class="icon icon-dpad-right" data-original-title="下一个"></i>
-            </a>
-          </div>
-          <div id="gui-modes-map" class="ui-icon double active">
-            <div data-original-title="导览" @click="isGuide = !isGuide" id="pullTab" rel="tooltip" title="场景导览">
-              <!-- 鼠标移入的显示 -->
-              <div class="hoverTit">重点展位</div>
-
-              <img title="" class="icon icon-inside" :src="require(`@/assets/image/icon/icon_point${!isGuide ? '_active' : '_normal'}.png`)" />
-            </div>
-
-            <!-- 热点列表 -->
-            <div v-show="!hideTools" id="myHotList" @click="openTags">
-              <!-- 鼠标移入的显示 -->
-              <div class="hoverTit">热点列表</div>
-              <img :src="require(`@/assets/image/icon/icon_detail${openInd == 1 ? '_active' : '_normal'}.png`)" alt="" />
-            </div>
-            <div title="迷你漫游" data-original-title="迷你模型" id="gui-modes-dollhouse" rel="tooltip">
-              <!-- 鼠标移入的显示 -->
-              <div class="hoverTit">三维模型</div>
-              <img class="icon icon-inside" :src="require('@/assets/image/icon/icon_dollhouse_normal.png')" />
-              <img class="icon icon-inside active" :src="require('@/assets/image/icon/icon_dollhouse_active.png')" />
-            </div>
-            <div data-original-title="俯视图" id="gui-modes-floorplan" rel="tooltip" title="顶部俯视">
-              <!-- 鼠标移入的显示 -->
-              <div class="hoverTit">俯视平面</div>
-              <img class="icon icon-inside" :src="require('@/assets/image/icon/icon_floor_normal.png')" />
-              <img class="active icon icon-inside active" :src="require('@/assets/image/icon/icon_floor_active.png')" />
-            </div>
-            <div @click="onFullScreen" v-if="!isMobile" rel="tooltip" title="顶部俯视" id="gui-modes-floorplan" data-original-title="俯视图">
-              <!-- 鼠标移入的显示 -->
-              <div class="hoverTit" v-if="!isFullscreen">全屏</div>
-              <div class="hoverTit" v-else>退出全屏</div>
-              <img class="icon icon-inside" :src="require(`@/assets/image/icon/icon_screen${isFullscreen ? '_active' : '_normal'}.png`)" />
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div v-show="!hideTools" class="pinBottom right hideTarget">
-      <div class="rightViewContainer clearfix">
-        <div class="gui-floor">
-          <div class="gui-floor-title"></div>
-          <div class="gui-floor-icon">
-            <span class="gui-floor-number"></span>
-          </div>
-          <div class="container"></div>
-        </div>
-
-        <div id="vr" class="ui-icon wide hidden" style="display: none">
-          <a>
-            <i rel="tooltip" title="{[{ VIEW_IN_VR }]}" class="icon icon-webvr"></i>
-          </a>
-        </div>
-        <div id="sharing" class="ui-icon wide hidden" style="display: none">
-          <a>
-            <i rel="tooltip" title="{[{ SOCIAL_SHARING }]}" class="icon icon-share"></i>
-          </a>
-        </div>
-        <div class="pull-right terms terms2">
-          <a>{[{ TERMS }]}</a>
-        </div>
-
-        <!-- 回到pc页面(首页) -->
-        <div v-show="false" class="toHomeBox" @click="toHomeFu">
-          <!-- 鼠标移入的显示 -->
-          <div class="hoverTit">回到首页</div>
-          <img src="../../assets/img/toHome.png" alt="" />
-        </div>
-
-        <!-- vr -->
-        <div v-show="false" class="toHomeBox" @click="openVR">
-          <!-- 鼠标移入的显示 -->
-          <div class="hoverTit">VR</div>
-          <img src="../../assets/img/openVR.png" alt="" />
-        </div>
-
-        <!-- 音乐 -->
-        <div id="volume" class="ui-icon bgandshare wide">
-          <!-- 鼠标移入的显示 -->
-          <div class="hoverTit">{{ musicState ? "关闭" : "打开" }}音乐</div>
-          <div>
-            <img id="openMusic" style="display: block" @click="switchBGM(true)" src="../../assets/img/musicAc.png" alt="" />
-            <img id="closeMusic" style="display: none" @click="switchBGM(false)" src="../../assets/img/music.png" alt="" />
-          </div>
-        </div>
-        <!-- 分享 -->
-        <div v-show="false" class="toHomeBox" @click="openInd = 2">
-          <!-- 鼠标移入的显示 -->
-          <div class="hoverTit">分享</div>
-          <img src="../../assets/img/share.png" alt="" />
-        </div>
-      </div>
-    </div>
-
-    <!-- <div class="openBox" :class="{ openBoxAc: openInd }">
-      <HotList v-if="openInd === 1" @close="openInd = 0" />
-      <Share v-show="openInd === 2" @close="openInd = 0" :openInd="openInd" />
-    </div> -->
-    <!-- 手动触发导览 -->
-
-    <transition name="slide" appear>
-      <HotList v-if="openInd === 1" @close="openInd = 0" />
-    </transition>
-  </div>
-</template>
-
-<script>
-import HotList from "./components/hotList.vue";
-import Share from "./components/share.vue";
-
-export default {
-  components: { HotList, Share },
-  props: {
-    hideTools: Boolean,
-  },
-  data() {
-    return {
-      isGuide: true,
-      musicState: false,
-      // vr---热点列表---分享
-      openInd: 0,
-      isFullscreen: false,
-    };
-  },
-  watch: {},
-  computed: {},
-  mounted() {
-    let events = ["fullscreenchange", "webkitfullscreenchange", "mozfullscreenchange", "MSFullscreenChange"];
-    events.forEach((item, index) => {
-      window.addEventListener(item, () => {
-        this.isFullscreen = !this.isFullscreen;
-      });
-    });
-  },
-  methods: {
-    openTags() {
-      if (this.openInd) {
-        this.openInd = 0;
-      } else {
-        this.openInd = 1;
-      }
-    },
-    onFullScreen() {
-      let element = document.documentElement;
-      if (this.isFullscreen) {
-        if (document.exitFullscreen) {
-          document.exitFullscreen();
-        } else if (document.webkitCancelFullScreen) {
-          document.webkitCancelFullScreen();
-        } else if (document.mozCancelFullScreen) {
-          document.mozCancelFullScreen();
-        } else if (document.msExitFullscreen) {
-          document.msExitFullscreen();
-        }
-      } else {
-        if (element.requestFullscreen) {
-          element.requestFullscreen();
-        } else if (element.webkitRequestFullScreen) {
-          element.webkitRequestFullScreen();
-        } else if (element.mozRequestFullScreen) {
-          element.mozRequestFullScreen();
-        } else if (element.msRequestFullscreen) {
-          element.msRequestFullscreen();
-        }
-      }
-      // 改变当前全屏状态
-    },
-    switchBGM(flag) {
-      this.musicState = flag;
-      if (flag) {
-        window.manage.switchBgmState(true);
-        document.querySelector("#openMusic").style.display = "none";
-        document.querySelector("#closeMusic").style.display = "block";
-
-        // 手动停止自动导览
-        window.player.director.stopTour();
-      } else {
-        window.manage.switchBgmState(false);
-        document.querySelector("#openMusic").style.display = "block";
-        document.querySelector("#closeMusic").style.display = "none";
-      }
-    },
-    // 点击vr
-    openVR() {
-      window.open("https://www.720yun.com/t/acvkiwdegqb?scene_id=34882556");
-    },
-    // 点击回到首页
-    toHomeFu() {
-      this.switchBGM(false);
-      this.$emit("toHome");
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-::-webkit-scrollbar {
-  width: 5px; /*高宽分别对应横竖滚动条的尺寸*/
-}
-::-webkit-scrollbar-thumb {
-  // box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2);
-  background: #edd3b0;
-  border-color: #edd3b0;
-  color: #edd3b0;
-  outline: none;
-}
-// 鼠标移入显示的文字和图片
-#gui-modes-inside {
-  position: relative;
-}
-#gui-modes-dollhouse {
-  position: relative;
-}
-#gui-modes-floorplan {
-  position: relative;
-}
-.hoverTit {
-  pointer-events: none;
-  transition: all 0.5s;
-  opacity: 0;
-  position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
-  top: -40px;
-  width: 80px;
-  height: 37px;
-  line-height: 30px;
-  text-align: center;
-  background: url("../../assets/image/img_tip.png");
-  background-size: 100% 100%;
-  font-size: 14px;
-  color: #fff;
-}
-#play:hover {
-  .hoverTit {
-    opacity: 1;
-  }
-}
-#pause:hover {
-  .hoverTit {
-    opacity: 1;
-  }
-}
-#gui-modes-map > div:hover {
-  .hoverTit {
-    opacity: 1;
-  }
-}
-#volume {
-  margin-right: 16px;
-}
-#volume,
-#gui-fullscreen,
-#gui-fullscreen-exit {
-  position: relative;
-  .hoverTit {
-    width: 70px;
-  }
-  &:hover {
-    .hoverTit {
-      opacity: 1;
-    }
-  }
-}
-
-// 右侧菜单栏
-@wh: 72px;
-@margin: 21px;
-#play,
-#pause {
-  margin-right: @margin;
-  img {
-    width: @wh;
-    height: @wh;
-  }
-}
-.rightViewContainer {
-  display: flex !important;
-  align-items: center !important;
-  padding-right: 30px;
-}
-#gui-modes-map {
-  > div {
-    margin-right: @margin;
-    > img {
-      width: @wh;
-      height: @wh;
-      display: block !important;
-    }
-    .active {
-      display: none !important;
-    }
-  }
-  .active {
-    > img {
-      display: none !important;
-    }
-    .active {
-      display: block !important;
-    }
-  }
-}
-
-.pinBottom.right .ui-icon {
-  background: none;
-}
-
-#gui-fullscreen img {
-  width: 44px;
-}
-#volume {
-  width: 44px;
-}
-
-#gui-fullscreen-exit img {
-  width: 44px !important;
-}
-.bgandshare {
-  background: none !important;
-  // margin-right: 20px!important;
-  > div {
-    width: 100%;
-    cursor: pointer;
-    img {
-      width: 100%;
-    }
-  }
-}
-
-.toHomeBox {
-  margin-right: 20px;
-  cursor: pointer;
-  position: relative;
-  width: 44px;
-  img {
-    width: 44px;
-  }
-  &:hover {
-    .hoverTit {
-      opacity: 1;
-    }
-  }
-}
-
-.pinBottom-container {
-  #myHotList {
-    position: relative;
-    float: left;
-    width: 70px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    cursor: pointer;
-  }
-  .openBox {
-    opacity: 0;
-    pointer-events: none;
-    transition: all 0.3s;
-    position: fixed;
-    z-index: 9999;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    // background-color: rgba(255, 255, 255, 0.6);
-    backdrop-filter: blur(10px);
-  }
-  .openBoxAc {
-    opacity: 1;
-    pointer-events: auto;
-  }
-}
-.viewContainer {
-  padding: 10px 20px 0 34px;
-}
-// 移动端
-@media screen and (max-width: 1000px) {
-  .hoverTit {
-    opacity: 0 !important;
-  }
-  .viewContainer {
-    padding: 10px 20px 10px 10px;
-    & > div {
-      img {
-        width: 40px !important;
-        height: 40px !important;
-      }
-    }
-  }
-  .pinBottom-container #myHotList {
-    width: 50px;
-    margin-bottom: 15px;
-  }
-
-  .pinBottom-container {
-    .pinBottom.right.hideTarget {
-      position: fixed;
-      top: 200px;
-      right: 10px;
-      .rightViewContainer {
-        flex-direction: column;
-        & > div,
-        #volume {
-          width: 50px !important;
-          text-align: right;
-          margin-right: 0;
-          // margin-bottom: 10px;
-          & > div {
-            // display: flex;
-            // justify-content: flex-end;
-          }
-          .container{
-            right: auto;
-            left: 50% !important;
-            top: -68px;
-          }
-          img {
-            width: 33px;
-            height: 33px;
-          }
-        }
-      }
-    }
-  }
-}
-#myClickBox {
-  display: flex;
-  flex-direction: column;
-  position: fixed;
-  z-index: 999;
-  left: 50%;
-  bottom: 38px;
-  width: 146px;
-  height: 146px;
-  transform: translateX(-50%);
-  background: url("../../assets/img/m_btn.png") no-repeat center / contain;
-  transition: 0.2s bottom linear;
-
-  > div {
-    flex: 1;
-  }
-}
-.pinBottom.open #myClickBox {
-  bottom: calc(118px + 20px);
-}
-/* 进入的起点、离开的终点 */
-.slide-enter,
-.slide-leave-to {
-  transform: translateX(100%);
-}
-.slide-enter-active,
-.slide-leave-active {
-  transition: 0.5s linear;
-}
-/* 进入的终点、离开的起点 */
-.hello-enter-to,
-.slide-leave {
-  transform: translateX(0);
-}
-</style>

+ 0 - 439
scene/src/views/gui/menu old.vue

@@ -1,439 +0,0 @@
-<template>
-  <div class="pinBottom-container" @touchstart.stop @keydown.stop>
-    <div class="pinBottom center">
-      <div id="view-controllers"></div>
-    </div>
-    <div class="pinBottom left">
-      <div v-if="isMobile" id="myClickBox" style="">
-        <div id="go" />
-        <div id="back" />
-      </div>
-
-      <div>
-        <div class="viewContainer">
-          <div id="previous" class="previous desktop-only ui-icon" style="display: none">
-            <a>
-              <img rel="tooltip" title="" :src="require('@/assets/images/play.png')" width="24" height="24" data-original-title="播放" />
-            </a>
-          </div>
-          <div id="play" class="ui-icon" rel="tooltip" data-original-title="播放">
-            <!-- 鼠标移入的显示 -->
-            <div class="hoverTit">自动导览</div>
-            <a>
-              <img :src="require('@/assets/images/icon/play.png')" width="24" height="24" />
-            </a>
-          </div>
-          <div id="pause" class="ui-icon" style="display: none">
-            <!-- 鼠标移入的显示 -->
-            <div class="hoverTit">自动导览</div>
-
-            <a>
-              <img rel="tooltip" title="" :src="require('@/assets/images/icon/pause.png')" width="24" height="24" data-original-title="暂停" />
-            </a>
-          </div>
-          <div id="next" class="next desktop-only ui-icon wide" style="display: none">
-            <a>
-              <i rel="tooltip" title="" class="icon icon-dpad-right" data-original-title="下一个"></i>
-            </a>
-          </div>
-          <div id="gui-modes-map" class="ui-icon double active">
-            <div data-original-title="导览" @click="isGuide = !isGuide" id="pullTab" rel="tooltip" title="场景导览">
-              <!-- 鼠标移入的显示 -->
-              <div class="hoverTit">导览列表</div>
-
-              <img title="" class="icon icon-inside" :src="require(`@/assets/images/icon/auto${!isGuide ? '_active' : ''}.png`)" />
-            </div>
-
-            <div data-original-title="全景漫游" id="gui-modes-inside" rel="tooltip">
-              <!-- 鼠标移入的显示 -->
-              <div class="hoverTit">全景漫游</div>
-
-              <img class="icon icon-inside" :src="require('@/assets/images/icon/inside.png')" />
-              <img class="icon icon-inside active" :src="require('@/assets/images/icon/inside_active.png')" />
-            </div>
-            <div title="迷你漫游" data-original-title="迷你模型" id="gui-modes-dollhouse" rel="tooltip">
-              <!-- 鼠标移入的显示 -->
-              <div class="hoverTit">三维视觉</div>
-              <img class="icon icon-inside" :src="require('@/assets/images/icon/dollhouse.png')" />
-              <img class="icon icon-inside active" :src="require('@/assets/images/icon/dollhouse_active.png')" />
-            </div>
-            <div data-original-title="俯视图" id="gui-modes-floorplan" rel="tooltip" title="顶部俯视">
-              <!-- 鼠标移入的显示 -->
-              <div class="hoverTit">平面视觉</div>
-              <img class="icon icon-inside" :src="require('@/assets/images/icon/floor.png')" />
-              <img class="active icon icon-inside active" :src="require('@/assets/images/icon/floor_active.png')" />
-            </div>
-
-            <!-- 热点列表 -->
-            <div v-show="!hideTools" id="myHotList" @click="openInd = 1">
-              <!-- 鼠标移入的显示 -->
-              <div class="hoverTit">热点列表</div>
-              <img src="../../assets/img/hot.png" alt="" />
-            </div>
-
-            <div data-original-title="VR" id="vr" rel="tooltip" title="" style="display: none">
-              <img class="icon icon-inside" :src="require('@/assets/images/VR.png')" />
-            </div>
-            <div data-original-title="消除外壳" id="gui-remove-face" rel="tooltip" title="" style="display: none; float: left">
-              <img class="icon icon-inside" :src="require('@/assets/images/face.jpg')" />
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div v-show="!hideTools" class="pinBottom right hideTarget">
-      <div class="rightViewContainer clearfix">
-        <div class="gui-floor">
-          <div class="gui-floor-title"></div>
-          <div class="gui-floor-icon">
-            <span class="gui-floor-number"></span>
-          </div>
-          <div class="container"></div>
-        </div>
-
-        <div id="vr" class="ui-icon wide hidden" style="display: none">
-          <a>
-            <i rel="tooltip" title="{[{ VIEW_IN_VR }]}" class="icon icon-webvr"></i>
-          </a>
-        </div>
-        <div id="sharing" class="ui-icon wide hidden" style="display: none">
-          <a>
-            <i rel="tooltip" title="{[{ SOCIAL_SHARING }]}" class="icon icon-share"></i>
-          </a>
-        </div>
-        <div class="pull-right terms terms2">
-          <a>{[{ TERMS }]}</a>
-        </div>
-
-        <!-- 回到pc页面(首页) -->
-        <div class="toHomeBox" @click="toHomeFu">
-          <!-- 鼠标移入的显示 -->
-          <div class="hoverTit">回到首页</div>
-          <img src="../../assets/img/toHome.png" alt="" />
-        </div>
-
-        <!-- vr -->
-        <div class="toHomeBox" @click="openVR">
-          <!-- 鼠标移入的显示 -->
-          <div class="hoverTit">VR</div>
-          <img src="../../assets/img/openVR.png" alt="" />
-        </div>
-
-        <!-- 音乐 -->
-        <div id="volume" class="ui-icon bgandshare wide">
-          <!-- 鼠标移入的显示 -->
-          <div class="hoverTit">{{ musicState ? "关闭" : "打开" }}音乐</div>
-          <div>
-            <img id="openMusic" style="display: block" @click="switchBGM(true)" src="../../assets/img/musicAc.png" alt="" />
-            <img id="closeMusic" style="display: none" @click="switchBGM(false)" src="../../assets/img/music.png" alt="" />
-          </div>
-        </div>
-        <!-- 分享 -->
-        <div class="toHomeBox" @click="openInd = 2">
-          <!-- 鼠标移入的显示 -->
-          <div class="hoverTit">分享</div>
-          <img src="../../assets/img/share.png" alt="" />
-        </div>
-      </div>
-    </div>
-
-    <div class="openBox" :class="{ openBoxAc: openInd }">
-      <HotList v-if="openInd === 1" @close="openInd = 0" />
-      <Share v-show="openInd === 2" @close="openInd = 0" :openInd="openInd" />
-    </div>
-    <!-- 手动触发导览 -->
-  </div>
-</template>
-
-<script>
-import HotList from "./components/hotList.vue";
-import Share from "./components/share.vue";
-
-export default {
-  components: { HotList, Share },
-  props: {
-    hideTools: Boolean,
-  },
-  data() {
-    return {
-      isGuide: true,
-      musicState: false,
-      // vr---热点列表---分享
-      openInd: 0,
-    };
-  },
-  watch: {},
-  computed: {},
-  mounted() {},
-  methods: {
-    switchBGM(flag) {
-      this.musicState = flag;
-      if (flag) {
-        window.manage.switchBgmState(true);
-        document.querySelector("#openMusic").style.display = "none";
-        document.querySelector("#closeMusic").style.display = "block";
-
-        // 手动停止自动导览
-        window.player.director.stopTour();
-      } else {
-        window.manage.switchBgmState(false);
-        document.querySelector("#openMusic").style.display = "block";
-        document.querySelector("#closeMusic").style.display = "none";
-      }
-    },
-    // 点击vr
-    openVR() {
-      window.open("https://www.720yun.com/t/acvkiwdegqb?scene_id=34882556");
-    },
-    // 点击回到首页
-    toHomeFu() {
-      this.switchBGM(false);
-      this.$emit("toHome");
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-::-webkit-scrollbar {
-  width: 5px; /*高宽分别对应横竖滚动条的尺寸*/
-}
-::-webkit-scrollbar-thumb {
-  // box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2);
-  background: #edd3b0;
-  border-color: #edd3b0;
-  color: #edd3b0;
-  outline: none;
-}
-// 鼠标移入显示的文字和图片
-#gui-modes-inside {
-  position: relative;
-}
-#gui-modes-dollhouse {
-  position: relative;
-}
-#gui-modes-floorplan {
-  position: relative;
-}
-.hoverTit {
-  pointer-events: none;
-  transition: all 0.5s;
-  opacity: 0;
-  position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
-  top: -40px;
-  width: 80px;
-  height: 37px;
-  line-height: 30px;
-  text-align: center;
-  background: url("../../assets/img/hoverTit.png");
-  background-size: 100% 100%;
-  font-size: 14px;
-  color: #fff;
-}
-#play:hover {
-  .hoverTit {
-    opacity: 1;
-  }
-}
-#pause:hover {
-  .hoverTit {
-    opacity: 1;
-  }
-}
-#gui-modes-map > div:hover {
-  .hoverTit {
-    opacity: 1;
-  }
-}
-#volume {
-  margin-right: 16px;
-}
-#volume,
-#gui-fullscreen,
-#gui-fullscreen-exit {
-  position: relative;
-  .hoverTit {
-    width: 70px;
-  }
-  &:hover {
-    .hoverTit {
-      opacity: 1;
-    }
-  }
-}
-
-// 右侧菜单栏
-@wh: 44px;
-@margin: 0px;
-#play,
-#pause {
-  margin-right: @margin;
-  img {
-    width: @wh;
-    height: @wh;
-  }
-}
-.rightViewContainer {
-  display: flex !important;
-  align-items: center !important;
-}
-#gui-modes-map {
-  > div {
-    margin-right: @margin;
-    > img {
-      width: @wh;
-      height: @wh;
-      display: block !important;
-    }
-    .active {
-      display: none !important;
-    }
-  }
-  .active {
-    > img {
-      display: none !important;
-    }
-    .active {
-      display: block !important;
-    }
-  }
-}
-
-.pinBottom.right .ui-icon {
-  background: none;
-}
-
-#gui-fullscreen img {
-  width: 44px;
-}
-#volume {
-  width: 44px;
-}
-
-#gui-fullscreen-exit img {
-  width: 44px !important;
-}
-.bgandshare {
-  background: none !important;
-  // margin-right: 20px!important;
-  > div {
-    width: 100%;
-    cursor: pointer;
-    img {
-      width: 100%;
-    }
-  }
-}
-
-.toHomeBox {
-  margin-right: 20px;
-  cursor: pointer;
-  position: relative;
-  width: 44px;
-  img {
-    width: 44px;
-  }
-  &:hover {
-    .hoverTit {
-      opacity: 1;
-    }
-  }
-}
-
-.pinBottom-container {
-  #myHotList {
-    position: relative;
-    float: left;
-    width: 70px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    cursor: pointer;
-  }
-  .openBox {
-    opacity: 0;
-    pointer-events: none;
-    transition: all 0.3s;
-    position: fixed;
-    z-index: 9999;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    // background-color: rgba(255, 255, 255, 0.6);
-    backdrop-filter: blur(10px);
-  }
-  .openBoxAc {
-    opacity: 1;
-    pointer-events: auto;
-  }
-}
-
-// 移动端
-@media screen and (max-width: 1000px) {
-  .hoverTit {
-    opacity: 0 !important;
-  }
-  .viewContainer {
-    & > div {
-      img {
-        width: 33px !important;
-        height: 33px !important;
-      }
-    }
-  }
-  .pinBottom-container #myHotList {
-    width: 50px;
-    margin-bottom: 15px;
-  }
-
-  .pinBottom-container {
-    .pinBottom.right.hideTarget {
-      position: fixed;
-      top: 200px;
-      right: 10px;
-      .rightViewContainer {
-        flex-direction: column;
-        & > div,
-        #volume {
-          width: 50px !important;
-          text-align: right;
-          margin-right: 0;
-          margin-bottom: 10px;
-          & > div {
-            display: flex;
-            justify-content: flex-end;
-          }
-          img {
-            width: 33px;
-            height: 33px;
-          }
-        }
-      }
-    }
-  }
-}
-#myClickBox {
-  display: flex;
-  flex-direction: column;
-  position: fixed;
-  z-index: 999;
-  left: 50%;
-  bottom: 38px;
-  width: 146px;
-  height: 146px;
-  transform: translateX(-50%);
-  background: url("../../assets/img/m_btn.png") no-repeat center / contain;
-  transition: 0.2s bottom linear;
-
-  > div {
-    flex: 1;
-  }
-}
-.pinBottom.open #myClickBox {
-  bottom: calc(118px + 20px);
-}
-</style>

+ 2 - 1
scene/src/views/gui/menu.vue

@@ -484,7 +484,8 @@ export default {
         // 监听导览播放
         player.director.on("update.controls", () => {
           let n = player.director.describe();
-          this.setData({ guideIsPlay: n.tourInProgress });
+          this.setData({ guideIsPlay: n.tourIsPlaying });
+          
           if (null !== n.currentItem) {
             //n.currentItem是二维数组,代表导览中的两层,导览图片展示的是外层的,也就是数据第一个元素。
             if (this.guideIsPlay) {