Browse Source

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

许成详 6 years ago
parent
commit
51dfb90d65

+ 1
- 1
src/pages/chengShiShan.vue View File

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

+ 1
- 1
src/pages/menus.vue View File

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

+ 1
- 1
src/pages/quanLingJu.vue View File

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

+ 2
- 0
src/pages/xinFuWu.vue View File

78
 </template>
78
 </template>
79
 
79
 
80
 <script>
80
 <script>
81
+import musicPlay from '../util/music'
81
 export default {
82
 export default {
82
   name: 'mainPage',
83
   name: 'mainPage',
83
   data () {
84
   data () {
99
   },
100
   },
100
   mounted () {
101
   mounted () {
101
     this.$nextTick(() => {
102
     this.$nextTick(() => {
103
+      musicPlay('https://jingcheng-h5.oss-cn-beijing.aliyuncs.com/yjswls01_xfw.mp3')
102
     })
104
     })
103
   },
105
   },
104
   methods: {
106
   methods: {

+ 2
- 0
src/pages/yueGaoJie.vue View File

141
 </template>
141
 </template>
142
 
142
 
143
 <script>
143
 <script>
144
+import musicPlay from '../util/music'
144
 export default {
145
 export default {
145
   name: 'mainPage',
146
   name: 'mainPage',
146
   data () {
147
   data () {
235
   },
236
   },
236
   mounted () {
237
   mounted () {
237
     this.$nextTick(() => {
238
     this.$nextTick(() => {
239
+      musicPlay('https://jingcheng-h5.oss-cn-beijing.aliyuncs.com/yjswls01__ygj.mp3')
238
     })
240
     })
239
   },
241
   },
240
   methods: {
242
   methods: {

+ 2
- 0
src/pages/zhiNengYuan.vue View File

138
 </template>
138
 </template>
139
 
139
 
140
 <script>
140
 <script>
141
+import musicPlay from '../util/music'
141
 export default {
142
 export default {
142
   name: 'mainPage',
143
   name: 'mainPage',
143
   data () {
144
   data () {
159
   },
160
   },
160
   mounted () {
161
   mounted () {
161
     this.$nextTick(() => {
162
     this.$nextTick(() => {
163
+      musicPlay('https://jingcheng-h5.oss-cn-beijing.aliyuncs.com/yjswls01_zny_qlj.mp3')
162
     })
164
     })
163
   },
165
   },
164
   methods: {
166
   methods: {

+ 19
- 2
src/util/music.js View File

1
 
1
 
2
 /* eslint-disable */
2
 /* eslint-disable */
3
 export default function musicPlay (src) {
3
 export default function musicPlay (src) {
4
+
4
   var className = 'play'
5
   var className = 'play'
5
   var trigger = 'ontouchend' in document ? 'touchstart' : 'click'
6
   var trigger = 'ontouchend' in document ? 'touchstart' : 'click'
6
-  var $musci = document.createElement('div')
7
-  var $audio = document.createElement('audio')
7
+  var $musci
8
+  var m = document.getElementById('music-icon')
9
+  if (m) {
10
+    $musci = m
11
+  } else {
12
+    $musci = document.createElement('div')
13
+  }
14
+  var a = document.getElementById('audio')
15
+  var $audio 
16
+  if (a) {
17
+    $audio = a
18
+  } else {
19
+    $audio = document.createElement('audio')
20
+  }
8
 
21
 
9
   function start () {
22
   function start () {
10
     document.removeEventListener(trigger, start, false)
23
     document.removeEventListener(trigger, start, false)
29
 
42
 
30
   $musci.className = 'music-icon'
43
   $musci.className = 'music-icon'
31
   $musci.classList.add('paused')
44
   $musci.classList.add('paused')
45
+  $musci.id = "music-icon"
32
   $audio.src = src
46
   $audio.src = src
33
   $audio.id = "audio"
47
   $audio.id = "audio"
34
   $audio.class = "audio"
48
   $audio.class = "audio"
35
   $audio.loop = true
49
   $audio.loop = true
36
   $audio.volume = 0.5
50
   $audio.volume = 0.5
51
+
37
   document.body.appendChild($musci)
52
   document.body.appendChild($musci)
38
   document.body.appendChild($audio)
53
   document.body.appendChild($audio)
54
+  // document.getElementById('mainPage').appendChild($musci)
55
+  // document.getElementById('mainPage').appendChild($audio)
39
 
56
 
40
   $audio.addEventListener('play', play, false)
57
   $audio.addEventListener('play', play, false)
41
   $audio.addEventListener('pause', pause, false)
58
   $audio.addEventListener('pause', pause, false)