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

src/App.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app" v-if="showPage">
     <router-view/>
-    <music :url="activity.Music" :theme="theme"></music>
+    <music :url="activity.Music"></music>
   </div>
 </template>
 
@@ -23,8 +23,7 @@ export default {
   },
   computed: {
     ...mapactivityState({
-      activity: s => s.activity || {},
-      theme: s => `${s.theme}`,
+      activity: s => s.activity || {}
     })
   },
   created() {
@@ -36,7 +35,7 @@ export default {
     //     this.toolClass.getCode('wx32e2e8c81f66070e')
     //   } else {
     //     localStorage.setItem('code', this.code)
-    //     this.customer(this.code).then(() => {
+    //     this.getUser({code: this.code}).then(() => {
     //       this.showPage = true
     //     })
     //   }
@@ -45,7 +44,7 @@ export default {
     // }
   },
   methods: {
-    ...mapIndexActions(["user"])
+    ...mapIndexActions(["getUser"])
   }
 };
 </script>

src/components/music.vue

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

src/store/vote.js

@@ -18,7 +18,8 @@ export default {
       state.theme = data.ActivityId || 1
     },
     updateUser(state, data) {
-      state.user = data
+      state.user = data.openid
+      state.myprofile = data.member
     },
     updateDetail(state, data) {
       state.detail = data || {}

src/util/ajax.js

@@ -78,7 +78,7 @@ const ajax = (...args) => {
       } else if (code === 401) {
         // console.log(result)
         // reject(code)
-        toolClass.getCode(result.appid)
+        // toolClass.getCode(result.appid)
       } else if (code === 406) {
         // console.log(router.history.current.name)
         if (router.history.current.name !== 'bindMobile') {

src/views/vote/detail.vue

@@ -1,27 +1,27 @@
 <template>
-  <div class="context" :style="{backgroundImage: 'url(' + (coverImgUrl ?BgImage:BgImg) + ')'}">
+  <div :class="'context theme'+theme">
     <div class="ContextbBox">
-      <span :class="desc?personnumber1:personnumber2">NO.{{detail.MemberId}}</span>
+      <span class="personnumber">NO.{{detail.MemberId}}</span>
       <span class="votelist" @click="tolist">投票列表</span>
       <img :src="detail.Photo">
       <div class="detailinformation">
         <div class="nameinformation">
-          <span :class="desc?information1:information2">{{detail.Name}}</span>
-          <span :class="desc?information1:information2">姓名</span>
+          <span class="information">{{detail.Name}}</span>
+          <span class="information">姓名</span>
         </div>
-        <span :class="desc?line1:line2"></span>
+        <span class="line"></span>
         <div class="nameinformation">
-          <span :class="desc?informationnum1:informationnum2">{{detail.Vote}}</span>
-          <span :class="desc?information1:information2">当前票数</span>
+          <span class="informationnum">{{detail.Vote}}</span>
+          <span class="information">当前票数</span>
         </div>
-        <span :class="desc?line1:line2"></span>
+        <span class="line"></span>
         <div class="nameinformation">
-          <span :class="desc?information1:information2">{{detail.Rank}}名</span>
-          <span :class="desc?information1:information2">排名</span>
+          <span class="information">{{detail.Rank}}名</span>
+          <span class="information">排名</span>
         </div>
       </div>
     </div>
-    <button :class="desc?votebtn1:votebtn2" @click="Vote">投TA一票</button>
+    <button class="votebtn" @click="Vote">投TA一票</button>
     <div class="showorhide" v-if="detail.Message != ''">
       <span class="dashedline"></span>
       <span class="writeword">寄语：{{detail.Message}}</span>
@@ -44,20 +44,6 @@ export default {
       actid: '',
       memberid: '',
       show: false,
-      coverImgUrl:true,
-      BgImg,
-      BgImage,
-      desc:true,
-      personnumber1:'personnumber1',
-      personnumber2:'personnumber2',
-      information1:'information1',
-      information2:'information2',
-      informationnum1:'informationnum1',
-      informationnum2:"informationnum2",
-      line1:'line1',
-      line2:'line2',
-      votebtn1:'votebtn1',
-      votebtn2:'votebtn2',
     };
   },
   components: {
@@ -65,13 +51,6 @@ export default {
   },
   mounted() {
     this.actid = this.$route.params.actid;
-    if(this.actid==1){
-      this.coverImgUrl = true;
-      this.desc = true;
-    }else if(this.actid==2){
-      this.coverImgUrl = false;
-      this.desc = false;
-    }
     this.memberid = this.$route.params.memberid;
     this.getActivity({
       actid: this.actid,
@@ -97,6 +76,7 @@ export default {
       info: x => x.activity,
       detail: x => x.detail,
       user: x => x.user,
+      theme: x => x.theme,
     })
   },
   methods: {
@@ -133,127 +113,96 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.context {
-  width: 100%;
-  height: 100%;
-  // background-color: rgba(220,229,236,1);;
+
+.ContextbBox {
+  width: 93.6%;
+  height: 4.05rem;
+  background-color: rgba(255, 255, 255, 1);
+  border-radius: 0.02rem;
+  margin-top: 0.7rem;
   display: flex;
   flex-direction: column;
   align-items: center;
+  position: relative;
+}
 
-  .ContextbBox {
-    width: 93.6%;
-    height: 4.05rem;
-    background-color: rgba(255, 255, 255, 1);
-    border-radius: 0.02rem;
-    margin-top: 0.7rem;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    position: relative;
-
-    .personnumber1 {
-      position: absolute;
-      top: 0;
-      background-color:rgba(255,255,255,1);
-      border-radius: 0 0 0.12rem 0.12rem;
-      padding: 0.01rem 0.25rem;
-      font-size: 0.18rem;
-      font-family: PingFangSC-Medium;
-      font-weight: bolder;
-      color:rgba(70,86,101,1);
-      line-height: 0.25rem;
-    }
-    .personnumber2 {
-      position: absolute;
-      top: 0;
-      background-color:rgba(255,255,255,1);
-      border-radius: 0 0 0.12rem 0.12rem;
-      padding: 0.01rem 0.25rem;
-      font-size: 0.18rem;
-      font-family: PingFangSC-Medium;
-      font-weight: bolder;
-      color:rgba(112,84,75,1);
-      line-height: 0.25rem;
-    }
+.votelist {
+  position: absolute;
+  top: 0.43rem;
+  right: 0;
+  background-color: rgba(84, 84, 84, 0.8);
+  border-radius: 0.23rem 0 0 0.23rem;
+  padding: 0.05rem 0.05rem 0.05rem 0.16rem;
+  font-size: 0.18rem;
+  font-family: PingFangSC-Medium;
+  font-weight: bolder;
+  color: rgba(255, 255, 255, 1);
+  line-height: 0.25rem;
+}
 
-    .votelist {
-      position: absolute;
-      top: 0.43rem;
-      right: 0;
-      background-color: rgba(84, 84, 84, 0.8);
-      border-radius: 0.23rem 0 0 0.23rem;
-      padding: 0.05rem 0.05rem 0.05rem 0.16rem;
-      font-size: 0.18rem;
-      font-family: PingFangSC-Medium;
-      font-weight: bolder;
-      color: rgba(255, 255, 255, 1);
-      line-height: 0.25rem;
-    }
+img {
+  width: 93%;
+  height: 3.16rem;
+  margin: 0.1rem 0;
+}
+.detailinformation {
+  width: 82%;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
 
-    img {
-      width: 93%;
-      height: 3.16rem;
-      margin: 0.1rem 0;
-    }
-    .detailinformation {
-      width: 82%;
-      display: flex;
-      flex-direction: row;
-      justify-content: space-between;
+.nameinformation {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
 
-      .line1 {
-        // width: 0.01rem;
-        border: 0.01rem solid rgba(166,184,201,1);
-        background-color: rgba(166,184,201,1);
-      }
-      .line2 {
-        // width: 0.01rem;
-        border: 0.01rem solid rgba(166,184,201,1);
-        background-color: rgba(166,184,201,1);
-      }
-      .nameinformation {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
+.context {
+  width: 100%;
+  height: 100%;
+  // background-color: rgba(220,229,236,1);;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
 
-        .information1 {
-          font-size: 0.16rem;
-          font-family: JQLaoSongJT;
-          color:rgba(112,125,138,1);
-          line-height: 0.28rem;
-          font-weight: bold;
-          height: 0.28rem;
-        }
-        .information2 {
-          font-size: 0.16rem;
-          font-family: JQLaoSongJT;
-          color:rgba(112,84,75,1);
-          line-height: 0.28rem;
-          font-weight: bold;
-           height: 0.28rem;
-        }
-        .informationnum1 {
-          font-size: 0.24rem;
-          font-family: JQLaoSongJT;
-          color:rgba(112,125,138,1);
-          font-weight: bolder;
-          line-height: 0.28rem;
-           height: 0.28rem;
-        }
-          .informationnum2 {
-          font-size: 0.24rem;
-          font-family: JQLaoSongJT;
-          color:rgba(112,84,75,1);
-          font-weight: bolder;
-          line-height: 0.28rem;
-           height: 0.28rem;
-        }
-      }
-    }
+.theme1 {  
+  background-image: url('../../assets/yttjbg.png');
+  .personnumber {
+    position: absolute;
+    top: 0;
+    background-color:rgba(255,255,255,1);
+    border-radius: 0 0 0.12rem 0.12rem;
+    padding: 0.01rem 0.25rem;
+    font-size: 0.18rem;
+    font-family: PingFangSC-Medium;
+    font-weight: bolder;
+    color:rgba(70,86,101,1);
+    line-height: 0.25rem;
   }
-
-  .votebtn1 {
+  .line {
+    // width: 0.01rem;
+    border: 0.01rem solid rgba(166,184,201,1);
+    background-color: rgba(166,184,201,1);
+  }
+  .information {
+    font-size: 0.16rem;
+    font-family: JQLaoSongJT;
+    color:rgba(112,125,138,1);
+    line-height: 0.28rem;
+    font-weight: bold;
+    height: 0.28rem;
+  }
+  .informationnum {
+    font-size: 0.24rem;
+    font-family: JQLaoSongJT;
+    color:rgba(112,125,138,1);
+    font-weight: bolder;
+    line-height: 0.28rem;
+      height: 0.28rem;
+  }
+  .votebtn {
     width: 59%;
     height: 0.42rem;
     background: rgba(166,184,201,1);
@@ -266,7 +215,70 @@ export default {
     border: none;
     margin-top: 0.18rem;
   }
-  .votebtn2{
+}
+ 
+.showorhide {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  margin-top: 0.18rem;
+
+  .dashedline {
+    width: 100%;
+    border-bottom: 1px dashed rgba(166,184,201,1);
+    text-decoration: none;
+  }
+  .writeword {
+    width: 90%;
+    padding-top: 0.18rem;
+    word-wrap: break-word;
+    word-break: normal;
+    font-size: 0.14rem;
+    font-family: PingFangSC-Regular;
+    font-weight: bold;
+    color: rgba(77,87,97,1);
+    line-height: 0.2rem;
+  }
+}
+
+.theme2 {
+  background-image: url('../../assets/bgimg.jpg');
+  .personnumber {
+    position: absolute;
+    top: 0;
+    background-color:rgba(255,255,255,1);
+    border-radius: 0 0 0.12rem 0.12rem;
+    padding: 0.01rem 0.25rem;
+    font-size: 0.18rem;
+    font-family: PingFangSC-Medium;
+    font-weight: bolder;
+    color:rgba(112,84,75,1);
+    line-height: 0.25rem;
+  }
+  .line {
+    // width: 0.01rem;
+    border: 0.01rem solid rgba(166,184,201,1);
+    background-color: rgba(166,184,201,1);
+  }
+  .information {
+    font-size: 0.16rem;
+    font-family: JQLaoSongJT;
+    color:rgba(112,84,75,1);
+    line-height: 0.28rem;
+    font-weight: bold;
+    height: 0.28rem;
+  }
+  .informationnum {
+    font-size: 0.24rem;
+    font-family: JQLaoSongJT;
+    color:rgba(112,84,75,1);
+    font-weight: bolder;
+    line-height: 0.28rem;
+      height: 0.28rem;
+  }
+  .votebtn{
     width: 59%;
     height: 0.42rem;
     background: rgba(173,145,129,1);
@@ -279,31 +291,6 @@ export default {
     border: none;
     margin-top: 0.18rem;
   }
-  .showorhide {
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    margin-top: 0.18rem;
-
-    .dashedline {
-      width: 100%;
-      border-bottom: 1px dashed rgba(166,184,201,1);
-      text-decoration: none;
-    }
-    .writeword {
-      width: 90%;
-      padding-top: 0.18rem;
-      word-wrap: break-word;
-      word-break: normal;
-      font-size: 0.14rem;
-      font-family: PingFangSC-Regular;
-      font-weight: bold;
-      color: rgba(77,87,97,1);
-      line-height: 0.2rem;
-    }
-  }
 }
 </style>
 

src/views/vote/list.vue

@@ -55,7 +55,7 @@
         </van-tab>
       </van-tabs>
     </div>
-    <button :class="signupBtn?'signupBtnOne':'signupBtnTwo'" @click="signup">{{ myprofile && myprofile.MemberId ? '我的上传' : '投TA一票' }}</button>
+    <button :class="signupBtn?'signupBtnOne':'signupBtnTwo'" @click="signup">我要报名</button>
     <toast v-if="show" :url="activity.AfterVote" @close="close" @confirmbtn="tolink"></toast>
   </div>
 </template>
@@ -123,9 +123,8 @@ export default {
       newList: x => x.list,
       topList: x => x.toplist,
       user: x => x.user,
-      theme: x => x.theme,
-      myprofile: x => x.myprofile,
-    }),
+      theme: x => x.theme
+    })
   },
   created() {
     this.pageSize = this.$store.state.pageSize;
@@ -159,9 +158,8 @@ export default {
       );
     });
     this.getMine({
-      actid: this.actid,
-      openid: this.user.openid,
-    })
+      actid: this.actid
+    });
 
     this.newlist().then((res) => {
       if ((res || []).length === this.pageSize) {
@@ -269,15 +267,9 @@ export default {
       });
     },
     signup() {
-      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}`
-        });
-      }
+      this.$router.push({
+        path: `/vote/signup/${this.actid}`
+      });
     },
     gotovotingdetails(memberid) {
       this.$router.push({

src/views/vote/signup.vue

@@ -1,19 +1,18 @@
 <template>
-  <div class="context" :style="{backgroundImage: 'url(' + (coverImgUrl ?BgImage:BgImg) + ')'}">
+  <div :class="'context theme'+theme">
     <div class="ContextBox">
       <div class="uploadimg">
-        <img :src="img?yttjlove:yjslove">
-        <span :class="desc?desc1:desc2">上传您认为最美的全家福照片</span>
+        <img :src="theme===1?yttjlove:yjslove">
+        <span class="desc">上传您认为最美的全家福照片</span>
       </div>
       <van-uploader :after-read="onRead">
-        <img v-if="postData.photo" class="uploadimgbox" :src="postData.photo" alt="">
-        <img v-else class="uploadimgbox" :src="theme == 1? uploadimg1 : uploadimg2">
+        <img class="uploadimgbox" :src="uploadimg">
       </van-uploader>
-      <div class="WriteWord" v-if="writeword">
-        <img :src="img?yttjpen:yjspen">
-        <span :class="desc?desc1:desc2">寄语</span>
+      <div class="WriteWord" v-if="theme===1">
+        <img :src="theme===1?yttjpen:yjspen">
+        <span class="desc">寄语</span>
       </div>
-      <div class="input_content" v-if="writeword">
+      <div class="input_content" v-if="theme===1">
         <textarea
           id="textArea"
           @input="messageWrite"
@@ -27,21 +26,21 @@
         </span>
       </div>
       <div class="ContactInformation">
-        <img :src="img?yttjphone:yjsphone">
-        <span :class="desc?desc1:desc2">联系方式</span>
+        <img :src="theme===1?yttjphone:yjsphone">
+        <span class="desc">联系方式</span>
       </div>
-      <div :class="desc?inputbox1:inputbox2">
+      <div class="inputbox cinput">
         <input placeholder="输入手机号" v-model="postData.phone">
       </div>
 
-      <div :class="desc?inputbox1:inputbox2">
+      <div class="inputbox cinput">
         <input placeholder="输入姓名" v-model="postData.name">
       </div>
-      <div :class="desc?textareabox1:textareabox2" v-if="address">
+      <div class="textareabox cinput" v-if="theme===2">
         <textarea class="addressarea" placeholder="所在社区"></textarea>
       </div>
       <div class="btn">
-        <button :class="desc?SubmitBtn1:SubmitBtn2" @click="SubmitBtn">提交</button>
+        <button class="SubmitBtn cbtn" @click="SubmitBtn">提交</button>
       </div>
     </div>
   </div>
@@ -49,8 +48,6 @@
 
 <script>
 import { createNamespacedHelpers } from "vuex";
-import BgImg from "../../assets/bgimg.jpg";
-import BgImage from "../../assets/yttjbg.png";
 const {
   mapState: mapVoteState,
   mapActions: mapVoteActions
@@ -58,27 +55,17 @@ const {
 export default {
   name: "signup",
   data() {
-    return {
-      writeword: false,
-      address: false,
-      desc: true,
-      desc1: "desc1",
-      desc2: "desc2",
-      inputbox1: "inputbox1",
-      inputbox2: "inputbox2",
-      textareabox1: "textareabox1",
-      textareabox2: "textareabox2",
-      SubmitBtn1: "SubmitBtn1",
-      SubmitBtn2: "SubmitBtn2",
-      coverImgUrl: true,
-      BgImg,
-      BgImage,
-      img: true,
-      isLoading: false,
-      uploadimg1:
-        "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/uploadimg.png",
-      uploadimg2:
-        "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yjsuploadimg.png",
+    return{
+      messagenum: 0,
+      postData: {
+        photo: "",
+        phone: "",
+        name: "",
+        addr: "",
+        message: ""
+      },
+      uploadimg: '',
+      actid: "",
       yttjlove:
         "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yttj_icon_love.png",
       yttjpen:
@@ -91,15 +78,6 @@ export default {
         "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/xiegenjin.png",
       yjsphone:
         "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/dianhua.png",
-      messagenum: 0,
-      postData: {
-        photo: "",
-        phone: "",
-        name: "",
-        addr: "",
-        message: ""
-      },
-      actid: ""
     };
   },
   computed: {
@@ -110,42 +88,45 @@ export default {
   },
   created() {
     this.actid = this.$route.params.actid;
-     this.getActivity({
-      actid: this.actid,
-    })
-    if (this.actid == 1) {
-      this.coverImgUrl = true;
-      this.img = true;
-      this.address = false;
-      this.writeword = true;
-      this.desc = true;
-    } else if (this.actid == 2) {
-      this.coverImgUrl = false;
-      this.img = false;
-      this.address = true;
-      this.writeword = false;
-      this.desc = false;
-    }
     if (this.$route.params.actid != "") {
       this.actid = this.$route.params.actid;
+      this.getActivity({
+        actid: this.actid,
+      }).then(() => {
+        if (this.theme === 1){
+          this.uploadimg = 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/uploadimg.png'
+        } else {
+          this.uploadimg = 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yjsuploadimg.png'
+        }
+      })
     } else {
       alert("不存在对应的活动信息！");
     }
   },
   methods: {
-    ...mapVoteActions(["voteMember", "getActivity"]),
+    ...mapVoteActions(["voteMember","getActivity"]),
     onRead(file) {
       let that = this;
       this.isLoading = true;
-      that.toolClass
-        .upload(file)
-        .then(res => {
-          that.uploadimg = res.result.url;
-          that.postData.photo = res.result.url;
-        })
-        .catch(() => {
-          that.isLoading = false;
-        });
+      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;
+            });
+        };
+      };
     },
     messageWrite() {
       this.messagenum = this.postData.message.length;
@@ -168,10 +149,7 @@ export default {
 <style lang='scss' scoped>
 .context {
   width: 100%;
-  // height: 100%;
-  // background-color: rgba(209, 220, 228, 1);
-  // background:no-repeat center;
-  // background-size:100% 100%;
+  height: 100%;
   display: flex;
   justify-content: center;
 
@@ -193,21 +171,6 @@ export default {
         width: 0.22rem;
         height: 0.2rem;
       }
-
-      .desc1 {
-        font-size: 0.16rem;
-        font-weight: bolder;
-        color: rgba(112, 125, 138, 1);
-        line-height: 0.22rem;
-        padding-left: 0.03rem;
-      }
-      .desc2 {
-        font-size: 0.16rem;
-        font-weight: bolder;
-        color: rgba(112, 84, 75, 1);
-        line-height: 0.22rem;
-        padding-left: 0.03rem;
-      }
     }
 
     .uploadimgbox {
@@ -225,20 +188,6 @@ export default {
         width: 0.22rem;
         height: 0.2rem;
       }
-      .desc1 {
-        font-size: 0.16rem;
-        font-weight: bolder;
-        color: rgba(112, 125, 138, 1);
-        line-height: 0.22rem;
-        padding-left: 0.03rem;
-      }
-      .desc2 {
-        font-size: 0.16rem;
-        font-weight: bolder;
-        color: rgba(112, 84, 75, 1);
-        line-height: 0.22rem;
-        padding-left: 0.03rem;
-      }
     }
 
     .input_content {
@@ -292,51 +241,12 @@ export default {
         width: 0.22rem;
         height: 0.2rem;
       }
-      .desc1 {
-        font-size: 0.16rem;
-        font-family: PingFangSC-Medium;
-        font-weight: bolder;
-        color: rgba(112, 125, 138, 1);
-        line-height: 0.22rem;
-        padding-left: 0.03rem;
-      }
-      .desc2 {
-        font-size: 0.16rem;
-        font-family: PingFangSC-Medium;
-        font-weight: bolder;
-        color: rgba(112, 84, 75, 1);
-        line-height: 0.22rem;
-        padding-left: 0.03rem;
-      }
     }
 
-    .inputbox1 {
+    .inputbox {
       width: 92%;
       height: 0.4rem;
-      background-color: rgba(220, 229, 236, 0.63);
-      margin-left: calc(4%);
-      margin-bottom: 0.08rem;
-      border-radius: 0.06rem;
-      input {
-        width: 100%;
-        height: 100%;
-        background-color: rgba(255, 255, 255, 0);
-        text-indent: 0.12rem;
-      }
 
-      input::-webkit-input-placeholder {
-        font-size: 0.16rem;
-        font-family: PingFangSC-Medium;
-        font-weight: bolder;
-        color: rgba(117, 132, 146, 0.4);
-        line-height: 0.22rem;
-      }
-    }
-
-    .inputbox2 {
-      width: 92%;
-      height: 0.4rem;
-      background-color: rgba(232, 224, 220, 1);
       margin-left: calc(4%);
       margin-bottom: 0.08rem;
       border-radius: 0.06rem;
@@ -346,19 +256,10 @@ export default {
         background-color: rgba(255, 255, 255, 0);
         text-indent: 0.12rem;
       }
-
-      input::-webkit-input-placeholder {
-        font-size: 0.16rem;
-        font-family: PingFangSC-Medium;
-        font-weight: bolder;
-        color: rgba(139, 116, 102, 0.4);
-        line-height: 0.22rem;
-      }
     }
-    .textareabox1 {
+    .textareabox {
       width: 92%;
       height: 0.8rem;
-      background-color: rgba(220, 229, 236, 0.63);
       border-radius: 0.06rem;
       margin-left: calc(4%);
       .addressarea {
@@ -368,37 +269,7 @@ export default {
         background-color: rgba(255, 255, 255, 0);
         margin-left: 0.12rem;
       }
-      textarea::-webkit-input-placeholder {
-        font-size: 0.16rem;
-        font-family: PingFangSC-Medium;
-        font-weight: bolder;
-        color: rgba(112, 125, 138, 0.4);
-        line-height: 0.22rem;
-      }
     }
-
-    .textareabox2 {
-      width: 92%;
-      height: 0.8rem;
-      background-color: rgba(232, 224, 220, 1);
-      border-radius: 0.06rem;
-      margin-left: calc(4%);
-      .addressarea {
-        width: 100%;
-        height: 100%;
-        margin-top: 0.08rem;
-        background-color: rgba(255, 255, 255, 0);
-        margin-left: 0.12rem;
-      }
-      textarea::-webkit-input-placeholder {
-        font-size: 0.16rem;
-        font-family: PingFangSC-Medium;
-        font-weight: bolder;
-        color: rgba(139, 116, 102, 0.4);
-        line-height: 0.22rem;
-      }
-    }
-
     .btn {
       width: 100%;
       display: flex;
@@ -410,12 +281,10 @@ export default {
       // left: 0;
       // bottom: 0.32rem;
 
-      .SubmitBtn1 {
+      .SubmitBtn {
         width: 44%;
         height: 0.5rem;
         border-radius: 0.23rem;
-        background: rgba(166, 184, 201, 1);
-        box-shadow: 0px 2px 10px 0px rgba(207, 217, 227, 1);
         border: none;
         font-size: 0.2rem;
         font-family: PingFangSC-Medium;
@@ -424,23 +293,73 @@ export default {
         line-height: 0.28rem;
         // padding-top: 0.32rem;
       }
-      .SubmitBtn2 {
-        width: 44%;
-        height: 0.5rem;
-        border-radius: 0.23rem;
-        background: rgba(173, 145, 129, 1);
-        box-shadow: 0px 2px 10px 0px rgba(120, 108, 101, 0.46);
-        border: none;
-        font-size: 0.2rem;
-        font-family: PingFangSC-Medium;
-        font-weight: bolder;
-        color: rgba(255, 255, 255, 1);
-        line-height: 0.28rem;
-        margin-top: 1rem;
-      }
     }
   }
 }
+
+.theme1{
+  background-image: url("../../assets/yttjbg.png");
+  .desc{
+    font-size: 0.16rem;
+    font-weight: bolder;
+    color: rgba(112, 125, 138, 1);
+    line-height: 0.22rem;
+    padding-left: 0.03rem;
+  }
+  .cinput{
+    background-color: rgba(220, 229, 236, 0.63);
+  }
+  .cbtn{
+    background: rgba(166, 184, 201, 1);
+    box-shadow: 0px 2px 10px 0px rgba(207, 217, 227, 1);
+  }
+  input::-webkit-input-placeholder {
+    font-size: 0.16rem;
+    font-family: PingFangSC-Medium;
+    font-weight: bolder;
+    color: rgba(117, 132, 146, 0.4);
+    line-height: 0.22rem;
+  }
+  textarea::-webkit-input-placeholder {
+    font-size: 0.16rem;
+    font-family: PingFangSC-Medium;
+    font-weight: bolder;
+    color: rgba(112, 125, 138, 0.4);
+    line-height: 0.22rem;
+  }
+}
+
+.theme2{
+  background-image: url("../../assets/bgimg.jpg");
+  .desc{
+    font-size: 0.16rem;
+    font-weight: bolder;
+    color: rgba(112, 84, 75, 1);
+    line-height: 0.22rem;
+    padding-left: 0.03rem;
+  }
+  .cinput{
+    background-color: rgba(232, 224, 220, 1);
+  }
+  .cbtn{
+    background: rgba(173, 145, 129, 1);
+    box-shadow: 0px 2px 10px 0px rgba(120, 108, 101, 0.46);
+  }
+  input::-webkit-input-placeholder {
+    font-size: 0.16rem;
+    font-family: PingFangSC-Medium;
+    font-weight: bolder;
+    color: rgba(139, 116, 102, 0.4);
+    line-height: 0.22rem;
+  }
+  textarea::-webkit-input-placeholder {
+    font-size: 0.16rem;
+    font-family: PingFangSC-Medium;
+    font-weight: bolder;
+    color: rgba(139, 116, 102, 0.4);
+    line-height: 0.22rem;
+  }
+}
 </style>
 
 

vue.config.js

@@ -7,9 +7,9 @@ module.exports = {
     proxy: {
       '/api': {
         // target: 'http://wechatconfigdev.ycjcjy.com',
-        // target: 'http://192.168.0.62: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: {