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

web/public/static/js/main_2020_show.js

@@ -38,7 +38,7 @@ g_tourAudio.oncanplaythrough = function() {
 
 
 
-let ponaid = "1c8790272448494b8a3d4148d27af14c"  //三大会议ponaid
+let ponaid = "8cc9b4d1bebe4b9483a3eefca04246dd"  //三大会议ponaid
 
 window.menuSanda = null // 三大会议的总plane
 

web/src/components/hotspot/index.vue

@@ -58,7 +58,7 @@ export default {
 .hotspotcon{
   background: #000;
   position: fixed;
-  z-index: 999;
+  z-index: 99999;
   width: 100%;
   height: 100%;
   left: 0;