beizhu

package-lock.json

         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
       "integrity": "sha1-vsECT4WxvZbL6kBbI8FK1kQ6b4E=",
       "dev": true
     },
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
+    },
     "lodash.mapvalues": {
       "version": "4.6.0",
       "resolved": "http://registry.npm.taobao.org/lodash.mapvalues/download/lodash.mapvalues-4.6.0.tgz",

package.json

   },
   "dependencies": {
     "axios": "^0.18.0",
+    "lodash.get": "^4.4.2",
     "vant": "^1.4.8",
     "vue": "^2.5.17",
     "vue-headful": "^2.0.1",

src/components/toast.vue

           width: 46%;
           height: 0.34rem;
           border-radius: 0.04rem;
-          border: 1px solid rgba(252, 98, 67, 1);
+          border: 1px solid rgba(112,125,138,1);
           background-color: rgba(255, 255, 255, 0);
           font-size: 0.14rem;
           font-family: PingFangSC-Medium;
-          font-weight: 500;
-          color: rgba(252, 98, 67, 1);
+          font-weight: bold;
+         color:rgba(112,125,138,1);
           line-height: 0.2rem;
           margin-right: 0.15rem;
         }

src/config/apis.js

 import get from 'lodash.get'
 
 const apiList = {
-  app: {
-    url: '',
+//投票信息
+ homepage: {
+   //获取活动详情信息
+  getactivity: {
+    url: '/api/voting/:actid',
     method: 'get',
   },
+  getactivitylist:{
+    url: '/api/voting',
+    method: 'get',
+  }
+},
 }
 
 // user.update

src/pages/index.vue

 <template>
   <div class="indexpage">
-    <!-- <vue-headful title="户型图"  /> -->
-    <img class="bgimg" :src="BgIndex">、
+    <img class="bgimg" :src="activitydetail.Thumb">
+    <!-- <img v-if="type === 2" class="bgimg" :src="AudioPlay"> -->
     <button class="EnterActivity" @click="gotoactivity">进入活动</button>
   </div>
 </template>
 
 <script>
+import { createNamespacedHelpers } from "vuex";
+const {
+  mapState: mapvoteState,
+  mapActions: mapvoteActions
+} = createNamespacedHelpers("homepage");
 import BgIndex from "../images/BgImages.jpg";
 import AudioPlay from '../images/audio_play.png';
 export default {
     return {
       BgIndex,
       AudioPlay,
+      type: this.$route.query.type
     };
   },
   //     components: {
   //     "vue-headful": () => import("vue-headful"),
   //   },
+  computed: {
+    ...mapvoteState({
+      activitydetail: s => s.activitydetail
+    })
+  },
+  created(){
+    this.getActivity({actid: this.type})
+  },
   methods: {
+     ...mapvoteActions(["getActivity"]),
       gotoactivity() {
       this.$router.push({
         name: "lotterylist",
+        query: { actid: this.type}
       });
     },
   }
   }
   .EnterActivity {
     position: absolute;
-    top: 4.53rem;
+    top: 5.86rem;
     left: 0.45rem;
     width: 75%;
     height: 0.5rem;
     border-radius: 0.25rem;
-    background-color: rgba(252, 93, 95, 1);
+    background-color: rgba(166,184,201,1);
     border: none;
     font-size: 0.2rem;
     font-family: PingFangSC-Medium;

src/pages/vote/lotterylist.vue

       <div class="VoteList">
         <van-tabs type="card">
           <van-tab title="最新上传">
-              <van-list
-  v-model="loading"
-  :finished="finished"
-  finished-text="没有更多了"
-  @load="onLoad"
->
-            <div class="LatestUpload">
-              <div class="LatestUploadList">
-                <div class="ActivePersonnelBox">
-                  <img :src="AudioPlay">
-                </div>
-                <span class="ballot">NO.20000</span>
-                <span class="ActivePersonnelName">王璐璐</span>
-                <button class="VoteBtn" @click="gotovotingdetails">投TA一票</button>
-                <div class="VoteNumber">
-                  <span>已获投票数：</span>
-                  <p>1314票</p>
+            <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+              <div class="LatestUpload">
+                <div class="LatestUploadList">
+                  <div class="ActivePersonnelBox">
+                    <img :src="AudioPlay">
+                  </div>
+                  <span class="ballot">NO.20000</span>
+                  <span class="ActivePersonnelName">王璐璐</span>
+                  <button class="VoteBtn" @click="gotovotingdetails">投TA一票</button>
+                  <div class="VoteNumber">
+                    <span>已获投票数：</span>
+                    <p>1314票</p>
+                  </div>
                 </div>
               </div>
-            </div>
-           </van-list>
+            </van-list>
           </van-tab>
           <van-tab title="TOP50">
             <div class="LatestUpload">
       </div>
     </div>
     <button class="signupBtn" @click="signup">我要报名</button>
-        <!-- <toast-box v-if="showtoast" @close='showtoast=false'></toast-box>
-        <common-toast v-if="showcommontiast" @close='showcommontiast=false'></common-toast> -->
-
+    <!-- <toast-box v-if="showtoast" @close='showtoast=false'></toast-box>
+    <common-toast v-if="showcommontiast" @close='showcommontiast=false'></common-toast>-->
   </div>
 </template>
 
 import IconSearch from "../../common/icon/sousuo.png";
 // import ToastBox from '../../components/toast.vue'
 // import CommonToast from '../../components/commontoast.vue'
-
+import { createNamespacedHelpers } from "vuex";
+const {
+  mapState: mapactivityState,
+  mapActions: mapactivityActions
+} = createNamespacedHelpers("activitylist");
 export default {
   name: "lotterylist",
   data() {
       ActivityInformation,
       AudioPlay,
       IconSearch,
+      tab:'',
+      page:1,
+      q:'',
       // showtoast:false,
       // showcommontiast:false,
-    //   list:[],
+      //   list:[],
       loading: false,
       finished: false
     };
   },
-   components: {
+  components: {
     // "vue-headful": () => import("vue-headful"),
     // 'ToastBox':ToastBox,
     // 'CommonToast':CommonToast,
   },
+  computed: {
+    ...mapactivityState({
+      detail: s => s.detail
+    })
+  },
+  created() {
+    this.getActivityList().then(() => {
+      
+    })
+  },
   methods: {
-        onLoad() {
+    ...mapactivityActions(["getActivityList"]),
+    onLoad() {
       // 异步更新数据
       setTimeout(() => {
         for (let i = 0; i < 10; i++) {
       });
     },
     gotovotingdetails() {
-        // this.showtoast =true;
+      // this.showtoast =true;
       this.$router.push({
         name: "votingdetails"
       });
-    },
-
+    }
   }
 };
 </script>
 
 <style>
-.van-tabs--card{
-    width: 100%;
+.van-tabs--card {
+  width: 100%;
 }
-.van-tabs__nav--card{
-    height: 100%;
-    border: none;
-    margin: 0;
+.van-tabs__nav--card {
+  height: 100%;
+  border: none;
+  margin: 0;
 }
-.van-tabs__wrap{
-    width: 100%;
-    z-index: 1;
+.van-tabs__wrap {
+  width: 100%;
+  z-index: 1;
 }
-.van-tabs__nav--card .van-tab.van-tab--active{
-background-color:rgba(240,115,126,1);
-border-radius:0.06rem;
+.van-tabs__nav--card .van-tab.van-tab--active {
+  background-color: rgba(166, 184, 201, 1);
+  border-radius: 0.06rem;
 }
-.van-tabs--card .van-tabs__wrap{
-height: 0.4rem;
+.van-tabs--card .van-tabs__wrap {
+  height: 0.4rem;
 }
-.van-tabs__nav--card .van-tab{
-    border-right: none;
-    background-color:rgba(182,182,182,1);
-border-radius:0.06rem;
-width: 100%;
-margin: 0 0.075rem;
-display: flex;
-justify-content: center;
-align-items: center;
-
+.van-tabs__nav--card .van-tab {
+  border-right: none;
+  background-color: rgba(217, 226, 233, 1);
+  border-radius: 0.06rem;
+  width: 100%;
+  margin: 0 0.075rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
-.van-ellipsis{
-font-size:0.16rem;
-font-family:PingFangSC-Medium;
-font-weight:bold;
-color:rgba(255,255,255,1);
-line-height:0.22rem;
-text-align: center;
+.van-ellipsis {
+  font-size: 0.16rem;
+  font-family: PingFangSC-Medium;
+  font-weight: bold;
+  color: rgba(255, 255, 255, 1);
+  line-height: 0.22rem;
+  text-align: center;
 }
 </style>
 
 <style lang="scss" scoped>
 .context {
   width: 100%;
-  background-color: rgba(240, 115, 126, 1);
+  background-color: rgba(209, 220, 228, 1);
   display: flex;
   flex-direction: column;
   justify-content: center;
   .search {
     width: 93%;
     height: 0.44rem;
-    background-color: rgba(242, 132, 141, 1);
+    background-color: rgba(201, 214, 224, 1);
     border-radius: 6px;
     border: 0.01rem solid rgba(255, 255, 255, 1);
     display: flex;
     margin-bottom: 0.19rem;
 
     input {
-      padding: 0.11rem 1.2rem 0.11rem 0.13rem;
+      // padding: 0.11rem 1.2rem 0.11rem 0.13rem;
       background-color: rgba(255, 255, 255, 0);
       color: rgba(255, 255, 255, 1);
       font-size: 0.16rem;
       font-family: PingFangSC-Regular;
       font-weight: 400;
       line-height: 0.22rem;
+      width: 5rem;
+      text-indent: 0.1rem;
     }
     input::-webkit-input-placeholder {
       color: rgba(255, 255, 255, 1);
   .box {
     width: 89%;
     height: 0.12rem;
-    background-color: rgba(244, 152, 159, 1);
+    background-color: rgba(255, 255, 255, 0.29);
     border-radius: 0.06rem 0.06rem 0 0;
   }
   .VoteListBox {
           width: 48%;
           height: 3.1rem;
           background: rgba(255, 255, 255, 1);
-          box-shadow: 0px 4px 8px 0px rgba(255, 239, 239, 1);
+          box-shadow: 0px 4px 8px 0px rgba(166, 184, 201, 0.18);
           border-radius: 0.08rem;
           margin-bottom: 0.25rem;
           display: flex;
             height: 1.83rem;
             border-radius: 0.15rem;
             margin-bottom: 0.11rem;
-            border: 0.05rem solid rgba(249, 93, 105, 1);
+            border: 0.04rem solid rgba(166, 184, 201, 1);
 
             img {
               width: 100%;
           .ballot {
             position: absolute;
             top: 0;
-            background: rgba(249, 93, 105, 1);
+            background: rgba(166, 184, 201, 1);
             border-radius: 0 0 0.08rem 0.08rem;
             padding: 0.02rem 0.12rem;
             font-size: 0.14rem;
             width: 56%;
             height: 0.23rem;
             border-radius: 0.25rem;
-            background-color: rgba(252, 93, 95, 1);
+            background-color: rgba(166, 184, 201, 1);
             border: none;
             font-size: 0.14rem;
             font-family: PingFangSC-Medium;
     width: 91%;
     height: 0.5rem;
     border-radius: 0.25rem;
-    background: linear-gradient(
-      360deg,
-      rgba(248, 150, 62, 1) 0%,
-      rgba(255, 250, 155, 1) 100%
-    );
+    background: rgba(166, 184, 201, 1);
     border: none;
     font-size: 0.2rem;
     font-family: PingFangSC-Medium;

src/pages/vote/myvote.vue

 .context {
   width: 100%;
   height: 100%;
-  background-color: rgba(240, 115, 126, 1);
+  background-color: rgba(220,229,236,1);;
   display: flex;
   flex-direction: column;
   align-items: center;
     .personnumber {
       position: absolute;
       top: 0;
-      background-color: rgba(240, 115, 126, 1);
+      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: 500;
-      color: rgba(255, 255, 255, 1);
+      color:rgba(70,86,101,1);
       line-height: 0.25rem;
     }
 
 
       .line {
         width: 0.01rem;
-        border: 1px solid rgba(251, 87, 87, 1);
-        background-color: rgba(251, 87, 87, 1);
+        border: 1px solid rgba(166,184,201,1);
+        background-color: rgba(166,184,201,1);
       }
       .nameinformation {
         display: flex;
         .information {
           font-size: 0.16rem;
           font-family: JQLaoSongJT;
-          color: rgba(251, 87, 87, 1);
+          color:rgba(112,125,138,1);
           line-height: 0.28rem;
           font-weight: 400;
         }
         .informationnum {
           font-size: 0.24rem;
           font-family: JQLaoSongJT;
-          color: rgba(251, 87, 87, 1);
+          color:rgba(112,125,138,1);
           line-height: 0.28rem;
         }
       }
     }
   }
-
   .showorhide {
     width: 100%;
     display: flex;
 
     .dashedline {
       width: 100%;
-      border-bottom: 1px dashed rgba(255, 255, 255, 1);
+      border-bottom: 1px dashed rgba(166,184,201,1);
       text-decoration: none;
     }
     .writeword {
-      width: 92%;
+      width: 90%;
       padding-top: 0.18rem;
       word-wrap: break-word;
       word-break: normal;
       font-size: 0.14rem;
       font-family: PingFangSC-Regular;
       font-weight: 400;
-      color: rgba(255, 255, 255, 1);
+      color: rgba(77,87,97,1);
       line-height: 0.2rem;
     }
   }

src/pages/vote/signup.vue

       <div class="input_content">
         <textarea id="textArea" class="content_txt" maxlength="200"></textarea>
         <span class="number">
-          <span id="textNum" style="color:#FB6B2F">0</span>
-          <span>/200</span>
+          <span id="textNum">0</span>
+          <span class="totalnum" >/200</span>
         </span>
       </div>
       <div class="ContactInformation">
 .context {
   width: 100%;
   height: 100%;
-  background-color: rgba(240, 115, 126, 1);
+  background-color: rgba(209,220,228,1);
   display: flex;
   justify-content: center;
 
         font-size: 0.16rem;
         font-family: PingFangSC-Medium;
         font-weight: bold;
-        color: rgba(240, 115, 126, 1);
+        color:rgba(112,125,138,1);
         line-height: 0.22rem;
         padding-left: 0.03rem;
       }
         font-size: 0.16rem;
         font-family: PingFangSC-Medium;
         font-weight: bold;
-        color: rgba(240, 115, 126, 1);
+        color:rgba(112,125,138,1);
         line-height: 0.22rem;
         padding-left: 0.03rem;
       }
         padding: 2% 3% 0 3%;
         margin-left: 5%;
         border: none;
-        font-size: 0.12rem;
+        font-size: 0.16rem;
         font-weight: 400;
-        color: rgba(170, 170, 170, 1);
-        line-height: 0.17rem;
+        background:rgba(220,229,236,0.63);
+        line-height: 0.22rem;
         border-radius: 0.06rem;
-        background-color: rgba(255, 241, 241, 1);
+        font-weight:bold;
+color:rgba(112,125,138,1);
       }
       .number {
         position: absolute;
         bottom: 0;
         right: -0.1rem;
+
+        #textNum{
+color:#707D8A;
+font-size:0.14rem;
+font-family:PingFangSC-Medium;
+font-weight:bold;
+line-height:0.2rem;
+        }
+
+        .totalnum{
+color:#B8C2CB;
+font-size:0.14rem;
+font-family:PingFangSC-Medium;
+font-weight:bold;
+line-height:0.2rem;
+        }
       }
     }
 
           font-size: 0.16rem;
         font-family: PingFangSC-Medium;
         font-weight: bold;
-        color: rgba(240, 115, 126, 1);
+        color:rgba(112,125,138,1);
         line-height: 0.22rem;
         padding-left: 0.03rem;
       }
     input{
         width: 84%;
         height: 0.4rem;
-        background-color:rgba(255,241,241,1);;
+        background-color:rgba(220,229,236,0.63);
 border-radius:0.06rem;
 padding: 0.02rem 0.1rem;
     margin: 0 0 2% 5%;
      font-size:0.16rem;
 font-family:PingFangSC-Medium;
 font-weight:bold;
-color:rgba(252,93,95,1);
+color:rgba(117,132,146,1);
 line-height:0.22rem;
     }
 
      font-size:0.16rem;
 font-family:PingFangSC-Medium;
 font-weight:bold;
-color:rgba(252,93,95,1);
+color:rgba(112,125,138,1);
 line-height:0.22rem;
     }
 .btn{
         width: 44%;
     height: 0.5rem;
     border-radius: 0.23rem;
-    background-color: rgba(252, 93, 95, 1);
+   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;

src/pages/vote/votingdetails.vue

 .context {
   width: 100%;
   height: 100%;
-  background-color: rgba(240, 115, 126, 1);
+  background-color: rgba(220,229,236,1);;
   display: flex;
   flex-direction: column;
   align-items: center;
     .personnumber {
       position: absolute;
       top: 0;
-      background-color: rgba(240, 115, 126, 1);
+      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: 500;
-      color: rgba(255, 255, 255, 1);
+      color:rgba(70,86,101,1);
       line-height: 0.25rem;
     }
 
 
       .line {
         width: 0.01rem;
-        border: 1px solid rgba(251, 87, 87, 1);
-        background-color: rgba(251, 87, 87, 1);
+        border: 1px solid rgba(166,184,201,1);
+        background-color: rgba(166,184,201,1);
       }
       .nameinformation {
         display: flex;
         .information {
           font-size: 0.16rem;
           font-family: JQLaoSongJT;
-          color: rgba(251, 87, 87, 1);
+          color:rgba(112,125,138,1);
           line-height: 0.28rem;
           font-weight: 400;
         }
         .informationnum {
           font-size: 0.24rem;
           font-family: JQLaoSongJT;
-          color: rgba(251, 87, 87, 1);
+          color:rgba(112,125,138,1);
           line-height: 0.28rem;
         }
       }
   .votebtn {
     width: 59%;
     height: 0.42rem;
-    background: linear-gradient(
-      360deg,
-      rgba(248, 150, 62, 1) 0%,
-      rgba(255, 250, 155, 1) 100%
-    );
+    background: rgba(166,184,201,1);
     border-radius: 0.23rem;
     font-size: 0.2rem;
     font-family: PingFangSC-Medium;
 
     .dashedline {
       width: 100%;
-      border-bottom: 1px dashed rgba(255, 255, 255, 1);
+      border-bottom: 1px dashed rgba(166,184,201,1);
       text-decoration: none;
     }
     .writeword {
       font-size: 0.14rem;
       font-family: PingFangSC-Regular;
       font-weight: 400;
-      color: rgba(255, 255, 255, 1);
+      color: rgba(77,87,97,1);
       line-height: 0.2rem;
     }
   }

src/store/activitylist.js

+import request from '../utils/request'
+import getAPI from '../config/apis'
+export default {
+    namespaced: true,
+      state: {
+        detail: {},
+      },
+      mutations: {
+        updateActivityList(state, detail) {
+          state.detail = detail;
+        },
+      },
+      actions: {
+          
+        getActivityList({ commit }, params) {
+          return new Promise((resolve, reject) => {
+            request({ ...getAPI('homepage.getactivitylist'),params}).then((data) => {
+              commit('updateActivityList', data)
+              resolve()            
+            }).catch(reject)
+          });
+        },
+        // getActivityList (context, payload) { // 获取附近课程
+        //     return new Promise((resolve, reject) => {
+        //       Ajax(api.homepage.getactivity.url, {
+        //         method: api.homepage.getactivity.method,
+        //         queryData: { ...payload }
+        //       }).then(res => {
+        //         context.commit('updateActivityList', res)
+        //         resolve(res)
+        //       }).catch((err) => {
+        //         reject(err)
+        //       })
+        //     })
+        //   },
+      }
+
+      
+    }

src/store/homepage.js

+import request from '../utils/request'
+import getAPI from '../config/apis'
+export default {
+    namespaced: true,
+      state: {
+        activitydetail: {},
+      },
+      mutations: {
+        updateActivity(state, activitydetail) {
+          state.activitydetail = activitydetail;
+        },
+      },
+      actions: {
+        getActivity({ commit }, params) {
+          return new Promise((resolve, reject) => {
+            request({...getAPI('homepage.getactivity', params)}).then((data) => {
+              commit('updateActivity', data)
+              resolve()            
+            }).catch(reject)
+          });
+        },
+      }
+    }

src/store/index.js

 
 const store = new Vuex.Store({
   modules: {
-    // app: require('./app.js').default,
+    homepage: require('./homepage.js').default,
+    activitylist: require('./activitylist.js').default,
   }
 });
 

src/utils/request.js

     }).then((response) => {
       const data = response.data;
       if (data.code === 200) {
-        resolve(data);
+        resolve(data.result);
       } else {
         reject('请求数据失败');
       }

vue.config.js

     devServer: {
       proxy: {
         '/api': {
-          target: 'http://192.168.0.166:8087', // wf
+          target: 'http://192.168.0.62:8080', // wf
           // target: 'http://127.0.0.1:8082/hj_wechat', // wf
           changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
           // pathRewrite: {