shaogen1995 3 роки тому
батько
коміт
00230718b9

+ 1 - 1
SuperTwo762/css/main.css

@@ -4129,7 +4129,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-color: red
 }
 
 .scrollbar {

+ 1 - 1
SuperTwo762/css/oldVer/main0.css

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

+ 16 - 0
SuperTwo762/js/main_2020_show.js

@@ -6916,6 +6916,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),
@@ -6932,8 +6936,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),
@@ -6943,6 +6958,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')

+ 1 - 1
SuperTwo791/css/main.css

@@ -4129,7 +4129,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-color: red
 }
 
 .scrollbar {

+ 4 - 3
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{

BIN
SuperTwo791/images/close2.png


+ 10 - 0
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;

+ 16 - 9
hotspot/src/views/Home.vue

@@ -176,7 +176,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 +215,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();
@@ -240,7 +241,7 @@ export default {
 }
 
 .mb-intro {
-  color: #fff;
+  color: #cf7b0e;
   padding: 10px;
   position: fixed;
   top: 50%;
@@ -322,7 +323,7 @@ export default {
     max-height: 20vh;
     overflow: auto;
     width: 100%;
-    color: #fff;
+    color: #d27a11;
     margin: 0 auto;
     > h3 {
       text-align: center;
@@ -357,8 +358,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 +390,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 +447,7 @@ export default {
 .swiper-container {
   width: 100%;
   height: 100%;
+  bottom: -115px;
 }
 
 .swiper-pagination-bullet {
@@ -494,5 +498,8 @@ export default {
   .swiper-slide {
     width: 100%;
   }
+  .slide{
+    top: 40px;
+  }
 }
 </style>