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

web/public/static/js/main_2020_show.js

@@ -45,15 +45,14 @@ var changeBGM = function(id){
                         console.log(areaAudio[i],'====')
                         if($("#volume img")[0].src.indexOf("btn_off.png")>-1){
                             $(g_bgAudio).animate({volume: 0.0}, danTime);
-                            
                             setTimeout(() => {
                                 if(!firstIn){
                                     g_bgAudio.src =  areaAudio[i];
                                     g_bgAudio.play()
-                                    $(g_bgAudio).animate({volume: 0.1}, danTime);
+                                    $(g_bgAudio).animate({volume: 0.3}, danTime);
                                     // manage.switchBgmState(true)
                                 }
-                            }, danTime+500);
+                            }, danTime+200);
                         }
                         else{
                             g_bgAudio.src =  areaAudio[i];

web/public/static/js/manage.js

@@ -172,7 +172,7 @@ Manage.prototype.switchBgmState = function(state){
         $("#volume a img").attr("src", "./static/images/Volume btn_on.png")
         $("#volume").attr("title", "打开声音");
     }
-    g_bgAudio.volume = 0.1
+    g_bgAudio.volume = 0.3
     
     if(state ){
         g_bgAudio.play();