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

# Conflicts:
#	js/edit.js

edit.html

@@ -1381,10 +1381,10 @@
     </div>
 
     <script>
-        //var token = localStorage.dcj_token
-        //if (!token) {
-        //    window.location.href = 'http://space3d.4dage.com/back/service/#/login'
-        //}
+        var token = localStorage.dcj_token
+        if (!token) {
+           window.location.href = '../list/index.html'
+        }
 
         var log = window.location.href.substring(window.location.href.indexOf("?") + 1).indexOf('log') > -1;
         

js/edit.js

@@ -2,8 +2,11 @@ var ceshi = '';
 // var ceshi = 'http://192.168.0.135:8105';
  var ceshi = 'http://47.107.252.54:8105';
 
-
-var token = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsInJvbGUiOm51bGwsIm1hbmFnZXIiOm51bGwsImlkIjoxLCJ1c2VyTmFtZSI6ImFkbWluIiwiZXhwIjoxNTk2NTA0NDIyLCJpYXQiOjE1OTY0MTgwMjIsImp0aSI6IjRlNmZmZDgxLTUxMTUtNDZjNS1iNjlhLTY0ZDM2YzJmOGQ4ZiJ9.ou57-8znUElcMvT2e-XfJt9Vw4_BUfA3bHW37xjeQvc"//window.localStorage.dcj_token                                    
+  
+//var token = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsInJvbGUiOm51bGwsIm1hbmFnZXIiOm51bGwsImlkIjoxLCJ1c2VyTmFtZSI6ImFkbWluIiwiZXhwIjoxNTk2NTA0NDIyLCJpYXQiOjE1OTY0MTgwMjIsImp0aSI6IjRlNmZmZDgxLTUxMTUtNDZjNS1iNjlhLTY0ZDM2YzJmOGQ4ZiJ9.ou57-8znUElcMvT2e-XfJt9Vw4_BUfA3bHW37xjeQvc"//window.localStorage.dcj_token                                    
+ 
+var token = window.localStorage.dcj_token
+ 
 
 function reData(data,type) {
   return JSON.stringify(data) == type ? null : data
@@ -200,12 +203,12 @@ EditTools.prototype.saveAll = function () {
     $.ajax({
       method: 'POST',
       headers:{
-        'Content-Type':'application/json',
-        token:token// token:'eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsInJvbGUiOm51bGwsIm1hbmFnZXIiOm51bGwsImlkIjoxLCJ1c2VyTmFtZSI6ImFkbWluIiwiZXhwIjoxNTk1Mjk1ODk1LCJpYXQiOjE1OTUyMDk0OTUsImp0aSI6IjM5NDFhZmJhLTM5YTItNDM4ZS1hMjdlLTg3YjVhZDYzOWI3NCJ9.x0lENGaof5zMTCfYtZ8DFVG3KCuoH02P7yH8B_JUy60'
+        'Content-Type':'application/json', 
+        token:token
       },
       dataType:'json',
       contentType:'application/json',
-      url: ceshi + '/manage/scene/edit',//ceshi + '/api/scene/edit',
+      url: ceshi + '/manage/scene/edit', 
       data: JSON.stringify({
         sceneCode:number,
         hots: reData(hots,'{}') ,
@@ -218,12 +221,12 @@ EditTools.prototype.saveAll = function () {
       success: function (data) {
         if (data.code === 0) {
           location.reload()
-        }
-       if (data.code === 5001) {
+        } 
+        if (data.code === 5001) {
           alert('请重新登录')
           localStorage.dcj_token = ''
           location.reload()
-        }                      
+        } 
       }
        
     })
@@ -1447,8 +1450,8 @@ function uploadFile(file, type, callback) {
   formData.append('random', true)
   formData.append('file', file)
 
-  $.ajax({
-    url: ceshi + '/manage/scene/upload/'+number,//ceshi + '/api/scene/upload/'+number,
+  $.ajax({ 
+    url: ceshi + '/manage/scene/upload/'+number, 
     data: formData,
     headers:{
       token:token
@@ -2769,11 +2772,11 @@ var panoVisiSet = {
         
         
         $.ajax({
-          method: 'POST',
-          url: ceshi + '/manage/scene/roamViable',//ceshi + '/api/scene/roamViable',
+          method: 'POST', 
+          url: ceshi + '/manage/scene/roamViable',
           headers:{
-            'Content-Type':'application/json'  ,
-            token:token       
+            'Content-Type':'application/json',
+            token:token 
           },
           contentType:'application/json',
           data: JSON.stringify({

js/main_2020_edit.js

@@ -6441,8 +6441,10 @@ function o(a, s, l) {
                     for (var a = 0; a < fe; a++) {
                         var s = e.heroLocations[a]
                           , l = $('<li class="thumbImg" data-index=""><img src=""></li>');
+                        var tmp =  s.thumbUrl.replace('https://','').replace('http://','')
+
                         if (l.attr("data-index", a),
-                        Ce.highlight.visible && l.find("img").attr("src", s.thumbUrl),
+                        Ce.highlight.visible && l.find("img").attr("src",'https://'+tmp),
                         s.name) {
                             var c = $('<div class="overlay"></div>').text(s.name);
                             l.prepend(c)