Merge branch 'master' of http://face3d.4dage.com:7005/chenzhiguang/zhengzhou_university

web/public/static/js/main_2020_show.js

@@ -4900,7 +4900,7 @@ window.Modernizr = function(n, e, t) {
             n.prototype.goToDestination = function(e, t, i, n) {
                         
                 //音频 
-                if(this.destinationItem[1] == 0){//如果是每个folder的起始
+                if(this.destinationItem[1] == 0 && e!='noMusic'){//如果是每个folder的起始
                     var musicInfo = this.model.heroLocations[this.destinationItem[0]].musicInfo
                     if(musicInfo && musicInfo.music){
                         g_tourAudio.pause();