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

css/main.css

@@ -856,7 +856,7 @@ hr {
 
 .icon-fullscreen-exit:before {
     content: "";
-    background: url("https://super.4dage.com/images/narrow_off.png") center top no-repeat;
+    background: url("../images/narrow_off.png") center top no-repeat;
     background-size: 100%;
     display: inline-block;
     width: 24px;
@@ -865,7 +865,7 @@ hr {
 
 .icon-fullscreen:before {
     content: "";
-    background: url("https://super.4dage.com/images/enlarge_on.png")center top no-repeat;
+    background: url("../images/enlarge_on.png")center top no-repeat;
     background-size: 100%;
     display: inline-block;
     width: 24px;
@@ -3737,7 +3737,7 @@ a.hasHover:hover, a:active {
 .gui-floor-icon {
     width: 32px;
     height: 29px;
-    background: url("https://super.4dage.com/images/floor-icon.png") left top no-repeat;
+    background: url("../images/floor-icon.png") left top no-repeat;
     background-size: 98%;
 }
 
@@ -6370,7 +6370,7 @@ a.hasHover.tag-link:hover {
     display: block;
     width: 18px;
     height: 18px;
-    background: url("https://super.4dage.com/images/4dage-logo.png")left top no-repeat;
+    background: url("../images/4dage-logo.png")left top no-repeat;
     background-size: 100%;
 }
 

css/oldVer/main0.css

@@ -52,7 +52,7 @@ iframe{
 	opacity:0.1; 
 }
 #closepop {
-	background: url(https://super.4dage.com/images/close1.png) no-repeat;
+	background: url(../../images/close1.png) no-repeat;
 	width: 60px;
 	height: 60px;
 	cursor: pointer;

js/main_2020_show.js

@@ -14472,7 +14472,7 @@ window.Modernizr = function(n, e, t) {
                 
                 window.wx && manage.weixinShare();  
                 //初始画面
-                data.camera_start && data.camera_start.thumbImg && E(data.camera_start.thumbImg)
+                data.camera_start && data.camera_start.thumbImg &&  E(manage.dealURL(data.camera_start.thumbImg))
                 function E(e) {
                     $("<img/>").attr("src", e).on("load", function() {
                         $("#gui-thumb").css("backgroundImage", "url(" + e + ")").fadeIn(500),