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

web/src/components/kangri/index.vue

@@ -6,14 +6,14 @@
       >
       <video
         ref="video"
-        autoplay
         loop
-        x5-video-player-type="h5"
-        x5-video-player-fullscreen="true"
-        webkit-playsinline=""
-        playsinline=""
+        controls="controls"
+        autoplay
         x5-playsinline=""
-        crossorigin="anonymous"
+        webkit-playsinline="true"
+        playsinline="true"
+        controlslist="nodownload"
+        contextmenu="false"
         :key="active"
       >
         <source
@@ -71,13 +71,6 @@ export default {
     },
   },
   mounted() {
-    document.addEventListener(
-      "WeixinJSBridgeReady",
-      () => {
-        this.autoplay();
-      },
-      false
-    );
     window.player.on("autoplay", () => {
       this.autoplay();
     });

web/src/pages/Home.vue

@@ -78,14 +78,6 @@ import vrCon from '@/views/gui/vrcon';
 import vOther from '@/views/gui/other';
 import welcome from '@/components/welcome';
 
-import UIHuiyi from '@/components/huiyi';
-import UIKangri from '@/components/kangri';
-
-
-
-let HuiYi = Vue.extend(UIHuiyi)
-let KangRi = Vue.extend(UIKangri)
-
 export default {
   name: 'Home',
   components: {
@@ -130,15 +122,6 @@ export default {
         window.evt =  document.createEvent('HTMLEvents')
         window.evt.initEvent('loadfinish',false,false)
         window.addEventListener('loadfinish',  ()=> {
-            let huiyi = new HuiYi().$mount()
-            let kangri = new KangRi().$mount()
-
-            document.body.appendChild(huiyi.$el)
-            document.body.appendChild(kangri.$el)
-
-            setTimeout(() => {
-                window.initMenu()
-            }, 0);
             this.getHotSpotList()
             window.player.on("openHotspot", (data)=> {
                 this.$showHotspot({