Inicio Explorar Axuda
Rexistro Iniciar sesión
chenzhiguang
/
zhengzhou_university
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

0000

tremble %!s(int64=4) %!d(string=hai) anos
pai
636c91c8a6
achega
1bd2b834b1
Modificáronse 9 ficheiros con 56 adicións e 24 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 1 3
      web/public/index.html
  2. 17 7
      web/public/static/js/main_2020_show.js
  3. 2 2
      web/public/static/js/manage.js
  4. BIN=BIN
      web/src/assets/images/bofang.png
  5. BIN=BIN
      web/src/assets/images/liubianxing.png
  6. BIN=BIN
      web/src/assets/video/welcome.webm
  7. 28 10
      web/src/components/tips.vue
  8. 7 2
      web/src/components/welcome/index.vue
  9. 1 0
      web/src/pages/Home.vue

+ 1 - 3
web/public/index.html
Ver ficheiro 

@@ -22,6 +22,7 @@
 
         if (number.indexOf("#") != -1) {
 
             number = number.substring(0, number.indexOf("#"));
 
         } 
+        number = 831
 
     </script>
 
     <script class="build keep">
 
         if (window.performance) {
 
@@ -33,9 +34,6 @@
 
 </head>
 
 
 <body>
 
-    <noscript>
 
-        <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
 
-    </noscript>
 
     <div id="app"></div>
 
     <script src="<%= VUE_APP_STATIC_DIR %>/js/lib/jquery-2.1.1.min.js" class="build keep"></script>
 
     <script src="<%= VUE_APP_STATIC_DIR %>/js/lib/player-0.0.12.min.js" class="build keep"></script>

+ 17 - 7
web/public/static/js/main_2020_show.js
Ver ficheiro 

@@ -24,6 +24,10 @@ g_tourAudio.oncanplaythrough = function() {
 
     // g_playAudio = g_tourAudio;  
 }
 
 
+var currentAudio = 0
 
+var firstIn = true
 
+
 
+
 
 var changeBGM = function(id){
 
     let areaArr = Object.keys(areaInfo)
 
     let flagnext = true
 
@@ -38,7 +42,9 @@ var changeBGM = function(id){
 
                         currentAudio = i
 
                         g_bgAudio.src =  areaAudio[i];
 
                         console.log(areaAudio[i],'====')
 
-                        manage.switchBgmState(true)
 
+                        if(!firstIn){
 
+                            manage.switchBgmState(true)
 
+                        }
 
                     return
 
                 }
 
             }
 
@@ -69,7 +75,6 @@ var getVisiblePano = function(position, options={}){
 
     return visiblePanos
 
 } 
 
-var currentAudio = 0
 
   
 var videoPosInfo = {
 
     "2c16e02c9d1a413291a11f694e99d126" :[],
 
@@ -30585,11 +30590,16 @@ window.Modernizr = function(n, e, t) {
 
                 return "boolean" == typeof t ? "true" === n || "1" === n : "number" == typeof t ? parseFloat(n) : n
 
             },
 
             valueFromHash: function(e, t) {
 
-                var i = new RegExp("[#&?]" + e + "=([^#&?]*)")
 
-                  , n = i.exec(window.location.href);
 
-                if (!n)
 
-                    return t;
 
-                var r = n[1];
 
+                var r = ''
 
+                if(e=='m')
 
+                    r= 831
 
+                else{
 
+                    var i = new RegExp("[#&?]" + e + "=([^#&?]*)")
 
+                    , n = i.exec(window.location.href);
 
+                    if (!n)
 
+                        return t;
 
+                    r = n[1];
 
+                }
 
                 return "boolean" == typeof t ? "true" === r || "1" === r : "number" == typeof t ? parseFloat(r) : window.decodeURIComponent(r)
 
             }
 
         }

+ 2 - 2
web/public/static/js/manage.js
Ver ficheiro 

@@ -165,7 +165,7 @@ Manage.prototype.switchBgmState = function(state){
 
         g_playAudio = g_bgAudio;
 
         $("#volume a img").attr("src", "./static/images/Volume btn_off.png")
 
         $("#volume").attr("title", "关闭声音");
 
-        g_tourAudio && g_tourAudio.pause()
 
+        // g_tourAudio && g_tourAudio.pause()
 
     }
 
     var paused = function(){ 
         g_play = 0;
 
@@ -173,6 +173,7 @@ Manage.prototype.switchBgmState = function(state){
 
         $("#volume a img").attr("src", "./static/images/Volume btn_on.png")
 
         $("#volume").attr("title", "打开声音");
 
     }
 
+    g_bgAudio.volume = 0.4
 
     
     if(state ){
 
         g_bgAudio.play(); 
@@ -187,7 +188,6 @@ Manage.prototype.switchBgmState = function(state){
 
         paused()
 
     } 
     
-    
     g_bgAudio.pauseByHot = false
 
     g_bgAudio.pauseByTour = false
 
 }

BIN=BIN
web/src/assets/images/bofang.png
Ver ficheiro


BIN=BIN
web/src/assets/images/liubianxing.png
Ver ficheiro


BIN=BIN
web/src/assets/video/welcome.webm
Ver ficheiro


+ 28 - 10
web/src/components/tips.vue
Ver ficheiro 

@@ -2,13 +2,17 @@
 
   <div class="layout">
 
     <div class="mask"></div>
 
     <div class="tips-con">
 
-      <img class="close" @click="$emit('close')" :src="require('@/assets/images/icon/close.png')" alt="" />
 
-      <img class="bg" :src="require('@/assets/images/tips_bg.png')" alt="" />
 
+      <!-- <img class="close" @click="$emit('close')" :src="require('@/assets/images/icon/close.png')" alt="" /> -->
 
+      <!-- <img class="bg" :src="require('@/assets/images/tips_bg.png')" alt="" /> -->
 
       <div class="tips-body">
 
-        <div>欢迎访问<br/>信息工程大学数字史馆</div>
 
-        <p>点击播放按钮，开始自动导览</p>
 
+        <!-- <div>欢迎访问<br/>信息工程大学数字史馆</div> -->
 
+        <!-- <p>点击播放按钮，开始自动导览</p> -->
 
         <div class="bofang" @click="starttour">
 
-          <img :src="require('@/assets/images/bofang.png')" alt="" />
 
+          <img class="bgf" :src="require('@/assets/images/liubianxing.png')" alt="" />
 
+          <div class="bcon">
 
+            <img :src="require('@/assets/images/bofang.png')" alt="" />
 
+            <p>自动导览</p>
 
+          </div>
 
         </div>
 
       </div>
 
     </div>
 
@@ -82,21 +86,35 @@ export default {
 
       text-align: center;
 
     }
 
     .bofang{
 
-      width: 54px;
 
-      height: 54px;
 
-      background: rgba(#A01C26, 0.7);
 
+      width: 120px;
 
       margin: 0 auto;
 
       font-size: 0;
 
       position: relative;
 
       border-radius: 50%;
 
       cursor: pointer;
 
-      >img{
 
-        width: 26px;
 
+      .bgf{
 
+        width: 100%;
 
+        height: auto;
 
+      }
 
+      .bcon{
 
+        width: 100%;
 
         position: absolute;
 
         transform: translate(-50%,-50%);
 
         top: 50%;
 
         left: 50%;
 
+        text-align: center;
 
+        >img{
 
+          width: 35%;
 
+        }
 
+        >p{
 
+          font-size: 16px;
 
+          font-weight: normal;
 
+          color: #fff;
 
+          letter-spacing: 0;
 
+          margin-top: 4px;
 
+        }
 
       }
 
+      
     }
 
     }
 
   }

+ 7 - 2
web/src/components/welcome/index.vue
Ver ficheiro 

@@ -5,7 +5,12 @@
 
       <div  v-if="!isVideo" class="we_title">欢迎访问<br/>战略支援部队信息工程大学数字史馆</div>
 
       <span v-if="!isVideo" class="btn" @click="showVideo">开始预览</span>
 
     </template>
 
-    <video ref="welcome" :style="{opacity:isVideo?1:0}" preload :poster="require('@/assets/images/videopost.jpg')" :src="require('@/assets/video/welcome.mp4')"></video>
 
+
 
+    <video ref="welcome" :style="{opacity:isVideo?1:0}" >
 
+      <source :src="require('@/assets/video/welcome.webm')" type="video/webm">
 
+      <source :src="require('@/assets/video/welcome.mp4')" type="video/mp4">
 
+    </video> 
+
 
     <span v-if="isVideo" class="btn jump" @click="$bus.$emit('toggleWelcome', false)">跳过</span>
 
      <div class="loading" v-if="loading">
 
       <span>加载中...</span>
 
@@ -41,7 +46,7 @@ export default {
 
           this.$bus.$emit('toggleWelcome', false)
 
         })
 
 
-        this.$refs.welcome.addEventListener('loadedmetadata',()=>{
 
+        this.$refs.welcome.addEventListener('canplaythrough',()=>{
 
           setTimeout(() => {
 
             this.loading = false
 
           }, 3000);

+ 1 - 0
web/src/pages/Home.vue
Ver ficheiro 

@@ -190,6 +190,7 @@ export default {
 
           this.showWelcome = data
 
         }
 
         if (!data) {
 
+            firstIn = false
 
             manage.switchBgmState(true);
 
             this.showTips = true
 
             setTimeout(() => {