bug fix

src/App.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app" v-if="showPage">
     <router-view/>
-    <music :url="activity.Music"></music>
+    <music :url="activity.Music" :theme="theme"></music>
   </div>
 </template>
 
@@ -23,7 +23,8 @@ export default {
   },
   computed: {
     ...mapactivityState({
-      activity: s => s.activity || {}
+      activity: s => s.activity || {},
+      theme: s => `${s.theme}`,
     })
   },
   created() {

src/components/music.vue

@@ -1,42 +1,55 @@
 <template>
-    <div class="musicbox">
-      <!-- 播放 -->
-      <div class="play" v-if="audioPlayShow" @click="audioState">
-        <img  src="https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yttj_icon_music_open.png">
-      </div>
-      <!-- 暂停-->
-      <div class="play" v-else @click="audioState">
-         <img  src="https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yttj_icon_music_close.png" >
-      </div>
-      <audio ref="player" :src="url" autoplay preload loop="loop"></audio>
+    <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>
-// import { createNamespacedHelpers } from 'vuex'
-// const {
-//   mapState: mapactivityState,
-// } = createNamespacedHelpers("vote");
 export default {
   name:'music',
-  props:['url'],
+  props: {
+    url: String,
+    theme: String
+  },
   data() {
     return {
-      yttjmusicopen:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yttj_icon_music_open.png',
-      yjsmusicopen:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yinyueon.png',
-      yttjmusicoff:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yttj_icon_music_close.png',
-      yjsmusicoff:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yinyueoff.png',
-      audioPlayShow: true,
+      playing: 'off',
+
+      icons: {
+        '1': {
+          'on': 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yttj_icon_music_open.png',
+          'off': 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yttj_icon_music_close.png',
+        },
+        '2': {
+          'on': 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yinyueon.png',
+          'off': 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yinyueoff.png',
+        },
+      }
     };
   },
+  watch: {
+    url: function(n) {
+      if (this.playing === 'off' && n) {
+        window.setTimeout(this.play, 1000)
+      }
+    }
+  },
   methods: {
-    // 点击播放暂停按钮时间
-    audioState() {
-      this.audioPlayShow = !this.audioPlayShow; // 更改播放暂停按钮状态
-      const music = this.$refs.player; // 音频所在对象
-      if (this.audioPlayShow) {
-        music.play(); // 播放音乐
+    play() {
+      if (this.url) {
+        this.$refs.player.play()
+        this.playing = 'on'
+      }
+    },
+    stop() {
+      this.$refs.player.pause()
+      this.playing = 'off'
+    },
+    troggle() {
+      if (this.playing === 'on') {
+        this.stop()
       } else {
-        music.pause(); // 暂停音乐
+        this.play()
       }
     }
   }
@@ -44,33 +57,35 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-// @keyframes changDeg{
-// 			0%{
-// 				transform: rotate(0deg);
-// 			}
-// 			100%{
-// 				transform: rotate(360deg);
-// 			}
-// 		}
+  @keyframes rotate{
+    0%{
+      transform: rotate(0deg);
+    }
+    100%{
+      transform: rotate(360deg);
+    }
+  }
+
   .musicbox {
     position: fixed;
     top: 0.09rem;
     right: 0.09rem;
-    width: 0.5rem;
-    height: 0.5rem;
+    width: 0.35rem;
+    height: 0.35rem;
     border-radius: 50%;
     z-index: 10;
 
-    .play {
+    .on {
+      animation: rotate 3s linear infinite;
+    }
+
+    img {
       width: 100%;
       height: 100%;
-
-      img {
-        width: 100%;
-        height: 100%;
-      }
     }
   }
+
+
 </style>
 
 

src/views/vote/detail.vue

@@ -66,11 +66,11 @@ export default {
   mounted() {
     this.actid = this.$route.params.actid;
     if(this.actid==1){
- this.coverImgUrl = true;
- this.desc = true;
+      this.coverImgUrl = true;
+      this.desc = true;
     }else if(this.actid==2){
-this.coverImgUrl = false;
-this.desc = false;
+      this.coverImgUrl = false;
+      this.desc = false;
     }
     this.memberid = this.$route.params.memberid;
     this.getActivity({

src/views/vote/list.vue

@@ -62,7 +62,7 @@
         </van-tabs>
       </div>
     </div>
-    <button :class="signupBtn?'signupBtnOne':'signupBtnTwo'" @click="signup">我要报名</button>
+    <button :class="signupBtn?'signupBtnOne':'signupBtnTwo'" @click="signup">{{ myprofile && myprofile.MemberId ? '我的上传' : '投TA一票' }}</button>
     <toast v-if="show" :url="activity.AfterVote" @close="close" @confirmbtn="tolink"></toast>
   </div>
 </template>
@@ -130,6 +130,7 @@ export default {
       topList: x => x.toplist,
       user: x => x.user,
       theme: x => x.theme,
+      myprofile: x => x.myprofile,
     }),
   },
   created() {
@@ -159,6 +160,7 @@ export default {
     })
     this.getMine({
       actid: this.actid,
+      openid: this.user.openid,
     })
 
     // 列表数据的初始化 放到下拉组件中了
@@ -286,9 +288,15 @@ export default {
       })
     },
     signup() {
-      this.$router.push({
-        path: `/vote/signup/${this.actid}`
-      });
+      if (this.myprofile && this.myprofile.MemberId) {
+        this.$router.push({
+          path: `/detail/${this.actid}/${this.myprofile.MemberId}`
+        });
+      } else {
+        this.$router.push({
+          path: `/vote/signup/${this.actid}`
+        });
+      }
     },
     gotovotingdetails(memberid) {
       this.$router.push({

src/views/vote/signup.vue

@@ -6,7 +6,8 @@
         <span :class="desc?desc1:desc2">上传您认为最美的全家福照片</span>
       </div>
       <van-uploader :after-read="onRead">
-        <img class="uploadimgbox" :src="desc?uploadimg1:uploadimg2">
+        <img v-if="postData.photo" class="uploadimgbox" :src="postData.photo" alt="">
+        <img v-else class="uploadimgbox" :src="theme == 1? uploadimg1 : uploadimg2">
       </van-uploader>
       <div class="WriteWord" v-if="writeword">
         <img :src="img?yttjpen:yjspen">
@@ -103,11 +104,15 @@ export default {
   },
   computed: {
     ...mapVoteState({
-      user: x => x.user
+      user: x => x.user,
+      theme: x => x.theme,
     })
   },
   created() {
     this.actid = this.$route.params.actid;
+     this.getActivity({
+      actid: this.actid,
+    })
     if (this.actid == 1) {
       this.coverImgUrl = true;
       this.img = true;
@@ -128,30 +133,19 @@ export default {
     }
   },
   methods: {
-    ...mapVoteActions(["voteMember"]),
+    ...mapVoteActions(["voteMember", "getActivity"]),
     onRead(file) {
-      console.log(file);
       let that = this;
       this.isLoading = true;
-      let reader = new FileReader();
-      reader.readAsDataURL(file.file);
-      reader.onload = function(e) {
-        let data = e.target.result;
-        //加载图片获取图片真实宽度和高度
-        let image = new Image();
-        image.src = data;
-        image.onload = function() {
-          that.toolClass
-            .upload(file)
-            .then(res => {
-              that.uploadimg = res.result.url;
-              that.postData.photo = res.result.url;
-            })
-            .catch(() => {
-              that.isLoading = false;
-            });
-        };
-      };
+      that.toolClass
+        .upload(file)
+        .then(res => {
+          that.uploadimg = res.result.url;
+          that.postData.photo = res.result.url;
+        })
+        .catch(() => {
+          that.isLoading = false;
+        });
     },
     messageWrite() {
       this.messagenum = this.postData.message.length;