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

src/store/vote.js

@@ -40,6 +40,14 @@ export default {
     },
     resetTopList(state, data) {
       state.toplist = data || []
+    },
+    voteSuccess(state, data) {
+      state.toplist = state.toplist.map(x => {
+        return x.MemberId === data.MemberId ? data : x
+      })
+      state.list = state.list.map(x => {
+        return x.MemberId === data.MemberId ? data : x
+      })
     }
   },
   actions: {
@@ -91,7 +99,7 @@ export default {
         }).catch(reject)
       })
     },
-    vote(m, payload) {
+    vote({ commit }, payload) {
       return new Promise((resolve, reject) => {
         ajax({
           ...api.voteing.vote,
@@ -103,6 +111,8 @@ export default {
             openid: payload.openid,
           }
         }).then((res) => {
+          commit('voteSuccess', res)
+
           resolve(res)
         }).catch(reject)
       })

src/util/ajax.js

@@ -1,6 +1,6 @@
 import axios from 'axios'
 import qs from 'qs'
-import toolClass from './util'
+// import toolClass from './util'
 import router from '@/router'
 import { Toast } from 'vant';
 

src/views/vote/detail.vue

@@ -33,8 +33,8 @@
 import { createNamespacedHelpers } from 'vuex'
 import wxsdk from '../../util/share.js'
 import toast from '../../components/toast.vue'
-import BgImg from "../../assets/bgimg.jpg";
-import BgImage from "../../assets/yttjbg.png";
+// import BgImg from "../../assets/bgimg.jpg";
+// import BgImage from "../../assets/yttjbg.png";
 
 const {mapState: mapVoteState, mapActions: mapVoteActions} = createNamespacedHelpers('vote')
 export default {

src/views/vote/list.vue

@@ -213,21 +213,6 @@ export default {
           memberid: memberid,
           openid: this.user
         }).then(() => {
-          const newlist = this.newList.map(x => {
-            if (x.MemberId == memberid) {
-              x.Vote = x.Vote + 1;
-            }
-            return x;
-          });
-          this.newList = newlist;
-          const toplist = this.topList.map(x => {
-            if (x.MemberId == memberid) {
-              x.Vote = x.Vote + 1;
-            }
-            return x;
-          });
-          this.topList = toplist;
-
           if (this.activity.AfterVote) {
             this.$dialog
               .alert({ title: "投票成功", message: "恭喜您获得一次抽奖机会!" })
@@ -547,14 +532,14 @@ export default {
       font-size: 0.16rem;
       font-weight: bolder;
       color: rgba(255, 255, 255, 1);
-      background: rgba(126,100,86,1);
+      background: rgba(173,145,129,0.62);
       line-height: 0.22rem;
       border-radius: 0.06rem;
       text-align: center;
       padding: 0.09rem 0;
 
       &.active {
-        background: rgba(173,145,129,0.62);
+        background: rgba(126,100,86,1);
       }
     }
 

src/views/vote/signup.vue

@@ -184,7 +184,7 @@ export default {
 <style lang='scss' scoped>
 .context {
   width: 100%;
-  height: 100%;
+  // height: 100%;
   display: flex;
   justify-content: center;
 
@@ -347,6 +347,7 @@ export default {
   .cbtn{
     background: rgba(166, 184, 201, 1);
     box-shadow: 0px 2px 10px 0px rgba(207, 217, 227, 1);
+    // margin-top: 1rem;
   }
   input::-webkit-input-placeholder {
     font-size: 0.16rem;
@@ -379,6 +380,7 @@ export default {
   .cbtn{
     background: rgba(173, 145, 129, 1);
     box-shadow: 0px 2px 10px 0px rgba(120, 108, 101, 0.46);
+    margin-top: 1rem;
   }
   input::-webkit-input-placeholder {
     font-size: 0.16rem;