Merge branch 'gugong1.0' of http://192.168.0.115:3000/xingjinxing/ggbwy_onlineTour into gugong1.0

scene/public/static/css/main.css

@@ -3156,9 +3156,9 @@ html {
   }
 }
 
-@media only screen and (max-height: 600px) {
+@media only screen and (max-height: 900px) {
   .model-title {
-    top: 10%;
+    top: 25%;
     bottom: auto;
   }
 }

scene/public/static/js/Hot.js

@@ -56,7 +56,7 @@ window.initHot = function (model) {
 
     
     if (window.project_env && window.project_env == "development") {
-      return src.replace("https://www.4dmodel.com/SuperTwo/hot_online1", "http://localhost:8089");
+      return src.replace("https://www.4dmodel.com/SuperTwo/hot_online1", "http://192.168.0.18:8089");
     } else {
       return src.replace("https://www.4dmodel.com/SuperTwo/hot_online1", "hot");
     }

scene/src/views/gui/components/hotList.vue

@@ -138,6 +138,7 @@ export default {
     display: flex;
     align-items: center;
     font-size: 16px;
+    
     .search-icon {
       width: 21px;
       height: 21px;
@@ -152,6 +153,7 @@ export default {
       outline: none;
       border: none;
       padding: 10px;
+      user-select: text;
       &::placeholder {
         color: rgba(187, 171, 146, 0.5) !important;
       }

scene/src/views/gui/components/layerMap.vue

@@ -178,12 +178,12 @@ export default {
 //@import url(); 引入公共css类
 .layer-box {
   position: fixed;
-  width: 100vw;
-  height: 100vh;
-  background: rgba(0, 0, 0, 0.6);
   top: 0;
   left: 0;
-  z-index: 100;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.6);
+  z-index: 10002;
   .layer-close {
     position: absolute;
     width: 56px;
@@ -408,7 +408,7 @@ export default {
   }
 
   &.isMobile {
-    overflow: scroll;
+    overflow-y: auto;
     .layer-close {
       width: 1.0667rem;
       height: 1.0667rem;
@@ -417,7 +417,6 @@ export default {
     }
     .layer-content {
       flex-direction: column;
-      overflow: scroll;
       height: auto;
       max-width: 91%;
       padding-top: 1.8667rem;

scene/src/views/gui/menu.vue

@@ -231,25 +231,28 @@
           :class="getActive(i.type)"
           @click.stop="hanlderButtons(i, i.type)"
           v-for="(i, index) in mobileTopBtns"
-          v-show="mode == 'dollhouse' ? ['model', 'realMap'].includes(i.type) : !['model', 'realMap'].includes(i.type)"
+          v-show="mode == 'dollhouse' ? ['model', 'realMap'].includes(i.type) : openType === 'immersive' ? ['immersive'].includes(i.type) : !['model', 'realMap'].includes(i.type)"
         >
           <img class="normal" :src="i.normalIcon" alt="" />
           <img class="active" :src="i.activeIcon" alt="" />
         </div>
       </div>
       <div class="mobile-bottom-button" :class="{ center: openType == 'immersive', ['show-guide']: showGuide && !isCollapse }">
-        <div
-          class="button-item"
-          :class="`${getBottomActive(i.type)} ${i.action === 'play' && guideIsPlay && 'active pause'}`"
-          :style="`display:${i.type == 'hots' && openType == 'immersive' ? 'none' : 'block'};`"
-          @click.stop="hanlderButtons(i, i.type)"
+        <template 
           v-for="(i, index) in mobileBottomBtns"
-          v-if="kanzhanBtnVisible ? i.type == 'controls' : i.type !== 'controls'"
-          v-show="i.type == 'model' || i.type == 'music' || mode == 'panorama'"
         >
-          <img class="normal" :src="i.normalIcon" alt="" />
-          <img class="active" :src="i.activeIcon" alt="" />
-        </div>
+          <div
+            v-if="kanzhanBtnVisible ? i.type == 'controls' : i.type !== 'controls'"
+            :key="index"
+            class="button-item"
+            :class="`${getBottomActive(i.type)} ${i.action === 'play' && guideIsPlay && 'active pause'}`"
+            :style="`display:${(['hots', 'route'].includes(i.type) && openType == 'immersive') || mode === 'dollhouse' ? 'none' : 'block'};`"
+            @click.stop="hanlderButtons(i, i.type)"
+          >
+            <img class="normal" :src="i.normalIcon" alt="" />
+            <img class="active" :src="i.activeIcon" alt="" />
+          </div>
+        </template>
       </div>
     </template>
     <!-- 音乐按钮 -->
@@ -600,6 +603,9 @@ export default {
       this.setData({ showGuide: false, guideIsPlay: false });
     },
     hanlderButtons(item, type) {
+      // 飞入飞出中
+      if (player.flying) return;
+
       if (item.handler) {
         item.handler()
         return