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

edit.html

@@ -1545,6 +1545,12 @@
                                     <label for="loadlogo">隐藏公司logo </label>
                                 </li>
                                 <li class="editCheckbox">
+                                    <input name="topText"  type="checkbox" value="topText"
+                                        id="topText">
+                                    <label for="topText"></label>
+                                    <label for="topText">隐藏顶部介绍 </label>
+                                </li>
+                                <li class="editCheckbox">
                                     <input name="hotImgScale"  type="checkbox" value="hotImgScale"
                                         id="hotImgScale">
                                     <label for="hotImgScale"></label>

js/edit.js

@@ -418,6 +418,7 @@ EditTools.prototype.initSaveAll = function() {
                 hoticon: JSON.parse($(".hotStyle-item li.active").attr("data-val")),
                 camera_start: $(".screen .shotImg.innerBtn")[0].cameraData,
                 loadlogo: $("#loadlogo").is(':checked'),
+                topText: $("#topText").is(':checked'),
                 special: $("#g_specialScene").is(':checked'),
                 vision_version: $("#twoData").is(':checked') ? "1.1.562.17209" : false,
                 roomLabels: that.editLabel.getSavingInfo(),
@@ -783,6 +784,7 @@ SceneInformation.prototype.init = function(data, data2) {
     
     var $options = $('.hotStyle-item li');
     var $loadlogo = $("#loadlogo");
+    var $topText = $("#topText");
     var $hotImageScale = $("#hotImgScale");
     var $hideFloorMarker = $("#hideFloorMarker");
     var $hideMouseMarker = $("#hideMouseMarker");
@@ -888,6 +890,12 @@ SceneInformation.prototype.init = function(data, data2) {
         showLogo();
     }
 
+    // 隐藏顶部介绍
+    if(data.topText){
+        $topText[0].checked = true
+        topTextHide()
+    }
+
     // 热点图片放大
     if (data.hotImageScale) {
         $hotImageScale[0].checked = true

js/main_2020_edit.js

@@ -14165,6 +14165,8 @@ function o(a, s, l) {
                     //隐藏公司logo
                     window.DATA.loadlogo && showLogo();
                     
+                    // 隐藏顶部介绍
+                    window.DATA.topText && topTextHide();
                 
                     r("./lib/three75-shim"),
                     r("./lib/array-polyfill"),

js/main_2020_show.js

@@ -15232,6 +15232,9 @@ window.Modernizr = function(n, e, t) {
                     showLogo();
                 }
 
+                // 隐藏顶部介绍
+                    window.DATA.topText && topTextHide();
+
 				e("./lib/three75-shim"),
 				e("./lib/array-polyfill"),
 				e("./lib/performance-polyfill"),

js/manage.js

@@ -1109,6 +1109,14 @@ function showLogo(){
     $("#title-logo").hide();
     $(".title-container").css("justify-content","center")
 }
+
+// 隐藏顶部介绍
+function topTextHide(){
+    console.log('------------------隐藏顶部');
+    
+    $('.pinTop').hide()
+}
+
 //czj 添加随机的时间
 function randomTime(){
     return new Date()