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

hotspot/src/views/Home.vue

@@ -119,7 +119,7 @@ export default {
   data() {
     return {
       // http://8.135.106.227:8009
-      server: "http://192.168.1.101",
+      server: "",
       loadAuto: false,
       hadLoad: false,
       audio: "",
@@ -306,7 +306,7 @@ export default {
         height: calc(100% - 180px);
         position: relative;
         .tips{
-          top: 10px;
+          top: -50px;
           left: 100px;
           z-index: 999;
           font-size: 16px;

web/public/static/js/myShow.js

@@ -1,7 +1,7 @@
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-var g_Prefix="http://192.168.1.101/";
+// var g_Prefix="http://8.135.106.227:8009/";
 // https://super.4dage.com/
-// var g_Prefix=window.location.origin+'/';
+var g_Prefix=window.location.origin+'/';
 
 var s = window.location.href.split('/');
 s.pop();

web/src/components/longvideo/index.vue

@@ -4,8 +4,8 @@
     <img class="close" @click="$bus.$emit('toggleLongVideo',false)" :src="require('@/assets/images/icon/close.png')" alt="">
     <div class="longbody">
       <video @click="autoplay" :style="{left:translate.x + 'px'}" ref="layout" autoplay loop :poster="require('@/assets/images/video1.jpg')">
-        <source :src="require('@/assets/video/video.webm')" type="video/webm">
         <source :src="require('@/assets/video/video.mp4')" type="video/mp4">
+        <source :src="require('@/assets/video/video.webm')" type="video/webm">
       </video>
     </div>
     <div class="scorll-bar" :style="{width:barW+'px'}">