xzw 4 lat temu
rodzic
commit
28eebb3ac2

+ 4 - 9
edit-backstage/js/main_2020_edit.js

@@ -5150,22 +5150,17 @@ function o(a, s, l) {
             }
             ,
             t.prototype.getMomentTour = function(destinationItem) {//add 
-                                                                                        
-                                                                        
-                                                                                                              
-                                                                         
+                                                                           
                 var wholeMomentTour = window.MP_PREFETCHED_MODELDATA.momentTour || "walk"; //最外层
-                
-                                                                
-                    
+                 
                 if(!destinationItem) return wholeMomentTour
                 else{
                     var currentLocation = this.model.getHeroDescriptorByIndex(destinationItem)//最内层。 如果有使用最内层
                     if(currentLocation.momentTour)return currentLocation.momentTour;
                     
                     var currentLocation_ = this.model.heroLocations[destinationItem[0]];
-                    return  currentLocation_.heroLocations ? currentLocation_.momentTour : wholeMomentTour; //如果有中间层,使用中间层,否则使用最外层
-                }
+                    return  currentLocation_.momentTour || wholeMomentTour; //若中间层或最内层有就使用,否则使用最外层
+                } 
             }
             ,
             I.exports = t

+ 3 - 3
web/public/static/js/main_2020_show.js

@@ -5314,15 +5314,15 @@ window.Modernizr = function(n, e, t) {
             ,
             n.prototype.getMomentTour = function(destinationItem) {//add
                 var wholeMomentTour = window.MP_PREFETCHED_MODELDATA.momentTour || "walk"; //最外层
-                
+                 
                 if(!destinationItem) return wholeMomentTour
                 else{
                     var currentLocation = this.model.getHeroDescriptorByIndex(destinationItem)//最内层。 如果有使用最内层
                     if(currentLocation.momentTour)return currentLocation.momentTour;
                     
                     var currentLocation_ = this.model.heroLocations[destinationItem[0]];
-                    return  currentLocation_.heroLocations ? currentLocation_.momentTour : wholeMomentTour; //如果有中间层,使用中间层,否则使用最外层
-                }
+                    return  currentLocation_.momentTour || wholeMomentTour; //若中间层或最内层有就使用,否则使用最外层
+                } 
             }