1

edit.html

@@ -1392,7 +1392,7 @@
     <script> 
         
         //本地:
-        var token ="eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsInJvbGUiOm51bGwsIm1hbmFnZXIiOm51bGwsImlkIjoxLCJ1c2VyTmFtZSI6ImFkbWluIiwiZXhwIjoxNTk2Nzk1NjczLCJpYXQiOjE1OTY3MDkyNzMsImp0aSI6IjBjOWE1OTA0LTM5NzgtNDY4Yi05ODA5LWRmMjY4NDdiMWVmZCJ9.ihux4chiWgbY1cxiwVKrI6XaPHGCgWuoj6uVF1KRfOo"
+        var token ="eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsInJvbGUiOm51bGwsIm1hbmFnZXIiOm51bGwsImlkIjoxLCJ1c2VyTmFtZSI6ImFkbWluIiwiZXhwIjoxNTk3MTA5MDk0LCJpYXQiOjE1OTcwMjI2OTQsImp0aSI6ImY4YzI1MTcyLWM0NmUtNGNmYi04MjRhLWJkMmU2YWRmOWVjZSJ9.kUEmWOCJ0WONTkUI1vTToLePfzgbLiWwhU5nEWIsvlg"
         var ceshi = 'http://47.107.252.54:8105';
         /*
         //大场景: 

js/main_2020_edit.js

@@ -16686,7 +16686,7 @@ function o(a, s, l) {
                 for (var i = document.createDocumentFragment(), n = Object.keys(e), r = 0; r < n.length; r++) {
                     var o = document.createElement("li")
                       , a = document.createElement("span");
-                    a.innerHTML = e[n[r]].title || "热点",
+                    a.innerHTML = e[n[r]].title || e[n[r]].infoAttribute.title  || "热点",
                     o.hot = t[n[r]],
                     o.appendChild(a),
                     i.appendChild(o)
@@ -16726,14 +16726,17 @@ function o(a, s, l) {
                     if(!e){
                         console.error("data2 is null") 
                     }else{ 
-                        for (var t in g_data2 = hotMatcher(e),
-                        this.hotsCount = 0,
-                        e.hots)
+                        g_data2 = hotMatcher(e)
+                        this.hotsCount = 0
+                        for (var t in e.hots){
                             this.hotsCount++,
                             this.hots[t] = new M(t,e.hots[t],this);
-                            
-                            
-                            
+                            this.hots[t].initStyleImg(e.hots[t].infoAttribute);
+                        }
+                        window.hotData = e.hots
+                        this.createHotItem(e.hots, this.hots);
+                        
+                        
                         g_index = I.valueFromHash("m"),
                         e.tourAudio && (g_tourAudio = new Audio,
                         g_tourAudio.loop = !1,
@@ -16744,39 +16747,31 @@ function o(a, s, l) {
                         }));
                         e.weixinDesc && (g_weixinObj.desc = e.weixinDesc) 
                         //window.wx && manage.weixinShare(),
+                        
+                        
+                         
                     }
-                    var i = $.Deferred()
+                    /* var i = $.Deferred()
                       , n = g_Prefix + "data/" + this.sid + "/hot/js/data.js?" + randomTime().getTime();
                     a.get(n, {
                         responseType: "json",
                         auth: this.isPublic ? null : u.authorizationHeader
                     }).done(function(e) {
-                        window.hotData = e,
-                        this.createHotItem(e, this.hots);
+                         window.hotData = e,
+                         this.createHotItem(e, this.hots);
                         
                         for(let i in this.hots){
                             e[i] && this.hots[i].initStyleImg(e[i]);
-                        }
+                        } 
                         
                         i.resolve()
                     }
                     .bind(this)).fail(function() {
                         console.log("Data.js is empty");
-                        //直接使用data2
-                        /* window.hotData = data2 
-                        this.createHotItem(data2, this.hots);
-                        
-                        for(let i in this.hots){
-                            e[i] && this.hots[i].initStyleImg(e[i]);
-                        }
-                        
-                         */
-                        
-                        
-                        
+                          
                         i.resolve()
                     }),
-                    
+                     */
                     r.resolve()
                 }
                 .bind(this)).fail(function() {

js/main_2020_show.js

@@ -17434,7 +17434,7 @@ window.Modernizr = function(n, e, t) {
                 for(var i = 0; i < keyAry.length; i++){
                     var li = document.createElement('li');
                     var span = document.createElement('span');
-                    span.innerHTML = data[keyAry[i]].title || '热点';
+                    span.innerHTML = data[keyAry[i]].title || data[keyAry[i]].infoAttribute.title   || '热点';
                    // console.log(span.innerHTML);
                     li.hot = hots[keyAry[i]];   // 列表每一项对应一个热点
                     li.appendChild(span);
@@ -17476,8 +17476,11 @@ window.Modernizr = function(n, e, t) {
                         for(var i in t.hots){
                             this.hotsCount ++;
                             this.hots[i] = new Hot(i, t.hots[i], this);  
-                            
+                            this.hots[i].initStyleImg(t.hots[i].infoAttribute);
                         };
+                        window.hotData = t.hots 
+                        this.createHotItem(t.hots, this.hots);
+                        
                         g_index = w.valueFromHash("m");
                         if(t.tourAudio){
                             g_tourAudio = new Audio; 
@@ -17488,9 +17491,12 @@ window.Modernizr = function(n, e, t) {
                                 window.dispatchEvent(ev);
                             });
                         };
+                        
+                        
+                        
                     }
                     /***************************方奕卓 请求data.js数据, 用于初始化热点列表 ****************************/
-                    var dataJsPromise = $.Deferred();
+                    /* var dataJsPromise = $.Deferred();
                     var dataJsUrl = g_Prefix+"data/" + this.sid + "/hot/js/data.js" +'?'+ randomTime().getTime();
                     a.get(dataJsUrl,{
                         responseType: "json",
@@ -17505,7 +17511,7 @@ window.Modernizr = function(n, e, t) {
                     }.bind(this)).fail(function(){
                         console.log('Data.js is empty');
                         dataJsPromise.resolve();
-                    }) 
+                    })  */
                     e.resolve();
                 }.bind(this)).fail(function() {
                     console.log('没有热点');