update0518

H5场景/public/static/css/main.css

@@ -3898,7 +3898,7 @@ a.tag-link {
     right: 0;
     text-shadow: 0 0 1px rgba(0, 0, 0, .6);
     z-index: 50;
-    bottom: 30px;
+    bottom: 110px;
 }
 
 .pinBottom.left {

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

@@ -8,6 +8,15 @@
 
 let highMapAddColor// =  true
 
+
+let fixFloorPositionYArr = {
+    'pD9m7WcE6':-1.45,
+    '6EapoFLUf':-1.2,
+    'a3hbD5cCO':-1.2,
+    'EKdjixc6DvU':0.1,
+    '119':0.1,
+}
+
 !function() {
     "use strict";
     function t(t, i) {
@@ -6773,7 +6782,7 @@ window.Modernizr = function(n, e, t) {
                 $(".gui-floor-number").text(Re.FLOOR_ALL),
                 $(".floorChoice").removeClass("active"),
                 $('.floorChoice[data-index="all"]').addClass("active")) : ($(".gui-floor-title").text(e.name),
-                $(".gui-floor-number").text(" " + (e.floorIndex + 1)),
+                $(".gui-floor-number").text(" " + (number == 158?(e.floorIndex==0?-1:(e.floorIndex)):(e.floorIndex + 1))),
                 $(".floorChoice").removeClass("active"),
                 $(".floorChoice[data-index=" + e.floorIndex + "]").addClass("active")))
             }
@@ -18915,7 +18924,7 @@ window.Modernizr = function(n, e, t) {
             this.model = e,
             this.floorIndex = t,
             this.lang = o.languageTag,
-            this.name = i || o.languageTag === "cn" ?  "Floor " + (t + 1) + "" :  "第" + (t + 1) + "层",
+            this.name = i || o.languageTag === "cn" ?  "Floor " + (number == 158?(t==0?-1:t):(t + 1)) + "" :  (number == 158?(t==0?-1:t):(t + 1)) + "层",
             this.panos = [],
             this.chunks = [],
             this.colliderBuilder = new l(3),
@@ -19361,6 +19370,10 @@ window.Modernizr = function(n, e, t) {
                 }
             }(),
             n.prototype.placeMarker = function() {
+                let tempItem = fixFloorPositionYArr[number]
+                if(tempItem){
+                    this.floorPosition.y = tempItem
+                }
                 this.marker && (this.marker.position.copy(this.floorPosition),
                 this.marker.position.y += .05,
                 this.marker.lookAt(new r.Vector3(0,1,0).add(this.marker.position)))

H5场景/src/pages/Home.vue

@@ -156,7 +156,6 @@ export default {
       window.evt.initEvent("loadfinish", false, false);
       window.addEventListener("loadfinish", () => {
         this.loading = false;
-        document.title = "珠海高新区中共党史学习教育园地线上展厅";
         this.getHotSpotList();
         window.player.on("openTips", () => {
           this.$showTips();

H5场景/src/views/gui/compomemt/hotspot.vue

@@ -53,7 +53,7 @@ export default {
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {
-    this.data = window.myHotList;
+    this.data = window.myHotList || [];
   },
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {},