xzw 5 years ago
parent
commit
c2692d96a2
4 changed files with 12 additions and 12 deletions
  1. 3 3
      edit.html
  2. 3 3
      js/main_2020_edit.js
  3. 2 2
      js/main_2020_show.js
  4. 4 4
      js/manage.js

+ 3 - 3
edit.html

@@ -1117,7 +1117,7 @@
                         </li>
                         <li data-name="floorMarkerColor">
                             <div class="itemTitle">
-                                <span>选择地面/导览标志颜色</span>
+                                <span>当前位置标记/导览标记颜色</span>
                             </div>
                             <ul class="clearfix hotStyle-item colorWrap">
                                 <input id="floorMarkerColorTex" class="color-text" type="text" placeholder="请输入颜色" />
@@ -1126,7 +1126,7 @@
                         </li>
                         <li data-name="MouseMarkerColor">
                             <div class="itemTitle">
-                                <span>选择鼠标标志颜色</span>
+                                <span>鼠标标记颜色</span>
                             </div>
                             <ul class="clearfix hotStyle-item colorWrap">
                                 <input id="mouseMarkerColorTex" class="color-text" type="text" placeholder="请输入颜色" />
@@ -1154,7 +1154,7 @@
                                     <input name="hideFloorMarker" class="editCheckbox" type="checkbox"
                                         value="hideFloorMarker" id="hideFloorMarker">
                                     <label for="hideFloorMarker"></label>
-                                    <label for="hideFloorMarker">隐藏地面标记 </label>
+                                    <label for="hideFloorMarker">隐藏地面marker标记 </label>
                                 </li>
                                 <li>
                                     <input name="hideMouseMarker" class="editCheckbox" type="checkbox"

+ 3 - 3
js/main_2020_edit.js

@@ -17675,9 +17675,9 @@ function o(a, s, l) {
                     side: s.DoubleSide,
                     opacity: 0,
                     transparent: !0,
-                    depthWrite: !1,
-                    visible: this.showFloorMarker
-                })),
+                    depthWrite: !1  
+                })), 
+                this.marker.visible = this.showFloorMarker,  
                 this.marker.renderOrder = l.panoMarker,
                 this.marker.name = "marker",
                 (this.marker.pano = this).marker.layers.set(v.PANOMARKERS),

+ 2 - 2
js/main_2020_show.js

@@ -18438,9 +18438,9 @@ window.Modernizr = function(n, e, t) {
                     side: r.DoubleSide,
                     opacity: 0,
                     transparent: !0,
-                    depthWrite: !1,
-                    visible:this.showFloorMarker    // 隐藏/显示地面标志
+                    depthWrite: !1 
                 })),
+                this.marker.visible = this.showFloorMarker,  
                 this.marker.renderOrder = s.panoMarker,
                 this.marker.name = "marker",
                 this.marker.pano = this,

+ 4 - 4
js/manage.js

@@ -237,11 +237,11 @@ Manage.prototype.weixinShare = function() {
         error:function(XMLHttpRequest,textStatus,errorThrown){    
             console.log("jsonp.error:"+textStatus);    
         }    
-        }); 
+    }); 
     
-        var success_jsonp = function(json){
-            console.log(json);
-        };
+    var success_jsonp = function(json){
+        console.log(json);
+    };
 
 
     wx.ready(function(){