Quellcode durchsuchen

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

xzw vor 3 Jahren
Ursprung
Commit
c1774fb282

+ 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

@@ -16422,13 +16422,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();

+ 19 - 11
SuperTwo791/css/main.css

@@ -3278,9 +3278,11 @@ a.hasHover:hover, a:active {
 /*loading*/
 
 .progressbar {
-    position: relative;
+    position: absolute;
     display: block;
-    width: 24%;
+    width: 30vw;
+    left: 50%;
+    transform: translateX(-50%);
     height: 10px;
     padding: 0px 20px;
     margin: 40px auto;
@@ -3389,12 +3391,12 @@ a.hasHover:hover, a:active {
 }
 
 .pinTop.left {
-    left: 50%;
-    z-index: 99;
+    /* left: 50%; */
+    z-index: 1308;
     display: flex;
     flex-direction: column;
     align-items: center;
-    transform: translateX(-50%);
+    /* transform: translateX(-50%); */
 }
 
 .pinTop.right {
@@ -6275,18 +6277,22 @@ a.hasHover.tag-link:hover {
     -webkit-transition: all .3s;
     transition: all .3s;
     pointer-events: all;
-    background: rgba(0, 0, 0, 0.2);
+    /* background: rgba(0, 0, 0, 0.2);
     border-radius: 10px;
     padding: 0 10px;
-    min-width: 180px;
+    min-width: 180px; */
+    width: 250px;
+    height: 46px;
+    background: url(../images/titleBAC.png) no-repeat center;
+    background-size: 100% 100%;
 }
 
 #model-title:hover {
-    background: rgba(0, 0, 0, 0.5);
+    /* background: rgba(0, 0, 0, 0.5); */
 }
 
 #model-title.expand {
-    background: rgba(0, 0, 0, 0.5);
+    /* background: rgba(0, 0, 0, 0.5); */
 }
 
 .title-row {
@@ -6329,7 +6335,8 @@ a.hasHover.tag-link:hover {
     display: flex;
     align-items: center;
     height: 100%;
-    padding-left: 12px;
+    padding-left: 5px;
+    margin-top: 3px;
 }
 
 /*.meta-toggle.hasHover:hover,.meta-toggle:active {
@@ -6396,7 +6403,8 @@ a.hasHover.tag-link:hover {
 }
 
 .pinTop.left .title-container {
-    right: 0;
+    right: -19px;
+    top: 5px;
     margin-right: 0
 }
 

BIN
SuperTwo791/images/titleBAC.png


+ 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"
 

+ 11 - 0
code/src/pages/tunnel/index.vue

@@ -142,9 +142,14 @@
 
     <div v-else class="mobile-swp">
       <div class="screen">
+
         <h2>留言板</h2>
         <div class="s-scroll">
           <ul class="content mb-content">
+          <div class="hint" v-if="!message.length">
+                暂无留言
+          </div>
+
             <li v-for="(item, i) in message" :key="i">
               <div class="info">
                 <span class="name">{{ item.nickName || "-" }}</span>
@@ -852,6 +857,12 @@ h2 {
   }
 
   .mobile-swp {
+    .hint{
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%,-50%);
+    }
     width: 100%;
     height: 100%;
     background: #4f0506;

+ 80 - 11
hotspot/src/views/Home.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="home" @click="autoplay" @touchstart="autoplay">
+  <div class="home" @click="autoplay" @touchstart="autoplay" @touchend='huadong'>
     <audio
       v-if="audio"
       class="audio"
@@ -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')"
@@ -43,10 +45,12 @@
               controls
               autoplay
             ></video>
+
+            <!-- :src="fixUrl(item)" -->
             <iframe
               @click="colseParent()"
               v-else
-              :src="fixUrl(item)"
+              :src="fixUrl(myFim[i])"
               frameborder="0"
             ></iframe>
           </div>
@@ -102,6 +106,7 @@ export default {
   name: "Home",
   data() {
     return {
+      myFim:[],
       videoLength:true,
       loadAuto: false,
       audio: "",
@@ -165,6 +170,22 @@ export default {
     SwiperSlide,
   },
   methods: {
+    huadong(){
+      // console.log(666);
+            //点击的时候才加载,防止一次运行过多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.includes('undefined')){
+            myFimCente[0].src =this.fixUrl(this.data.model[i])
+          }
+          }
+      })
+    },
     autoplay() {
       if (this.loadAuto) {
         return;
@@ -178,15 +199,26 @@ 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;
       this.data = result[this.m];
+
+
+    //进页面只让iframe加载2个
+      // console.log(9999999,this.data.model);
+      if(this.data.model){
+        this.myFim[0]=this.data.model[0]
+        this.myFim[1]=this.data.model[1]
+      }
+      // this.myFim=this.data.model
+
+
       if (!this.data) {
         return alert("热点解析错误");
       }
-
+ 
       this.audio = this.data["backgroundMusic"];
 
       if (!this.data.content && this.isMobile) {
@@ -206,10 +238,24 @@ export default {
       }
     },
     fixUrl(item) {
-      return 'http://192.168.0.44:8110/'+item;
+      return 'http://192.168.0.44:8110'+item;
     },
     slideto(action) {
       this.swiper[action]();
+
+      
+      //点击的时候才加载,防止一次运行过多iframe标签导致页面崩溃
+      let myFim =document.querySelectorAll('.swiper-wrapper .swiper-slide')
+      let myFimCente =document.querySelectorAll('.swiper-wrapper .swiper-slide-next iframe')
+      myFim.forEach((v,i)=>{
+        //拿到当前在屏幕中间的iframe
+        if(v.className.includes('swiper-slide-next') && i>1) {
+          // console.log(myFimCente[0].src);
+          if(myFimCente[0].src.includes('undefined')){
+            myFimCente[0].src =this.fixUrl(this.data.model[i])
+          }
+          }
+      })
     },
   },
   mounted() {
@@ -217,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();
@@ -239,7 +286,7 @@ export default {
   max-width: 400px;
   height: 50px;
   position: fixed;
-  top: 40%;
+  top: 50%;
   left: 50%;
   transform: translate(-50%,-50%);
 }
@@ -270,6 +317,9 @@ export default {
   }
   
   .content {
+    #shoujititle{
+      display: none;
+    }
     width: 100%;
     height: 80%;
     .warpper {
@@ -345,7 +395,7 @@ export default {
   .mcenter{
     position: absolute;
     transform: translate(-50%,-50%);
-    top: 50%;
+    top: 40%;
     left: 50%;
     max-height: none;
   }
@@ -376,6 +426,21 @@ 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;
+  }
   .home {
     background: url('../assets/images/Mbac.png') no-repeat center;
     background-size: cover;
@@ -400,7 +465,7 @@ export default {
           }
           iframe {
             width: 100%;
-            height: 100vh;
+            height: 55vh;
           }
         }
       }
@@ -455,7 +520,11 @@ export default {
 }
 
 .swiper-pagination-bullet {
-  background: #fff;
+  background-color: #fff;
+  opacity: 0.8;
+}
+.swiper-pagination-bullet-active {
+  background-color: #cf7b0e;
 }
 .swiper-slide {
   text-align: center;