Merge branch 'master' of http://git.ycjcjy.com/support-game/wechat

src/components/music.vue

@@ -1,7 +1,6 @@
 <template>
     <div class="musicbox" @click="troggle">
       <img :class="playing" :src="icons[theme][playing]" alt="">
-      <audio ref="player" :src="url" preload loop="loop"></audio>
     </div>
 </template>
 <script>
@@ -14,6 +13,7 @@ export default {
   data() {
     return {
       playing: 'off',
+      audio: null,
 
       icons: {
         '1': {
@@ -37,12 +37,19 @@ export default {
   methods: {
     play() {
       if (this.url) {
-        this.$refs.player.play()
+        if (!this.audio) {
+          this.audio = window.document.createElement('audio')
+          this.audio.src = this.url
+          this.audio.preload = true
+          this.audio.loop = true
+        }
+
+        this.audio.play()
         this.playing = 'on'
       }
     },
     stop() {
-      this.$refs.player.pause()
+      this.audio.pause()
       this.playing = 'off'
     },
     troggle() {

src/store/vote.js

@@ -5,7 +5,7 @@ export default {
   namespaced: true,
   state: {
     activity: {},
-    user: '4',
+    user: '22',
     detail: {},
     myprofile: {},
     toplist: [],

src/views/vote/detail.vue

@@ -107,7 +107,9 @@ export default {
       this.show = false
     },
     tolink() {
-      window.location.href = this.info.AfterVote
+      if (this.info.AfterVote != '') {
+        window.location.href = this.info.AfterVote
+      }
     },
   },
 };

src/views/vote/list.vue

@@ -115,7 +115,11 @@ export default {
     PullTo
   },
   mounted() {
-    window.addEventListener("scroll", this.handleScroll, true);
+    const scroll = window.scroll
+    window.addEventListener("scroll", (e) => {
+      scroll(e)
+      this.handleScroll()
+    }, true);
   },
   computed: {
     ...mapactivityState({

vue.config.js

@@ -7,9 +7,9 @@ module.exports = {
     proxy: {
       '/api': {
         // target: 'http://wechatconfigdev.ycjcjy.com',
-        // target: 'http://localhost:8080', // wf
+        target: 'http://localhost:8080', // wf
         // target: 'http://192.168.0.102:8080', // hyq
-        target: 'http://192.168.0.11:8080', // zys
+        // target: 'http://192.168.0.11:8080', // zys
         // target: 'http://dev.ycjcjy.com', // frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {