瀏覽代碼

修复bug

shaogen1995 3 年之前
父節點
當前提交
27ab71185c

+ 3 - 3
SuperTwo762/css/main.css

@@ -3391,7 +3391,7 @@ a.hasHover:hover, a:active {
 
 .pinTop.left {
     /* left: 50%; */
-    z-index: 99;
+    z-index: 1308;
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -3809,9 +3809,9 @@ a.hasHover:hover, a:active {
     align-items: center;
 }
 
-#volume {
+/* #volume {
     display: none;
-}
+} */
 
 #view-controllers {
     color: rgba(255, 255, 255, .5);

+ 16 - 8
SuperTwo762/index.html

@@ -32,6 +32,14 @@
         
     </script>
     <style>
+        @media only screen and (max-width: 1000px) {
+            #myColne{
+                top:80vh !important;
+                left: 50% !important;
+                transform: translateX(-50%) !important;
+            }
+
+        }
         #consoleLog{ 
           width: 120px;
           height: 153px;
@@ -261,26 +269,26 @@
                             </div> -->
                         <div id="gui-modes-map" class="ui-icon double active">
                             <div data-original-title="导览" id="pullTab" rel="tooltip" title="">
-                                <img class="icon icon-inside" src="images/auto.png" title="navigation icon" />
+                                <img class="icon icon-inside" src="images/auto.png" title="" />
                             </div>
                             <div data-original-title="热点列表" id="hotList" rel="tooltip" title="" style="display: none">
-                                <img class="icon icon-inside" src="images/hotlist.png" title="navigation icon" />
+                                <img class="icon icon-inside" src="images/hotlist.png" title="" />
                             </div>
                             <div data-original-title="全景漫游" id="gui-modes-inside" rel="tooltip" title="" class="">
-                                <img class="icon icon-inside" src="images/inside.png" title="navigation icon" />
+                                <img class="icon icon-inside" src="images/inside.png" title="" />
                             </div>
                             <div data-original-title="迷你模型" id="gui-modes-dollhouse" rel="tooltip" title="" class="">
-                                <img class="icon icon-inside" src="images/dollhouse.png" title="navigation icon" />
+                                <img class="icon icon-inside" src="images/dollhouse.png" title="" />
                             </div>
                             <div data-original-title="俯视图" id="gui-modes-floorplan" rel="tooltip" title="">
-                                <img class="icon icon-inside" src="images/floor.png" title="navigation icon" />
+                                <img class="icon icon-inside" src="images/floor.png" title="" />
                             </div>
                             <div data-original-title="VR" id="vr" rel="tooltip" title="" style="display: none;">
-                                <img class="icon icon-inside" src="images/VR.png" title="navigation icon" />
+                                <img class="icon icon-inside" src="images/VR.png" title="" />
                             </div>
                             <div data-original-title="消除外壳" id="gui-remove-face" rel="tooltip" title=""
                                 style="display: none; float: left;">
-                                <img class="icon icon-inside" src="images/face.jpg" title="navigation icon" />
+                                <img class="icon icon-inside" src="images/face.jpg" title="" />
                             </div>
                         </div>
                     </div>
@@ -774,7 +782,7 @@
                             <img class="keyboard">
                         </div> -->
                     <div class="nav-icon">
-                        <img src="images/pc_step1.png" class="icon" title="navigation icon" data-page="1">
+                        <img src="images/pc_step1.png" class="icon" title="" data-page="1">
                         <div class="nav-help-button">
                             <div class="next-button nav-help-page" data-id="plus"></div>
                             <div class="prev-button nav-help-page"></div>

+ 4 - 3
SuperTwo762/js/main_2020_show.js

@@ -16409,13 +16409,14 @@ window.Modernizr = function(n, e, t) {
                     div.style["z-index"] = "999"
                     
                     exit = document.createElement("div");
-                    exit.style["background-image"] = "url(images/vrOffImg.png)";
+                    exit.id ='myColne'
+                    exit.style["background-image"] = "url(images/close1.png)";
                     exit.style.position = 'absolute';
                     exit.style.width = exit.style.height = "50px";
-                    exit.style.left = '17px';   exit.style.top = "20px"
+                    exit.style.right = '17px';   exit.style.top = "20px"
                     exit.style.cursor = "pointer";
                     exit.style["background-repeat"] = "no-repeat";
-                    exit.style["background-size"] = "25%"; 
+                    exit.style["background-size"] = "100%,100%"; 
                     exit.style["background-position"] = "center center"; 
                     exit.style["background-color"] = "rgba(0, 0, 0, 0.2)"; 
                     exit.style["border-radius"] = "50%";

+ 2 - 2
SuperTwo762/js/myShow.js

@@ -1,7 +1,7 @@
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-var g_Prefix="http://192.168.0.44:8110/";
+// var g_Prefix="http://192.168.0.44:8110/";
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
-// var g_Prefix=window.location.origin+'/';
+var g_Prefix=window.location.origin+'/';
 
 var s = window.location.href.split('/');
 s.pop();

+ 1 - 1
SuperTwo791/index.html

@@ -771,7 +771,7 @@
                             <img class="keyboard">
                         </div> -->
                     <div class="nav-icon">
-                        <img src="images/pc_step1.png" class="icon" title="navigation icon" data-page="1">
+                        <img src="images/pc_step1.png" class="icon" title="" data-page="1">
                         <div class="nav-help-button">
                             <div class="next-button nav-help-page" data-id="plus"></div>
                             <div class="prev-button nav-help-page"></div>

+ 2 - 2
SuperTwo791/js/myShow.js

@@ -1,8 +1,8 @@
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-var g_Prefix="http://192.168.0.44:8110/";
+// var g_Prefix="http://192.168.0.44:8110/";
 // var g_Prefix="https://super.4dage.com/";
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
-// var g_Prefix=window.location.origin+'/';
+var g_Prefix=window.location.origin+'/';
 
 var s = window.location.href.split('/');
 s.pop();

+ 8 - 0
ZAJSG/shapan/index.html

@@ -10,6 +10,14 @@
     <script src="./Build/config.js"></script>
     <script src="TemplateData/UnityProgress.js"></script>
     <script src="Build/UnityLoader.js"></script>
+    <style>
+      #fixVideo{
+        width: 460px;
+        margin-top: 40px;
+        /* height: 300px; */
+      }
+
+    </style>
     <script>
       if(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i.test(navigator.userAgent)) {
         window.location.href = './video.html'

+ 1 - 1
code/src/pages/index/index.vue

@@ -33,7 +33,7 @@ import bg from '@/components/background'
 
 
 // http://192.168.0.44:8110/
-let temp = 'http://192.168.0.99:8081/'
+let temp = ''
 const outKey = "791"
 const inKey = "762"
 

+ 27 - 8
hotspot/src/views/Home.vue

@@ -16,6 +16,8 @@
       v-if="fixIcon.length > 0"
       :style="{ height: isMobile ? '100%' : '80%' }"
     >
+                    <h3 id="shoujititle"  v-html="data.title"></h3>
+
       <div
         v-if="!isMobile && videoLength"
         @click="slideto('slidePrev')"
@@ -173,11 +175,12 @@ export default {
             //点击的时候才加载,防止一次运行过多iframe标签导致页面崩溃
       let myFim =document.querySelectorAll('.swiper-wrapper .swiper-slide')
       let myFimCente =document.querySelectorAll('.swiper-wrapper .swiper-slide-active iframe')
+      console.log(myFim,myFimCente);
       myFim.forEach((v,i)=>{
         //拿到当前在屏幕中间的iframe
         if(v.className.includes('swiper-slide-active') && i>1) {
           // console.log(myFimCente[0].src);
-          if(myFimCente[0].src){
+          if(myFimCente[0].src.includes('undefined')){
             myFimCente[0].src =this.fixUrl(this.data.model[i])
           }
           }
@@ -196,7 +199,7 @@ export default {
     },
     async getData() {
       // http://192.168.0.44:8110
-      let url = `http://192.168.0.44:8110/data//${
+      let url = `/data/${
         this.id
       }/hot/js/data.js?time=${Math.random()}`;
       let result = (await this.$http.get(url)).data;
@@ -215,7 +218,7 @@ export default {
       if (!this.data) {
         return alert("热点解析错误");
       }
-
+ 
       this.audio = this.data["backgroundMusic"];
 
       if (!this.data.content && this.isMobile) {
@@ -243,12 +246,12 @@ export default {
       
       //点击的时候才加载,防止一次运行过多iframe标签导致页面崩溃
       let myFim =document.querySelectorAll('.swiper-wrapper .swiper-slide')
-      let myFimCente =document.querySelectorAll('.swiper-wrapper .swiper-slide-active iframe')
+      let myFimCente =document.querySelectorAll('.swiper-wrapper .swiper-slide-next iframe')
       myFim.forEach((v,i)=>{
         //拿到当前在屏幕中间的iframe
-        if(v.className.includes('swiper-slide-active') && i>1) {
+        if(v.className.includes('swiper-slide-next') && i>1) {
           // console.log(myFimCente[0].src);
-          if(myFimCente[0].src){
+          if(myFimCente[0].src.includes('undefined')){
             myFimCente[0].src =this.fixUrl(this.data.model[i])
           }
           }
@@ -260,8 +263,9 @@ export default {
     setTimeout(() => {
       let videos =document.querySelectorAll('.slide video')
       let Imgs =document.querySelectorAll('.slide img')
-      // console.log(11111,Imgs.length);
-      if(videos.length===1 || Imgs.length===1) this.videoLength = false
+      let iframes = document.querySelectorAll('.slide iframe')
+      // console.log(11111,iframes);
+      if(videos.length===1 || Imgs.length===1 ||iframes.length===1) this.videoLength = false
       
     }, 100);
     this.getData();
@@ -313,6 +317,9 @@ export default {
   }
   
   .content {
+    #shoujititle{
+      display: none;
+    }
     width: 100%;
     height: 80%;
     .warpper {
@@ -419,6 +426,18 @@ export default {
 }
 
 @media screen and (max-width: 1000px) {
+  #shoujititle{
+    display: block !important;
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+    top: 80px;
+    font-size: 20px;
+    color: #cf7b0e;
+  }
+  .intro h3 {
+    bottom: 100px !important;
+  }
   .swiper-pagination-fraction, .swiper-pagination-custom, .swiper-container-horizontal > .swiper-pagination-bullets{
     bottom: 240px;
   }