Browse Source

移动端修复bug

shaogen1995 3 years ago
parent
commit
b76e33c0f9

+ 5 - 4
webM/public/static/js/main_2020_show.js

@@ -4137,7 +4137,7 @@ window.Modernizr = function(n, e, t) {
                     case c.LEFT:
                         this.startRotationFrom(e.clientX, e.clientY)
                     }
-                    SoundManager.pause('tour') // 周恩光 点击场景时停止语音
+                    // SoundManager.pause('tour') // 周恩光 点击场景时停止语音
                     this.emit(u.InputStart, "mouse")
                 }
             }
@@ -8856,9 +8856,10 @@ window.Modernizr = function(n, e, t) {
             }, p.tourInteraction.allowNextClick))
         }
         function a() {
-            // C.tourInProgress && (C.stopTour(),
-            // C.endTourProgress(),
-            // E.classList.remove("playing"))
+            C.tourInProgress && (
+                // C.stopTour(),
+            C.endTourProgress(),
+            E.classList.remove("playing"))
         }
         function s() {
             T.is(":visible") ? r() : o()

+ 2 - 2
webM/public/static/js/manage.js

@@ -1,8 +1,8 @@
   
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
 // var g_Prefix="https://super.4dage.com/";
-var g_Prefix="http://project.4dage.com:8017/";//有自己的大场景编辑后台的 - 线上场景调试
-// var g_Prefix=window.origin+'/';//有自己的大场景编辑后台的 - 打包
+// var g_Prefix="http://project.4dage.com:8017/";//有自己的大场景编辑后台的 - 线上场景调试
+var g_Prefix=window.origin+'/';//有自己的大场景编辑后台的 - 打包
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
 
 var s = window.location.href.split('/');

+ 13 - 15
webM/src/App.vue

@@ -1,29 +1,27 @@
 <template>
-    <div class="vvvv">
-        <router-view/>
-        <div class="orientation-tip" v-if="isMobile">
-        <div>
-            <img :src="require('@/assets/images/project/landtip.png')" alt="" />
-            <p>请在竖屏模式观看</p>
-        </div>
-        </div>
+  <div class="vvvv">
+    <router-view />
+    <div class="orientation-tip" v-if="isMobile">
+      <div>
+        <img :src="require('@/assets/images/project/landtip.png')" alt="" />
+        <p>请在竖屏模式观看</p>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
 import '@/assets/style/reset.less'
 import '@/assets/style/public.less'
 export default {
-    
 }
 </script>
 <style lang="less">
-.vvvv{
-    width: 100%;
-    height: 100%;
+.vvvv {
+  width: 100%;
+  height: 100%;
 }
 
-
 /*横屏体验*/
 .orientation-tip {
   width: 100%;
@@ -32,7 +30,7 @@ export default {
   position: fixed;
   top: 0;
   left: 0;
-  display: none;
+  display: none !important;
   background-color: rgba(0, 0, 0, 0.8);
 
   > div {
@@ -43,7 +41,7 @@ export default {
     transform: translate(-50%, -50%);
     text-align: center;
     > img {
-        width: 20%;
+      width: 20%;
     }
     > p {
       font-size: 16px;

BIN
webM/src/assets/img/music.png


BIN
webM/src/assets/img/musicAc.png


+ 34 - 38
webM/src/views/gui/component/antique.vue

@@ -45,12 +45,12 @@
           </div>
         </div>
       </div>
+      <!-- 关闭按钮 -->
+      <div class="close" @click="$emit('close')" v-show="!modelShow"></div>
     </div>
-    <!-- 关闭按钮 -->
-    <div class="close" @click="$emit('close')" v-show="!modelShow"></div>
     <!-- 模型和图片 -->
     <div class="model" v-if="modelShow">
-      <div class="ifrCon" ref="ifrCon">
+      <div class="ifrCon" ref="ifrCon" :class="{ifrConFull:fullscreen}">
         <!-- 全屏显示的标题 -->
         <div class="fullTitle" v-if="fullscreen">{{ txtInfo.name }}</div>
         <img
@@ -119,6 +119,8 @@ export default {
       if (val) {
         setTimeout(() => {
           this.$refs.myInput.focus();
+          console.log(123456);
+          document.activeElement.scrollIntoViewIfNeeded();
         }, 100);
       }
     },
@@ -133,32 +135,13 @@ export default {
     },
     // 点击模型全屏
     screen() {
-      const element = this.$refs.ifrCon; // 获取容器
-      if (this.fullscreen) {
-        // 如果已经全屏了就退出全屏
+      // const element = this.$refs.ifrCon; // 获取容器
+      // if (this.fullscreen) {
+      //   // 如果已经全屏了就退出全屏
+      
+      // } else {
 
-        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) {
-          // IE11
-          element.msRequestFullscreen();
-        }
-      }
+      // }
 
       this.fullscreen = !this.fullscreen;
     },
@@ -210,6 +193,13 @@ export default {
   z-index: 10000 !important;
 }
 .antique {
+  position: fixed;
+  width: 100vw;
+  height: calc(100% - 50px);
+  bottom: 0;
+  left: 0;
+  z-index: 9998;
+
   .model {
     padding: 15px 10px 50px;
     position: absolute;
@@ -276,6 +266,15 @@ export default {
         font-size: 20px;
       }
     }
+    .ifrConFull{
+      position: fixed;
+      top: 0;
+      left: 0;
+      max-height: 100vh;
+      z-index: 99999;
+      width: 100vw;
+      height: 100vh;
+    }
     .rightTxt::-webkit-scrollbar {
       width: 4px;
     }
@@ -307,13 +306,6 @@ export default {
       }
     }
   }
-
-  position: fixed;
-  width: 100vw;
-  height: calc(100% - 50px);
-  bottom: 0;
-  left: 0;
-  z-index: 9998;
   &::before {
     content: "";
     position: absolute;
@@ -326,9 +318,12 @@ export default {
     z-index: -1;
   }
   .main {
+    position: relative;
     padding: 15px 10px 0;
     width: 100%;
-    height: calc(100% - 60px);
+    height: 100%;
+    min-height: 518px;
+
     .top {
       width: 100%;
       padding-left: 10px;
@@ -410,7 +405,7 @@ export default {
     .conten {
       border-radius: 8px;
       width: 334px;
-      height: calc(100% - 45px);
+      height: calc(100% - 105px);
       margin: 15px auto 0;
       background-color: #fff6d2;
       padding: 10px 0 10px 10px;
@@ -472,13 +467,14 @@ export default {
     cursor: pointer;
     position: absolute;
     left: 50%;
-    bottom: 15px;
+    bottom: 12px;
     transform: translateX(-50%);
     width: 30px;
     height: 30px;
     background: url("../../../assets/img/close.png");
     background-size: 100% 100%;
   }
+
   @media screen and (max-width: 355px) {
     .top {
       font-size: 12px !important;

+ 1 - 0
webM/src/views/gui/component/mapNav.vue

@@ -105,6 +105,7 @@ export default {
       }
     }
     .rowTxt {
+      font-weight: 700;
       color: #774926;
       position: absolute;
       top: 50%;

+ 12 - 2
webM/src/views/gui/menu.vue

@@ -368,7 +368,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-#closeMusic{
+#closeMusic {
   display: none;
 }
 #hotList {
@@ -383,6 +383,16 @@ export default {
   height: 50px;
   transition: height 0.3s;
   overflow: hidden;
+  &::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 20%;
+    height: 100%;
+    backdrop-filter: blur(10px);
+    z-index: -2;
+  }
   .top {
     width: 100%;
     height: 50px;
@@ -603,7 +613,7 @@ export default {
 .viewContainer {
   width: 350px;
   background-color: rgba(132, 90, 59, 0.8);
-  padding: 10px 30px 10px 5px;
+  padding: 5px 30px 13px 5px;
   border-radius: 0 50px 50px 0;
   .packDo {
     position: absolute;