Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/macao_army

SuperTwo762/css/main.css

@@ -3296,7 +3296,7 @@ a.hasHover:hover, a:active {
     height: 10px;
     top: 0px;
     left: 0px;
-    background: #00b4ed;
+    background: #d60401;
     border-radius: 5px;
     overflow: hidden;
 }
@@ -3308,7 +3308,7 @@ a.hasHover:hover, a:active {
     height: 64px;
     -webkit-border-radius: 16px;
     border-radius: 16px;
-    background: #00b4ed;
+    background: #d60401;
     -webkit-animation: sparkle 1500ms linear infinite;
     -moz-animation: sparkle 1500ms linear infinite;
     -o-animation: sparkle 1500ms linear infinite;
@@ -3798,6 +3798,7 @@ a.hasHover:hover, a:active {
     /* background: rgba(0, 0, 0, 0.2); */
     border-radius: 10px;
     margin-right: 10px;
+    margin-bottom: -10px;
 }
 
 #volume>a, #gui-fullscreen>a, #gui-fullscreen-exit>a {
@@ -4028,6 +4029,7 @@ a.hasHover:hover, a:active {
 }
 
 #thumb-container .thumbImg img {
+    width: 100%;
     height: 97px
 }
 
@@ -4069,11 +4071,11 @@ a.hasHover:hover, a:active {
 .frame .slidee li .overlay {
     position: absolute;
     bottom: 2px;
-    left: 2px;
-    width: 100%;
+    left: 4px;
+    width: 128px;
     height: 20px;
     padding: 6px;
-    color: #fff;
+    color: #fdd57c;
     background-color: rgba(0, 0, 0, .7);
     overflow: hidden;
     white-space: nowrap;
@@ -4130,7 +4132,7 @@ a.hasHover:hover, a:active {
 
 .frame .slidee li.thumbImg.active>img, .frame .slidee li.thumbImg.hasHover.active>img:hover {
     opacity: 1;
-    border-color: #BFAF1E
+    border: 4px solid #fdd57c;
 }
 
 .scrollbar {
@@ -4202,14 +4204,14 @@ a.hasHover:hover, a:active {
 
 #progressBar .step::before {
     content: '';
-    background-color: #575757;
+    background-color: #dc2506;
     width: 100%;
     height: 100%;
     display: block
 }
 
 #progressBar .step.active::before, #progressBar .step.recent::before {
-    background-color: #00b4ed
+    background-color: #fcd67b
 }
 
 #progressBar .step.upcoming::before {
@@ -4350,6 +4352,9 @@ a.hasHover:hover, a:active {
     .frame .slidee li, .frame .slidee li .overlay {
         width: 103px
     }
+    .frame .slidee li .overlay {
+        width: 95px;
+    }
     #drawer-container.drawerOpen #drawer.open.noScroll {
         height: 94px
     }

SuperTwo762/css/oldVer/main0.css

@@ -155,7 +155,7 @@ iframe{
 		width: 50px;
 		height: 50px;
 		right: 50%;
-		top: 80vh;
+		top: 85vh;
 		transform: translateX(50%);
 	}
 

SuperTwo762/js/main_2020_show.js

@@ -13,6 +13,9 @@ window.momentTourBlackNewType = 0//true
 
 g_playAudio = null
 
+// 全屏热点退出按钮
+exit = null
+
 g_tourAudio = new Audio 
 g_tourAudio.loop = !1 
 g_tourAudio.crossOrigin = "anonymous" 
@@ -4808,6 +4811,9 @@ window.Modernizr = function(n, e, t) {
                 }
                 i && this.emit(u.Move, "key")
                 if(e == 27){
+                    if(exit){
+                        $(exit).click()
+                    }
                     window.player.closePopup()
                 }
             }
@@ -6930,6 +6936,10 @@ window.Modernizr = function(n, e, t) {
                 ze = !1
             }
             function g(e, t) {
+                // $('#gui-modes-inside img').attr('src','images/inside1.png')
+                // $('#gui-modes-dollhouse img').attr('src','images/dollhouse.png')
+                // $('#gui-modes-floorplan img').attr('src','images/floor.png')
+
                 var i = e.mode
                   , n = t || e.currentPano;
                 $("#gui-modes-dollhouse").toggleClass("active", i === _e.DOLLHOUSE),
@@ -6946,8 +6956,19 @@ window.Modernizr = function(n, e, t) {
                 $("#gui-modes-outside").addClass("hidden"),
                 e.model.has360Views && $(".gui-floor").removeClass("hidden"),
                 $("#view-controllers").is(":visible") || $("#view-controllers").slideDown(Q.guiAnimationSpeed))
+
+
+                setTimeout(()=>{
+                // console.log(1111111,$('#gui-modes-inside').attr('class'));
+                if($('#gui-modes-inside').attr('class')==='active'){
+                    $('#gui-modes-inside img').attr('src','images/inside1.png')
+                    $('#gui-modes-dollhouse img').attr('src','images/dollhouse.png')
+                    $('#gui-modes-floorplan img').attr('src','images/floor.png')
+                }
+                },500)
             }
             function m(e, t) {
+                // console.log(1111111);
                 var i = t.player;
                 $("#gui-modes-inside").on("mousedown touchstart", function(e) {
                     l(e),
@@ -6957,6 +6978,7 @@ window.Modernizr = function(n, e, t) {
                         gui_action: "click_inside_mode_button"
                     }),
                     t.changeMode(_e.PANORAMA);
+                    // console.log(333333);
                     $('#gui-modes-inside img').attr('src','images/inside1.png')
                     $('#gui-modes-dollhouse img').attr('src','images/dollhouse.png')
                     $('#gui-modes-floorplan img').attr('src','images/floor.png')
@@ -16386,7 +16408,7 @@ window.Modernizr = function(n, e, t) {
                     div.style.left = div.style.top = '0';
                     div.style["z-index"] = "999"
                     
-                    var exit = document.createElement("div");
+                    exit = document.createElement("div");
                     exit.style["background-image"] = "url(images/vrOffImg.png)";
                     exit.style.position = 'absolute';
                     exit.style.width = exit.style.height = "50px";
@@ -22348,6 +22370,11 @@ window.Modernizr = function(n, e, t) {
 				document.querySelector(".popup-content").removeChild(document.getElementById("id1"));
 				$("#popup iframe:last").remove();
                 var _bgaudio = document.getElementById("bgaudio");
+                try{ 
+                    window.parent.postMessage("closeHot",'*') 
+                }catch(e){
+                    console.log(e)
+                }
                 //判断音乐是否暂停或者是否存在
                 /* if(g_bgAudio && g_bgAudio.paused && g_bgAudio.readyState != 0 && g_play === 1)
                 {

SuperTwo791/css/main.css

@@ -3295,7 +3295,7 @@ a.hasHover:hover, a:active {
     height: 10px;
     top: 0px;
     left: 0px;
-    background: #00b4ed;
+    background: #d60401;
     border-radius: 5px;
     overflow: hidden;
 }
@@ -3307,7 +3307,7 @@ a.hasHover:hover, a:active {
     height: 64px;
     -webkit-border-radius: 16px;
     border-radius: 16px;
-    background: #00b4ed;
+    background: #d60401;
     -webkit-animation: sparkle 1500ms linear infinite;
     -moz-animation: sparkle 1500ms linear infinite;
     -o-animation: sparkle 1500ms linear infinite;
@@ -3342,7 +3342,9 @@ a.hasHover:hover, a:active {
 }
 
 .darkGlass {
-    background-color: #c87f20;
+    background-color: rgba(207, 123, 14, 1);
+    /* background: url('../images/bigBAC.png') no-repeat center;
+    background-size: cover; */
 }
 
 .ui-icon {
@@ -4068,11 +4070,11 @@ a.hasHover:hover, a:active {
 .frame .slidee li .overlay {
     position: absolute;
     bottom: 2px;
-    left: 2px;
-    width: 130px;
+    left: 4px;
+    width: 126px;
     height: 20px;
     padding: 6px;
-    color: #fff;
+    color: #fdd57c;
     background-color: rgba(0, 0, 0, .7);
     overflow: hidden;
     white-space: nowrap;
@@ -4129,7 +4131,8 @@ a.hasHover:hover, a:active {
 
 .frame .slidee li.thumbImg.active>img, .frame .slidee li.thumbImg.hasHover.active>img:hover {
     opacity: 1;
-    border-color: #BFAF1E
+    border: 4px solid #fdd57c;
+    /* border-color: #fdd57c */
 }
 
 .scrollbar {
@@ -4350,6 +4353,10 @@ a.hasHover:hover, a:active {
     .frame .slidee li, .frame .slidee li .overlay {
         width: 103px
     }
+    .frame .slidee li .overlay {
+        width: 98px;
+    }
+
     #drawer-container.drawerOpen #drawer.open.noScroll {
         height: 94px
     }

SuperTwo791/css/oldVer/main0.css

@@ -52,7 +52,7 @@ iframe{
 	opacity:0.1; 
 }
 #closepop {
-	background: url(https://super.4dage.com/images/close1.png) no-repeat;
+	background: url('../../images/close2.png') no-repeat;
 	width: 60px;
 	height: 60px;
 	cursor: pointer;
@@ -153,8 +153,9 @@ iframe{
 	#closepop{
 		width: 36px;
 		height: 36px;
-		top: 0px;
-		right: 0px;
+		top: 85vh;
+		right: 50%;
+		transform: translateX(50%);
 	}
 
 	#title-toggle{

SuperTwo791/js/main_2020_show.js

@@ -6495,6 +6495,16 @@ window.Modernizr = function(n, e, t) {
                 $("#gui-modes-outside").addClass("hidden"),
                 e.model.has360Views && $(".gui-floor").removeClass("hidden"),
                 $("#view-controllers").is(":visible") || $("#view-controllers").slideDown(Q.guiAnimationSpeed))
+
+                setTimeout(()=>{
+                    // console.log(1111111,$('#gui-modes-inside').attr('class'));
+                    if($('#gui-modes-inside').attr('class')==='active'){
+                        $('#gui-modes-inside img').attr('src','images/inside1.png')
+                        $('#gui-modes-dollhouse img').attr('src','images/dollhouse.png')
+                        $('#gui-modes-floorplan img').attr('src','images/floor.png')
+                    }
+                    },500)
+
             }
             function m(e, t) {
                 var i = t.player;

ZAJSG/shapan/index.html

@@ -22,7 +22,7 @@
         <span id="enter">进入沙盘</span>
       </div>
       <div class="video">
-        <video id="fixVideo" autoplay src="./出境.mp4"></video>
+        <video id="fixVideo" src="./出境.mp4"></video>
       </div>
       <!-- <div class="enter">
         <span>点击进入</span>

code/src/pages/layout/aside.vue

@@ -290,7 +290,7 @@ input::placeholder {
     li {
       margin: 15px 0;
       img {
-        width: 50px;
+        width: 47px;
       }
     }
     ::before{

code/src/pages/tunnel/index.vue

@@ -89,7 +89,10 @@
           <div class="msg-bottom">
             <div class="leaving">
               <div class="primaryTitle">全部留言</div>
-              <ul class="content">
+              <div class="hint" v-if="!message.length">
+                暂无留言
+              </div>
+              <ul class="content" v-else>
                 <li v-for="(item, i) in message" :key="i">
                   <div class="info">
                     <span :title="item.nickName" class="name">{{
@@ -500,6 +503,12 @@ h2 {
           margin-top: 10px;
           .leaving {
             .primaryTitle {
+              .hint{
+                position: absolute;
+                left: 50%;
+                bottom: 50%;
+                transform: translateX(-50%,-50%);
+              }
               text-align: left;
               padding-bottom: 10px;
               position: relative;

hotspot/src/views/Home.vue

@@ -7,6 +7,7 @@
       :src="audio"
       preload
       autoplay
+      controls
       loop
       ref="musicBg"
     ></audio>
@@ -176,7 +177,7 @@ export default {
       }
     },
     async getData() {
-      // http://221.4.210.172:10081
+      // http://192.168.0.44:8110
       let url = `http://192.168.0.44:8110/data/${
         this.id
       }/hot/js/data.js?time=${Math.random()}`;
@@ -215,8 +216,9 @@ export default {
     // 进页面获取视频个数
     setTimeout(() => {
       let videos =document.querySelectorAll('.slide video')
-      console.log(11111,videos.length);
-      if(videos.length===1) this.videoLength = false
+      let Imgs =document.querySelectorAll('.slide img')
+      console.log(11111,Imgs.length);
+      if(videos.length===1 || Imgs.length===1) this.videoLength = false
       
     }, 100);
     this.getData();
@@ -233,14 +235,17 @@ export default {
 
 <style lang="less" scoped>
 .audio {
+  width: 90%;
+  max-width: 400px;
+  height: 50px;
   position: fixed;
-  top: -100px;
-  left: -100px;
-  opacity: 0;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%,-50%);
 }
 
 .mb-intro {
-  color: #fff;
+  color: #cf7b0e;
   padding: 10px;
   position: fixed;
   top: 50%;
@@ -322,7 +327,7 @@ export default {
     max-height: 20vh;
     overflow: auto;
     width: 100%;
-    color: #fff;
+    color: #d27a11;
     margin: 0 auto;
     > h3 {
       text-align: center;
@@ -357,8 +362,9 @@ export default {
             max-height: 500px;
           }
           img{
-            max-height: 80vh;
-            width: auto;
+            // max-height: 80vh;
+            // width: auto;
+            background-size: cover;
           }
           iframe {
             height: 500px;
@@ -388,8 +394,9 @@ export default {
             border-radius: 0;
           }
           img{
-            max-height: 80vh;
-            width: auto;
+            // max-height: 80vh;
+            // width: auto;
+            background-size: cover;
           }
           iframe {
             width: 100%;
@@ -444,6 +451,7 @@ export default {
 .swiper-container {
   width: 100%;
   height: 100%;
+  bottom: -115px;
 }
 
 .swiper-pagination-bullet {
@@ -494,5 +502,8 @@ export default {
   .swiper-slide {
     width: 100%;
   }
+  .slide{
+    top: 40px;
+  }
 }
 </style>

package-lock.json

@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}