Merge branch 'master' of http://git.ycjcjy.com/H5/yjswls

src/pages/chengShiShan.vue

@@ -160,7 +160,7 @@ export default {
       for (let n = 0; n < document.getElementsByClassName('music-icon').length; n++) {
         document.getElementsByTagName('body')[0].removeChild(document.getElementsByClassName('music-icon')[n])
       }
-      musicPlay('https://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/20181229-images/Thomas%20Greenberg.mp3')
+      musicPlay('https://jingcheng-h5.oss-cn-beijing.aliyuncs.com/yjswls01_css.mp3')
     })
   },
   methods: {

src/pages/menus.vue

@@ -65,7 +65,7 @@ export default {
       for (let n = 0; n < document.getElementsByClassName('music-icon').length; n++) {
         document.getElementsByTagName('body')[0].removeChild(document.getElementsByClassName('music-icon')[n])
       }
-      musicPlay('https://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/20181229-images/Thomas%20Greenberg.mp3')
+      musicPlay('https://jingcheng-h5.oss-cn-beijing.aliyuncs.com/yjswls01_menu.mp3')
     })
   },
   methods: {

src/pages/quanLingJu.vue

@@ -180,7 +180,7 @@ export default {
         document.getElementsByTagName('body')[0].removeChild(document.getElementById('audio'))
         document.getElementsByTagName('body')[0].removeChild(document.getElementsByClassName('music-icon')[0])
       }
-      musicPlay('https://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/20181229-images/Thomas%20Greenberg.mp3')
+      musicPlay('https://jingcheng-h5.oss-cn-beijing.aliyuncs.com/yjswls01_zny_qlj.mp3')
     })
   },
   methods: {

src/pages/xinFuWu.vue

@@ -78,6 +78,7 @@
 </template>
 
 <script>
+import musicPlay from '../util/music'
 export default {
   name: 'mainPage',
   data () {
@@ -99,6 +100,7 @@ export default {
   },
   mounted () {
     this.$nextTick(() => {
+      musicPlay('https://jingcheng-h5.oss-cn-beijing.aliyuncs.com/yjswls01_xfw.mp3')
     })
   },
   methods: {

src/pages/yueGaoJie.vue

@@ -141,6 +141,7 @@
 </template>
 
 <script>
+import musicPlay from '../util/music'
 export default {
   name: 'mainPage',
   data () {
@@ -235,6 +236,7 @@ export default {
   },
   mounted () {
     this.$nextTick(() => {
+      musicPlay('https://jingcheng-h5.oss-cn-beijing.aliyuncs.com/yjswls01__ygj.mp3')
     })
   },
   methods: {

src/pages/zhiNengYuan.vue

@@ -138,6 +138,7 @@
 </template>
 
 <script>
+import musicPlay from '../util/music'
 export default {
   name: 'mainPage',
   data () {
@@ -159,6 +160,7 @@ export default {
   },
   mounted () {
     this.$nextTick(() => {
+      musicPlay('https://jingcheng-h5.oss-cn-beijing.aliyuncs.com/yjswls01_zny_qlj.mp3')
     })
   },
   methods: {

src/util/music.js

@@ -1,10 +1,23 @@
 
 /* eslint-disable */
 export default function musicPlay (src) {
+
   var className = 'play'
   var trigger = 'ontouchend' in document ? 'touchstart' : 'click'
-  var $musci = document.createElement('div')
-  var $audio = document.createElement('audio')
+  var $musci
+  var m = document.getElementById('music-icon')
+  if (m) {
+    $musci = m
+  } else {
+    $musci = document.createElement('div')
+  }
+  var a = document.getElementById('audio')
+  var $audio 
+  if (a) {
+    $audio = a
+  } else {
+    $audio = document.createElement('audio')
+  }
 
   function start () {
     document.removeEventListener(trigger, start, false)
@@ -29,13 +42,17 @@ export default function musicPlay (src) {
 
   $musci.className = 'music-icon'
   $musci.classList.add('paused')
+  $musci.id = "music-icon"
   $audio.src = src
   $audio.id = "audio"
   $audio.class = "audio"
   $audio.loop = true
   $audio.volume = 0.5
+
   document.body.appendChild($musci)
   document.body.appendChild($audio)
+  // document.getElementById('mainPage').appendChild($musci)
+  // document.getElementById('mainPage').appendChild($audio)
 
   $audio.addEventListener('play', play, false)
   $audio.addEventListener('pause', pause, false)