upp

H5场景/public/static/css/oldVer/main0.css

@@ -1,30 +1,64 @@
-.sidecontent{position:fixed;left:-750px;width:auto;display:none;background:rgba(0,0,0,0.8);top:70px;height: 100%;color: rgba(255,255,255,1);}
-.sidecontent h1{font-size:14px;width:90%;margin:0px auto;text-align:center;height:50px;line-height:50px;position:relative;}
-.sidecontent h1 span{font-size:12px;font-weight:normal;position:absolute;right:-10px;cursor:pointer;border:#ebebeb solid 1px;width:40px;height:40px;line-height:40px;border-radius:20px;text-align:center;}
-#text
-{
-    float:left;
-	width:auto;
-	font-size:18px;
-	letter-spacing:2px;
-	margin:30px;
-	max-width:600px;
-	height:500px;
-	max-height:630px;
-	line-height:22px;
-	font-family:"宋体";
-}
-#sideimg{margin:5px 20px 30px 10px;float:left;}
-
-#gui-modes-map div img
-{
-	width:48px;
-	height:48px;
-}
-
- 
-
-iframe{
+.sidecontent {
+	position: fixed;
+	left: -750px;
+	width: auto;
+	display: none;
+	background: rgba(0, 0, 0, 0.8);
+	top: 70px;
+	height: 100%;
+	color: rgba(255, 255, 255, 1);
+}
+
+.sidecontent h1 {
+	font-size: 14px;
+	width: 90%;
+	margin: 0px auto;
+	text-align: center;
+	height: 50px;
+	line-height: 50px;
+	position: relative;
+}
+
+.sidecontent h1 span {
+	font-size: 12px;
+	font-weight: normal;
+	position: absolute;
+	right: -10px;
+	cursor: pointer;
+	border: #ebebeb solid 1px;
+	width: 40px;
+	height: 40px;
+	line-height: 40px;
+	border-radius: 20px;
+	text-align: center;
+}
+
+#text {
+	float: left;
+	width: auto;
+	font-size: 18px;
+	letter-spacing: 2px;
+	margin: 30px;
+	max-width: 600px;
+	height: 500px;
+	max-height: 630px;
+	line-height: 22px;
+	font-family: "宋体";
+}
+
+#sideimg {
+	margin: 5px 20px 30px 10px;
+	float: left;
+}
+
+#gui-modes-map div img {
+	width: 48px;
+	height: 48px;
+}
+
+
+
+iframe {
 	border: none;
 }
 
@@ -39,20 +73,27 @@ iframe{
 	/* margin: 80px auto; */
 	display: none;
 	z-index: 9999;
-	background:  rgba(0,0,0,0.6);
+	background: rgba(0, 0, 0, 0.6);
 }
-.popup-content{
+
+.popup-content {
 	position: relative;
 	width: 100%;
 	height: 100%;
-	overflow-x: hidden;
+	/* overflow-x: hidden; */
 }
-#id1{ width: 100%; height: 100%;}
-#popup.wait{
-	opacity:0.1; 
+
+#id1 {
+	width: 100%;
+	height: 100%;
 }
+
+#popup.wait {
+	opacity: 0.1;
+}
+
 #closepop {
-	background: url(https://super.4dage.com/images/close1.png) no-repeat;
+	background: url('../../images/phone_step_01.png') no-repeat;
 	width: 60px;
 	height: 60px;
 	cursor: pointer;
@@ -62,161 +103,237 @@ iframe{
 	text-indent: -999em;
 	background-size: 100% 100%;
 }
-.specialTitle{bottom:65%;
-    width: 100%;
-    padding: 0 25px;
-    display: block;
-    font-family: OpenSans,'Helvetica Neue',sans-serif;
-    text-align: center;
-    font-size: 40px;
-    font-weight: 100;
-    letter-spacing: .75px;
-    text-shadow: 0 0 10px rgba(15,16,17,1);
-    color: rgba(255,255,255,1);
-    margin: 0;
-    position: absolute;
-    hyphens: auto;
-    word-wrap: break-word;
-    line-height: 45px;}
-	.dropdown {position: relative;display: inline-block;float: right;height: 40px;line-height: 40px;right: 10px;}
-    .floor{ width: 100px;text-align: center;display: block;height: 30px;background: rgba(0,0,0,0.4);line-height: 30px;margin-top: 10px;cursor: pointer;}
-    .dropdown-content {display: none;position: absolute;background: rgba(0,0,0,0.6);min-width: 100px;box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);text-align:center;}
-    .dropdown:hover .dropdown-content {display: block;}
-    a{text-decoration:none;}
-	#YY,#SZZ{display:none;}
- @media only screen and (max-width:487px){
-           .dropdown {height: 30px;line-height: 30px;right:5px;}
-           .floor {width: 80px;height: 20px;line-height: 20px;margin-top: 5px;}
-          .dropdown-content{min-width: 80px;}	
-           }
+
+.specialTitle {
+	bottom: 65%;
+	width: 100%;
+	padding: 0 25px;
+	display: block;
+	font-family: OpenSans, 'Helvetica Neue', sans-serif;
+	text-align: center;
+	font-size: 40px;
+	font-weight: 100;
+	letter-spacing: .75px;
+	text-shadow: 0 0 10px rgba(15, 16, 17, 1);
+	color: rgba(255, 255, 255, 1);
+	margin: 0;
+	position: absolute;
+	hyphens: auto;
+	word-wrap: break-word;
+	line-height: 45px;
+}
+
+.dropdown {
+	position: relative;
+	display: inline-block;
+	float: right;
+	height: 40px;
+	line-height: 40px;
+	right: 10px;
+}
+
+.floor {
+	width: 100px;
+	text-align: center;
+	display: block;
+	height: 30px;
+	background: rgba(0, 0, 0, 0.4);
+	line-height: 30px;
+	margin-top: 10px;
+	cursor: pointer;
+}
+
+.dropdown-content {
+	display: none;
+	position: absolute;
+	background: rgba(0, 0, 0, 0.6);
+	min-width: 100px;
+	box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
+	text-align: center;
+}
+
+.dropdown:hover .dropdown-content {
+	display: block;
+}
+
+a {
+	text-decoration: none;
+}
+
+#YY,
+#SZZ {
+	display: none;
+}
+
+@media only screen and (max-width:487px) {
+	.dropdown {
+		height: 30px;
+		line-height: 30px;
+		right: 5px;
+	}
+
+	.floor {
+		width: 80px;
+		height: 20px;
+		line-height: 20px;
+		margin-top: 5px;
+	}
+
+	.dropdown-content {
+		min-width: 80px;
+	}
+}
+
 @media screen and (max-width: 1600px) {
- 
+
 	/*#popup {
 		width: 816px;
 		height: 510px;
 		margin: -255px auto auto -408px;
 	}*/
-	.specialTitle{
-	bottom:65%;
-    font-size: 34px;
+	.specialTitle {
+		bottom: 65%;
+		font-size: 34px;
 	}
 }
 
 @media screen and (max-width: 1400px) {
- 
+
 	/*#popup {
 		width: 714px;
 		height: 446px;
 		margin: -223px auto auto -357px;
 	}*/
 	.specialTitle {
-    bottom: 65%;
-    font-size: 30px;
-    }
+		bottom: 65%;
+		font-size: 30px;
+	}
 }
 
 @media screen and (max-width: 1200px) {
- 
-	#closepop{
+
+	#closepop {
 		width: 40px;
 		height: 40px;
 		top: 20px;
 		right: 20px;
 	}
+
 	.specialTitle {
-    bottom: 66%;
-    font-size: 26px;
-    }
+		bottom: 66%;
+		font-size: 26px;
+	}
 }
- 
+
 @media screen and (max-width: 768px) {
- 
+
 	.specialTitle {
-     bottom: 62%;
-     font-size: 26px;
-	 line-height:40px;
-    }
-	#special-gui-name{display:none;}
+		bottom: 62%;
+		font-size: 26px;
+		line-height: 40px;
+	}
+
+	#special-gui-name {
+		display: none;
+	}
 }
-@media screen and  (max-width: 736px){
 
-	
-	#title-toggle{
+@media screen and (max-width: 736px) {
+
+
+	#title-toggle {
 		padding-top: 18px;
 		height: 42px;
 	}
 
 
-	.pinTop{top:8px;}
+	.pinTop {
+		top: 8px;
+	}
 }
-@media screen and  (max-width:667px){
-	#closepop{
-		width: 36px;
-		height: 36px;
-		top: 0px;
-		right: 0px;
+
+@media screen and (max-width:667px) {
+	#closepop {
+		width: 16px;
+		height: 16px;
+		top: 17px;
+		right: 10px;
 	}
 
-	#title-toggle{
+	#title-toggle {
 		padding-top: 17px;
 		height: 40px;
 	}
 
 	#musicImg .fa-2x {
-        font-size: 1.5em;
-    }
-	.pinTop{top:8px;}
+		font-size: 1.5em;
+	}
+
+	.pinTop {
+		top: 8px;
+	}
 
 }
-@media screen and  (max-width:568px){
 
-	
-	#title-toggle{
+@media screen and (max-width:568px) {
+
+
+	#title-toggle {
 		padding-top: 17px;
 		height: 38px;
 	}
-	
+
 	#musicImg .fa-2x {
-        font-size: 1.5em;
-    }
-	.pinTop{top:8px;}
+		font-size: 1.5em;
+	}
+
+	.pinTop {
+		top: 8px;
+	}
 
 }
+
 @media screen and (max-width:414px) {
 
-	
-	#title-toggle{
+
+	#title-toggle {
 		padding-top: 17px;
 		height: 40px;
 	}
-	
+
 
 }
+
 @media screen and (max-width:375px) {
 
-	
-	#title-toggle{
+
+	#title-toggle {
 		padding-top: 17px;
 		height: 38px;
 	}
 
-	
-	.pinTop{top:5px;}	
-	
+
+	.pinTop {
+		top: 5px;
+	}
+
 }
+
 @media screen and (max-width:320px) {
 	/*#popup {
 		width: 200px;
         height: 380px;
         margin: -200px auto auto -100px;
 	}*/
-	
-	#title-toggle{
+
+	#title-toggle {
 		padding-top: 16px;
 		height: 36px;
 	}
 
-	
-	.pinTop{top:0px;}
-	
+
+	.pinTop {
+		top: 0px;
+	}
+
 }

H5场景/public/static/js/Hot.js

@@ -39,8 +39,8 @@ window.initHot = function (model) {
         var r = link.substring(link.indexOf("html") + 4)
             , o = "en" == manage.number("lang") ? "&lang=" + manage.number("lang") : "";
         -1 == r.indexOf("?") ? src = link + "?time=" + randomTime().getTime() + "&id=" + window.number + o : src = link + "&time=" + randomTime().getTime() + "&id=" + window.number + o
-        // return 'http://project.4dage.com:8017' + src  // 线上测试
-        return src     //打包 
+        return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'hot')
+        // return src    
 
     }
     var removeSrcPostMark = function (url) {//去除texture.load时自动加上的'?'

H5场景/public/static/js/Hot_new.js

@@ -60,8 +60,8 @@ window.initHot = function(model){
         var r = link.substring(link.indexOf("html") + 4)
           , o = "en" == manage.number("lang") ? "&lang=" + manage.number("lang") : "";
         -1 == r.indexOf("?") ? src = link + "?time=" + randomTime().getTime() + "&id=" + window.number + o : src = link + "&time=" + randomTime().getTime() + "&id=" + window.number + o 
-            
-        return src 
+        return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'hot')
+        // return src 
     }
     var removeSrcPostMark = function(url){//去除texture.load时自动加上的'?'
         var index = url.indexOf('?')
@@ -1756,7 +1756,7 @@ window.initHot = function(model){
     
     
     Hot.createHotList = function() {
-        if(!window.DATA.showHotListSta)return
+        // if(!window.DATA.showHotListSta)return
         var docFragment = document.createDocumentFragment();
         var hots = hotGroup.children.filter(hot=>hot.info.actionType.openHot);
         hots = hots.sort((a,b)=>{return a.order - b.order});

定制化热点/src/views/Home.vue

@@ -5,7 +5,7 @@
     <!-- 主体带滚动条的盒子 -->
     <div class="main">
       <!-- 图片 -->
-      <div class="imgBox">
+      <div class="imgBox" :class="{ imgBoxOne: !myTxt }">
         <Swiper class="warpper" ref="mySwiper" :options="swiperOptions">
           <SwiperSlide v-for="item in myImgArr" :key="item">
             <img :src="item" alt="" @click="lookImg(item)" />
@@ -17,7 +17,7 @@
         </div>
       </div>
       <!-- 介绍 -->
-      <div class="txtBox" v-html="myTxt || '暂无内容'"></div>
+      <div class="txtBox" v-if="myTxt" v-html="myTxt || '暂无内容'"></div>
     </div>
     <!-- 查看图片 -->
     <viewer class="viewerCla" ref="viewer" :images="lookPics">
@@ -146,6 +146,8 @@ export default {
         }
       }
       .myIndBox {
+        z-index: 9;
+        pointer-events: none;
         font-size: 12px;
         position: absolute;
         bottom: 20px;
@@ -160,6 +162,9 @@ export default {
         }
       }
     }
+    .imgBoxOne {
+      height: 100%;
+    }
     .txtBox {
       padding: 40px 15px;
       font-size: 14px;