热点详情

public/static/js/Hot.js

@@ -37,7 +37,7 @@ window.initHot = function (model) {
   var getCommonHotspotUrl = function (link) {
     var querySectionInLink = link.split('?')[1]
     var langParam = "en" == manage.number("lang") ? "&lang=" + manage.number("lang") : ""
-    // return `http://192.168.20.16:8082/#/${browser.isMobile() ? 'mobile' : 'web'}/?${querySectionInLink}&time=${randomTime().getTime()}&id=${window.number}${langParam}`
+    // return `http://192.168.20.16:8081/#/${browser.isMobile() ? 'mobile' : 'web'}/?${querySectionInLink}&time=${randomTime().getTime()}&id=${window.number}${langParam}`
     return `/XuzhouHanStoneReliefArtMuseum/hotspot/index.html#/${browser.isMobile() ? 'mobile' : 'web'}/?${querySectionInLink}&time=${randomTime().getTime()}&id=${window.number}${langParam}`
   }
   var removeSrcPostMark = function (url) {//去除texture.load时自动加上的'?'
@@ -1147,40 +1147,11 @@ window.initHot = function (model) {
           const currentLocationQuerySection = new URLSearchParams(location.href.split('?')[1])
           const currentSceneCode = currentLocationQuerySection.get('m')
 
-          if (currentSceneCode === '1300' && targetSceneCode === '1302') {
-            const iframeElem = document.createElement('iframe')
-            iframeElem.style.position = 'absolute'
-            iframeElem.style.top = '50%'
-            iframeElem.style.left = '50%'
-            iframeElem.style.width = '600px'
-            iframeElem.style.height = '800px'
-            iframeElem.style.transform = 'translate(-50%, -50%)'
-            iframeElem.style.zIndex = '9999'
-            iframeElem.style.boxShadow = '0 0 0 1000px rgba(0, 0, 0, 0.85)'
-            // iframeElem.src = 'http://192.168.20.16:8081/#/topic'
-            iframeElem.src = '/AnhuiDaily/quiz/index.html#/topic'
-            document.documentElement.appendChild(iframeElem)
-
-            const onMsg = (msg) => {
-              console.log('message received!', msg)
-              window.removeEventListener('message', onMsg, false)
-              if (msg.data === 'quiz over') {
-                // 跳转到新场景
-                currentLocationQuerySection.set('m', targetSceneCode)
-                const newLocation = location.href.split('?')[0] + '?' + currentLocationQuerySection.toString()
-                location.assign(newLocation)
-                location.reload(true)
-              }
-            }
-
-            window.addEventListener('message', onMsg, false)
-          } else {
-            // 跳转到新场景
-            currentLocationQuerySection.set('m', targetSceneCode)
-            const newLocation = location.href.split('?')[0] + '?' + currentLocationQuerySection.toString()
-            location.assign(newLocation)
-            location.reload(true)
-          }
+          // 跳转到新场景
+          currentLocationQuerySection.set('m', targetSceneCode)
+          const newLocation = location.href.split('?')[0] + '?' + currentLocationQuerySection.toString()
+          location.assign(newLocation)
+          location.reload(true)
         } else {
           // 不是场景跳转
           var src = this.info.iframe[0]
@@ -1192,9 +1163,11 @@ window.initHot = function (model) {
           } else if (this.info.linkType == "iframeDiv") { // iframe里打开链接
             var div = document.createElement("div")
             div.style.position = 'fixed'
-            div.style.width = div.style.height = "100%"
-            div.style.left = div.style.top = '0'
-            div.style["z-index"] = "999"
+            div.style.width = "100%"
+            div.style.height = "100%"
+            div.style.left = '0'
+            div.style.top = '0'
+            div.style["z-index"] = "10006"
 
             var exit = document.createElement("div")
             exit.style["background-image"] = "url(images/vrOffImg.png)"
@@ -1210,9 +1183,7 @@ window.initHot = function (model) {
             exit.style["z-index"] = "3"
             exit.onclick = () => {
               $(div).remove()
-
               Hot.closePopup()
-
             }
 
             var myElement = document.createElement("iframe")
@@ -1233,12 +1204,12 @@ window.initHot = function (model) {
         // 图片、视频之类的热点
         if (!player.currentPano) return
 
-        var popup = document.getElementById("popup")
+        var popupElem = document.getElementById("popup")
 
         if (openHot) {
           g_currentHot = this,
-          popup.style.display = "block",
-          popup.classList.add("wait")
+          popupElem.style.display = "block",
+          popupElem.classList.add("wait")
           var n = document.createElement("iframe")
 
           SoundManager.play('hot')
@@ -1270,7 +1241,7 @@ window.initHot = function (model) {
 
         var done = function () {
           player.flyingToTag = !1
-          openHot && popup.classList.remove("wait")
+          openHot && popupElem.classList.remove("wait")
         }.bind(this)
 
         if (!needExamine) {

public/static/js/myShow.js

@@ -1,89 +1,89 @@
-var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-var g_Prefix="https://super.4dage.com/";
+var g_ProjectName = window.location.pathname.substring(window.location.pathname.indexOf("/") + 1, window.location.pathname.lastIndexOf("/"))
+var g_Prefix = "https://super.4dage.com/"
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
-var s = window.location.href.split('/');
-s.pop();
+var s = window.location.href.split('/')
+s.pop()
 //var g_Prefix = s.join('/');
-var g_index=null;
-var g_modeldata=null;
+var g_index = null
+var g_modeldata = null
 
-var g_weixinTitle=null;
+var g_weixinTitle = null
 
-var g_Hots=null;
-var g_HotMeshes=[];
+var g_Hots = null
+var g_HotMeshes = []
 var g_HotMeshSize = {
   g_HotMeshWidth: 0.3,
-  g_HotMeshHeight:0.3
-};
+  g_HotMeshHeight: 0.3
+}
 
 //add表示添加，delete表示删除
-var g_HotStatus=null;
-var g_newHot = [];//存储新加热点
-var g_HotImage= {
-	"point":"https://super.4dage.com/images/4dagePoint2.png",
-	"point2":"https://super.4dage.com/images/4dagePoint.png"
-};	
-var g_saveHot=false;
+var g_HotStatus = null
+var g_newHot = []//存储新加热点
+var g_HotImage = {
+  "point": "https://super.4dage.com/images/4dagePoint2.png",
+  "point2": "https://super.4dage.com/images/4dagePoint.png"
+}
+var g_saveHot = false
 
-var g_TextColor=0x7777ff;
-var g_Text=null;
-var g_TextPlaneMesh=[];
-var g_TextIconMesh=[];
-var g_TextIcon="./images/text.png";
-var g_SelectTextIndex=null;
-var g_TextShow=null;
-var g_audioPlay=false;
-var g_background=null; 
-var g_roof=null;
+var g_TextColor = 0x7777ff
+var g_Text = null
+var g_TextPlaneMesh = []
+var g_TextIconMesh = []
+var g_TextIcon = "./images/text.png"
+var g_SelectTextIndex = null
+var g_TextShow = null
+var g_audioPlay = false
+var g_background = null
+var g_roof = null
 
-var g_data2 = null;//加载的data2.js的内容
-var g_bgAudio=null;//背景音乐
-var g_tourAudio=null;//导览音乐
-var g_play = 1;//表示播放图标状态
-var g_playAudio = null;//当前在播放或当继续播放时应该播放的，是g_bgAudio或g_tourAudio 
-var g_currentHot = null;//当前打开的热点 
+var g_data2 = null//加载的data2.js的内容
+var g_bgAudio = null//背景音乐
+var g_tourAudio = null//导览音乐
+var g_play = 1//表示播放图标状态
+var g_playAudio = null//当前在播放或当继续播放时应该播放的，是g_bgAudio或g_tourAudio
+var g_currentHot = null//当前打开的热点
 //var g_Texture=null;
 //var g_ChunknameTexture={};   //chunkname和贴图名称对应
-var g_NormalTexture=false;
-var g_SpecularTexture=false;
-var g_DirectionalLight=null;  
-  
-var g_snapShotWidth = 200; //截图下载图片的大小
-var g_snapShotHeight = 140;
+var g_NormalTexture = false
+var g_SpecularTexture = false
+var g_DirectionalLight = null
+
+var g_snapShotWidth = 200 //截图下载图片的大小
+var g_snapShotHeight = 140
 
 //微信分享
 var g_weixinObj = {
   "title": document.querySelector("head title").innerHTML,
-  "lineLink" : window.location.href,
-  "imgUrl" : "https://www.4dmodel.com/SuperPanoramic/images/weixintitle.jpg",
-  "desc" : "四维时代提供技术支持",
+  "lineLink": window.location.href,
+  "imgUrl": "https://www.4dmodel.com/SuperPanoramic/images/weixintitle.jpg",
+  "desc": "四维时代提供技术支持",
 }
 
 var settings = {
-    hotClickEvent:{
-        video:{
-            playAndPause:true,
-            examine:false,
-            openHot:false 
-        },
-        photo:{
-            examine:false,
-            openHot:false 
-        },
-        shine:{
-            examine:true,
-            openHot:true  
-        }
+  hotClickEvent: {
+    video: {
+      playAndPause: true,
+      examine: false,
+      openHot: false
     },
-    //默认的：
-    teleportTime:  1500,//瞬间过渡的时间 
-    flytimeDistanceMultiplier:150, 
-    flyTime:750, 
-    
-    //dontExamHot:true  
-    transparentBg: false,
-    bgImg:  null 
+    photo: {
+      examine: false,
+      openHot: false
+    },
+    shine: {
+      examine: true,
+      openHot: true
+    }
+  },
+  //默认的：
+  teleportTime: 1500, //瞬间过渡的时间
+  flytimeDistanceMultiplier: 150,
+  flyTime: 750,
+
+  //dontExamHot:true
+  transparentBg: false,
+  bgImg: null
 }
-if(window.number == '725'||window.number == '724'){
-    settings.mobileNavHigh = true
+if (window.number == '725' || window.number == '724') {
+  settings.mobileNavHigh = true
 }

src/App.vue

@@ -134,6 +134,8 @@ export default {
 }
 
 #popup {
-  background: rgba(0, 0, 0, 0.7);
+  background-color: rgba(21, 52, 115, 0.80);
+  backdrop-filter: blur(1.8vw);
+  z-index: 10006;
 }
 </style>

src/pages/Home.vue

@@ -49,7 +49,7 @@
         </div>
 
         <!-- 热点列表 -->
-        <!-- <hotspot-list /> -->
+        <hotspot-list />
 
         <!-- 通用样式的标题，代码里必须有，但其实没有显示 -->
         <v-title />
@@ -104,7 +104,7 @@
 <script>
 import popup from "@/views/popup"
 import guiLoading from "@/views/gui/loading"
-// import hotspotList from "@/views/gui/hotspotlist"
+import hotspotList from "@/views/gui/hotspotlist"
 import vTitle from "@/views/gui/title"
 import vMenu from "@/views/gui/menu"
 import vGuide from "@/views/gui/guide"
@@ -120,7 +120,7 @@ export default {
   components: {
     popup,
     guiLoading,
-    // hotspotList,
+    hotspotList,
     vTitle,
     vMenu,
     vGuide,