merge

src/App.vue

@@ -32,6 +32,7 @@ export default {
     ...mapactivityState({
       activity: s => s.activity || {},
       theme: s => `${s.theme}`,
+      code: s => s.code,
     })
   },
   created() {
@@ -39,15 +40,12 @@ export default {
     console.log("process.env.NODE_ENV =>", env)
     if (env === 'production' || env === 'test') {
       if (location.search && this.toolClass.UrlSearch(location.search).code) {
-        this.code = this.toolClass.UrlSearch(location.search).code
-        let oldCode = localStorage.getItem('code')
-        if (this.code === oldCode) {
-          localStorage.setItem('code', this.code)
+        const code = this.toolClass.UrlSearch(location.search).code
+        if (this.code === code) {
           this.toolClass.getCode(this.appid[env])
         } else {
-          localStorage.setItem('code', this.code)
-          // this.showPage = true
-          this.getUser({code: this.code }).then(() => {
+          this.setCode(code)
+          this.getUser({ code }).then(() => {
             this.showPage = true
           })
         }
@@ -59,7 +57,7 @@ export default {
     }
   },
   methods: {
-    ...mapIndexActions(["getUser"])
+    ...mapIndexActions(["getUser","setCode"])
   }
 };
 </script>

src/components/music.vue

@@ -86,7 +86,7 @@ export default {
 
   .musicbox {
     position: fixed;
-    top: 0.09rem;
+    top: 0.6rem;
     right: 0.09rem;
     width: 0.35rem;
     height: 0.35rem;

src/store/vote.js

@@ -11,6 +11,7 @@ export default {
     toplist: [],
     list: [],
     theme: 1,
+    code: '',
   },
   mutations: {
     updateActivity(state, data) {
@@ -56,6 +57,9 @@ export default {
       }
 
       state.detail = mem
+    },
+    setCode(state, code) {
+      state.code = code
     }
   },
   actions: {
@@ -197,5 +201,8 @@ export default {
         }).catch(reject)
       })
     },
+    setCode({ commit }, code) {
+      commit('setCode', code)
+    },
   }
 }

src/views/vote/detail.vue

@@ -122,7 +122,7 @@ export default {
 <style lang="scss" scoped>
 
 .ContextbBox {
-  width: 3.25rem;
+  width: 86%;
   // height: 4.05rem;
   background-color: rgba(255, 255, 255, 1);
   border-radius: 0.02rem;

src/views/vote/index.vue

@@ -74,7 +74,7 @@ export default {
     color: white;
     line-height: 0.28rem;
     position: fixed;
-    bottom: 0.3rem;
+    bottom: 0.2rem;
     left: calc(12.5%);
   }
   .classtwo {
@@ -88,7 +88,7 @@ export default {
     color: white;
     line-height: 0.28rem;
     position: fixed;
-    bottom: 0.3rem;
+    bottom: 0.2rem;
     left: calc(12.5%);
   }
 

src/views/vote/list.vue

@@ -1,6 +1,7 @@
 <template>
-  <div class="context" :style="{backgroundImage: 'url(' + (coverImgUrl ?BgImage:BgImg) + ')'}">
-    <img class="BannerImage" :src="activity.Banner">
+  <div :class="'context theme'+theme">
+    <!-- <img :src="banner">  -->
+    <img :class="signupBtn?BannerImage1:BannerImage2" :src="activity.Banner">
     <div :class="IsOk?onscroll1:onscroll2">
       <div :class="isOK?searchs:searchb">
         <input placeholder="输入编号或姓名" v-model="q" @focus="showBtn = false" @blur="showBtn = true">
@@ -16,15 +17,18 @@
             <span :class="{ [`theme${theme}`]: true, 'active': active }">最新上传</span>
           </div>
           <!-- <pull-to :bottom-load-method="loadNewList"> -->
-            <van-list
-              v-model="loading"
-              :finished="finished"
-              finished-text="没有更多了"
-              @load="loadNewList"
-            >
+          <van-list
+            v-model="loading"
+            :finished="finished"
+            finished-text="没有更多了"
+            @load="loadNewList"
+          >
             <div class="LatestUpload">
               <div class="LatestUploadList" v-for="(item,index) in newList" :key="index">
-                <div :class="signupBtn?ActivePersonnelBox1:ActivePersonnelBox2" @click="gotovotingdetails(item.MemberId)">
+                <div
+                  :class="signupBtn?ActivePersonnelBox1:ActivePersonnelBox2"
+                  @click="gotovotingdetails(item.MemberId)"
+                >
                   <img :src="item.Photo + '?x-oss-process=style/compress-rotate'">
                 </div>
                 <span :class="signupBtn?ballot1:ballot2">NO.{{item.MemberId}}</span>
@@ -36,41 +40,47 @@
                 </div>
               </div>
             </div>
-          <!-- </pull-to> -->
-            </van-list>
+            <!-- </pull-to> -->
+          </van-list>
         </van-tab>
         <van-tab title="TOP50">
           <div slot="title">
             <span :class="{ [`theme${theme}`]: true, 'active': !active }">Top50</span>
           </div>
-            <!-- <pull-to :bottom-load-method="loadTopList"> -->
-            <van-list
-              v-model="loading"
-              :finished="finished"
-              finished-text="没有更多了"
-              @load="loadTopList"
-            >
-              <div class="LatestUpload">
-                <div class="LatestUploadList" v-for="(item,index) in topList" :key="index">
-                  <div :class="signupBtn?ActivePersonnelBox1:ActivePersonnelBox2" @click="gotovotingdetails(item.MemberId)">
-                    <img :src="item.Photo + '?x-oss-process=style/compress-rotate'">
-                  </div>
-                  <span :class="signupBtn?ballot1:ballot2">NO.{{item.MemberId}}</span>
-                  <span class="ActivePersonnelName">{{item.Name}}</span>
-                  <button :class="signupBtn?VoteBtn1:VoteBtn2" @click="Vote(item.MemberId)">投TA一票</button>
-                  <div class="VoteNumber">
-                    <span>已获投票数：</span>
-                    <p>{{item.Vote}}票</p>
-                  </div>
+          <!-- <pull-to :bottom-load-method="loadTopList"> -->
+          <van-list
+            v-model="loading"
+            :finished="finished"
+            finished-text="没有更多了"
+            @load="loadTopList"
+          >
+            <div class="LatestUpload">
+              <div class="LatestUploadList" v-for="(item,index) in topList" :key="index">
+                <div
+                  :class="signupBtn?ActivePersonnelBox1:ActivePersonnelBox2"
+                  @click="gotovotingdetails(item.MemberId)"
+                >
+                  <img :src="item.Photo + '?x-oss-process=style/compress-rotate'">
+                </div>
+                <span :class="signupBtn?ballot1:ballot2">NO.{{item.MemberId}}</span>
+                <span class="ActivePersonnelName">{{item.Name}}</span>
+                <button :class="signupBtn?VoteBtn1:VoteBtn2" @click="Vote(item.MemberId)">投TA一票</button>
+                <div class="VoteNumber">
+                  <span>已获投票数：</span>
+                  <p>{{item.Vote}}票</p>
                 </div>
               </div>
-              </van-list>
-            <!-- </pull-to> -->
+            </div>
+          </van-list>
+          <!-- </pull-to> -->
         </van-tab>
       </van-tabs>
     </div>
     <div class="btn" v-show="showBtn">
-    <button :class="signupBtn?'signupBtnOne':'signupBtnTwo'" @click="signup">{{ myID > 0 ? '我的上传' : '我要报名'}}</button>
+      <button
+        :class="signupBtn?'signupBtnOne':'signupBtnTwo'"
+        @click="signup"
+      >{{ myID > 0 ? '我的上传' : '我要报名'}}</button>
     </div>
     <toast v-if="show" :url="activity.AfterVote" @close="close" @confirmbtn="tolink"></toast>
   </div>
@@ -81,8 +91,9 @@
 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";
+import { Toast } from 'vant';
 
 const {
   mapState: mapactivityState,
@@ -97,6 +108,8 @@ export default {
       active: true,
       temp: true,
       signupBtn: true,
+      BannerImage1: "BannerImage1",
+      BannerImage2: "BannerImage2",
       signupBtnOne: "signupBtnOne",
       signupBtnTwo: "signupBtnTwo",
       VoteBtn1: "VoteBtn1",
@@ -112,8 +125,8 @@ export default {
       onscroll2: "onscroll2",
       ActivePersonnelBox1: "ActivePersonnelBox1",
       ActivePersonnelBox2: "ActivePersonnelBox2",
-      BgImg,
-      BgImage,
+      // BgImg,
+      // BgImage,
       IconSearch:
         "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yttj_icon_search.png",
       tab: "",
@@ -126,11 +139,11 @@ export default {
       show: false,
       pageSize: 10,
       loaddingData: false,
-      showBtn: true,
+      showBtn: true
     };
   },
   components: {
-    toast,
+    toast
     // PullTo
   },
   mounted() {
@@ -150,8 +163,13 @@ export default {
       user: x => x.user,
       theme: x => x.theme,
       myprofile: x => x.myprofile,
-      myID: s => (s.myprofile.filter(x => x.ActivityId === (s.activity || {}).ActivityId)[0] || {}).MemberId
-    }),
+      myID: s =>
+        (
+          s.myprofile.filter(
+            x => x.ActivityId === (s.activity || {}).ActivityId
+          )[0] || {}
+        ).MemberId
+    })
   },
   created() {
     this.pageSize = this.$store.state.pageSize;
@@ -168,9 +186,9 @@ export default {
     this.getActivity({
       actid: this.actid
     }).then(act => {
-      let hash = window.location.hash
-      if (hash.indexOf('/vote') < 0) {
-        hash = `#/vote/${this.actid}`
+      let hash = window.location.hash;
+      if (hash.indexOf("/vote") < 0) {
+        hash = `#/vote/${this.actid}`;
       }
 
       wxsdk(
@@ -187,7 +205,7 @@ export default {
         }
       );
 
-      console.log('------>', this.activity, this.myprofile, this.myID)
+      console.log("------>", this.activity, this.myprofile, this.myID);
     });
     // this.getMine({
     //   actid: this.actid,
@@ -217,15 +235,15 @@ export default {
       "getMine"
     ]),
     handleScroll() {
-      this.showBtn = true
-
+      this.showBtn = true;
 
       // 页面滚动距顶部距离
       var scrollTop =
         window.pageYOffset ||
         document.documentElement.scrollTop ||
         document.body.scrollTop;
-      if (scrollTop >= 269) {
+
+      if (scrollTop >= 240) {
         this.IsOk = false;
       } else {
         this.IsOk = true;
@@ -254,24 +272,24 @@ export default {
         }).then(() => {
           if (this.activity.AfterVote) {
             this.$dialog
-              .alert({ title: "投票成功", message: "恭喜您获得一次抽奖机会!" })
+              .alert({ title: "投票成功！", message: "恭喜您获得一次抽奖机会!" })
               .then(() => {
                 window.location.href = this.activity.AfterVote;
               });
           } else {
-            this.$dialog.alert({ message: "投票成功" });
+            this.$dialog.alert({ message: "投票成功！" });
           }
         });
       // });
     },
     loadNewList(loaded) {
       if (this.loaddingData) {
-        return
+        return;
       }
 
-      this.loaddingData = true
+      this.loaddingData = true;
       this.newlist().then(res => {
-        console.log(res.length, this.pageSize)
+        console.log(res.length, this.pageSize);
 
         if ((res || []).length >= this.pageSize) {
           this.newpage += 1;
@@ -280,13 +298,13 @@ export default {
         }
 
         this.loading = false;
-        this.loaddingData = false
-        loaded && loaded('done')
+        this.loaddingData = false;
+        loaded && loaded("done");
       });
     },
     loadTopList(loaded) {
       if (this.loaddingData) {
-        return
+        return;
       }
 
       this.toplist().then(res => {
@@ -297,8 +315,8 @@ export default {
         }
 
         this.loading = false;
-        this.loaddingData = false
-        loaded && loaded('done')
+        this.loaddingData = false;
+        loaded && loaded("done");
       });
     },
     signup() {
@@ -307,6 +325,28 @@ export default {
           path: `/detail/${this.actid}/${this.myID}`
         });
       } else {
+        var myDate = (new Date()).valueOf();
+        var begintime = (new Date(this.activity.StartTime)).valueOf()
+        var endtime = (new Date(this.activity.EndTime)).valueOf()
+        // console.log(begintime)
+        // console.log(endtime)
+        // console.log(myDate)
+        if(begintime > myDate){
+          Toast.fail({
+            duration: 2000, // 持续展示 toast
+            forbidClick: true, // 禁用背景点击
+            message: "活动未开始！"
+          })
+          return false
+        }
+        if(endtime < myDate){
+          Toast.fail({
+            duration: 2000, // 持续展示 toast
+            forbidClick: true, // 禁用背景点击
+            message: "活动已结束！"
+          })
+          return false
+        }
         this.$router.push({
           path: `/vote/signup/${this.actid}`
         });
@@ -326,9 +366,9 @@ export default {
       window.location.href = this.info.AfterVote;
     },
     search() {
-      this.newpage = 1
-      this.toppage = 1
-      this.showBtn = true
+      this.newpage = 1;
+      this.toppage = 1;
+      this.showBtn = true;
 
       this.newlist();
       this.toplist();
@@ -359,6 +399,12 @@ export default {
 
 
 <style lang="scss" scoped>
+.theme1 {
+  background: rgba(209, 220, 228, 1);
+}
+.theme2 {
+  background: linear-gradient(#9c7e70, #70544b);
+}
 .context {
   width: 100%;
   display: flex;
@@ -366,17 +412,22 @@ export default {
   justify-content: center;
   align-items: center;
 
-  .BannerImage {
+  .BannerImage1 {
     width: 100%;
     max-height: 10rem;
+    margin-bottom: 0.8rem;
+  }
+  .BannerImage2 {
+    width: 92.5%;
+    max-height: 10rem;
+    margin: 0.6rem 0 1.4rem 0;
   }
-
   .onscroll1 {
     width: 90%;
     height: 0.44rem;
     position: absolute;
-    top: 2.8rem;
-    left: calc(5%);
+    top: 2.4rem;
+    left: calc(3.1%);
     z-index: 120;
 
     .searchb {
@@ -460,7 +511,7 @@ export default {
     width: 93%;
     height: 0.44rem;
     position: absolute;
-    top: 2.8rem;
+    top: 2.4rem;
     left: calc(3.1%);
     z-index: 120;
 
@@ -583,18 +634,17 @@ export default {
       font-size: 0.16rem;
       font-weight: bolder;
       color: rgba(255, 255, 255, 1);
-      background: rgba(173,145,129,0.62);
+      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(126,100,86,1);
+        background: rgba(126, 100, 86, 1);
       }
     }
 
-
     .LatestUpload {
       width: 90%;
       display: flex;
@@ -629,12 +679,12 @@ export default {
           }
         }
 
-         .ActivePersonnelBox2 {
+        .ActivePersonnelBox2 {
           width: 90%;
           height: 1.83rem;
           border-radius: 0.15rem;
           margin-bottom: 0.11rem;
-          border: 0.04rem solid rgba(126,100,86,1);
+          border: 0.04rem solid rgba(126, 100, 86, 1);
 
           img {
             width: 100%;
@@ -657,7 +707,7 @@ export default {
         .ballot2 {
           position: absolute;
           top: 0;
-          background: rgba(126,100,86,1);
+          background: rgba(126, 100, 86, 1);
           border-radius: 0 0 0.08rem 0.08rem;
           padding: 0.02rem 0.12rem;
           font-size: 0.14rem;
@@ -690,7 +740,7 @@ export default {
           width: 56%;
           height: 0.23rem;
           border-radius: 0.25rem;
-          background-color: rgba(126,100,86,1);
+          background-color: rgba(126, 100, 86, 1);
           border: none;
           font-size: 0.14rem;
           font-weight: bolder;
@@ -719,61 +769,59 @@ export default {
     }
   }
 
-  .btn{
-        width: 100%;
+  .btn {
+    width: 100%;
     height: 0.6rem;
     display: flex;
     justify-content: center;
     align-items: center;
-    background: rgba(255,255,255,1);
+    background: rgba(255, 255, 255, 1);
     position: fixed;
     bottom: 0;
     left: 0;
     z-index: 100;
 
-  .signupBtnOne {
-    width: 91%;
-    height: 0.5rem;
-    border-radius: 0.25rem;
-    background: rgba(166, 184, 201, 1);
-    border: none;
-    font-size: 0.2rem;
-    font-weight: bold;
-    color: rgba(255, 255, 255, 1);
-    line-height: 0.28rem;
-    // position: fixed;
-    // bottom: 0.19rem;
-    // left: calc(4.25%);
-    // z-index: 100;
-  }
-  .signupBtnTwo {
-    width: 91%;
-    height: 0.5rem;
-    border-radius: 0.25rem;
-    background: rgba(173, 145, 129, 1);
-    border: none;
-    font-size: 0.2rem;
-    font-weight: bold;
-    color: rgba(255, 255, 255, 1);
-    line-height: 0.28rem;
-    // position: fixed;
-    // bottom: 0.19rem;
-    // left: calc(4.25%);
-    // z-index: 100;
-  }
-
+    .signupBtnOne {
+      width: 91%;
+      height: 0.5rem;
+      border-radius: 0.25rem;
+      background: rgba(166, 184, 201, 1);
+      border: none;
+      font-size: 0.2rem;
+      font-weight: bold;
+      color: rgba(255, 255, 255, 1);
+      line-height: 0.28rem;
+      // position: fixed;
+      // bottom: 0.19rem;
+      // left: calc(4.25%);
+      // z-index: 100;
+    }
+    .signupBtnTwo {
+      width: 91%;
+      height: 0.5rem;
+      border-radius: 0.25rem;
+      background: rgba(173, 145, 129, 1);
+      border: none;
+      font-size: 0.2rem;
+      font-weight: bold;
+      color: rgba(255, 255, 255, 1);
+      line-height: 0.28rem;
+      // position: fixed;
+      // bottom: 0.19rem;
+      // left: calc(4.25%);
+      // z-index: 100;
+    }
   }
-
 }
 
 .theme1 {
   // background-image: url('../../assets/bgimg.jpg');
-   background: rgba(209,220,228,1);
-   }
-   .theme2 {
+  background: rgba(209, 220, 228, 1);
+}
+.theme2 {
   // background-image: url('../../assets/bgimg.jpg');
-    background: linear-gradient(#97796c,#705443);
-   }
+  background: linear-gradient(#97796c, #705443);
+}
 </style>
 
 

src/views/vote/signup.vue

@@ -1,5 +1,8 @@
 <template>
   <div :class="'context theme'+theme">
+    <div v-if="isLoading">
+      <img src="">
+    </div>
     <div class="ContextBox">
       <div class="uploadimg">
         <img :src="theme===1?yttjlove:yjslove">
@@ -48,7 +51,7 @@
 
 <script>
 import { createNamespacedHelpers } from "vuex";
-import { Toast } from 'vant';
+import { Toast } from "vant";
 const {
   mapState: mapVoteState,
   mapActions: mapVoteActions
@@ -56,7 +59,8 @@ const {
 export default {
   name: "signup",
   data() {
-    return{
+    return {
+      isLoading:false,
       messagenum: 0,
       postData: {
         photo: "",
@@ -65,7 +69,7 @@ export default {
         addr: "",
         message: ""
       },
-      uploadimg: '',
+      uploadimg: "",
       actid: "",
       yttjlove:
         "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yttj_icon_love.png",
@@ -78,13 +82,13 @@ export default {
       yjspen:
         "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/xiegenjin.png",
       yjsphone:
-        "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/dianhua.png",
+        "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/dianhua.png"
     };
   },
   computed: {
     ...mapVoteState({
       user: x => x.user,
-      theme: x => x.theme,
+      theme: x => x.theme
     })
   },
   created() {
@@ -92,20 +96,22 @@ export default {
     if (this.$route.params.actid != "") {
       this.actid = this.$route.params.actid;
       this.getActivity({
-        actid: this.actid,
+        actid: this.actid
       }).then(() => {
-        if (this.theme === 1){
-          this.uploadimg = 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/uploadimg.png'
+        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'
+          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;
@@ -133,13 +139,13 @@ export default {
       this.messagenum = this.postData.message.length;
     },
     SubmitBtn() {
-      if(this.postData.photo == ""){
+      if (this.postData.photo == "") {
         Toast.fail({
           duration: 2000, // 持续展示 toast
           forbidClick: true, // 禁用背景点击
           message: "请先上传您的全家福！"
-        })
-        return false
+        });
+        return false;
       }
       if(this.theme === 1 && this.postData.message == '') {
         Toast.fail({
@@ -155,17 +161,17 @@ export default {
           duration: 2000, // 持续展示 toast
           forbidClick: true, // 禁用背景点击
           message: "请输入您的联系方式！"
-        })
-        return false
+        });
+        return false;
       }
-      var myreg=/^[1][0-9]{10}$/;
+      var myreg = /^[1][0-9]{10}$/;
       if (!myreg.test(this.postData.phone)) {
         Toast.fail({
           duration: 2000, // 持续展示 toast
           forbidClick: true, // 禁用背景点击
           message: "手机号格式不正确！"
-        })
-        return false
+        });
+        return false;
       }
       if(this.postData.name == ""){
         Toast.fail({
@@ -247,30 +253,34 @@ export default {
       width: 90%;
       height: 1.17rem;
       position: relative;
+      background: rgba(220, 229, 236, 0.63);
+      margin: 0 auto;
+      border-radius: 0.06rem;
 
       .content_txt {
-        width: 95%;
-        height: 100%;
-        padding: 2% 3% 0 3%;
-        margin-left: 5%;
+        width: 93%;
+        height: 0.89rem;
         border: none;
         font-size: 0.16rem;
         font-weight: bold;
-        background: rgba(220, 229, 236, 0.63);
+        background: rgba(220, 229, 236, 0);
         line-height: 0.22rem;
-        border-radius: 0.06rem;
         font-weight: bold;
-        color: rgba(112, 125, 138, 1);
+        color: rgba(112,125,138,0.96);
+        padding-top: 0.08rem;
+        margin-left: calc(4.5%);
+        overflow-y: scroll;
+
+
       }
       .number {
         position: absolute;
-        bottom: 0;
-        right: -0.1rem;
+        bottom: 0.02rem;
+        right: 0.05rem;
 
         #textNum {
-          color: #707d8a;
+          color: rgba(112,125,138,0.96);
           font-size: 0.14rem;
-          font-family: PingFangSC-Medium;
           font-weight: bolder;
           line-height: 0.2rem;
         }
@@ -278,7 +288,6 @@ export default {
         .totalnum {
           color: #b8c2cb;
           font-size: 0.14rem;
-          font-family: PingFangSC-Medium;
           font-weight: bolder;
           line-height: 0.2rem;
         }
@@ -308,6 +317,8 @@ export default {
         height: 100%;
         background-color: rgba(255, 255, 255, 0);
         text-indent: 0.12rem;
+        font-size: 0.16rem;
+        font-weight: bolder;
       }
     }
     .textareabox {
@@ -321,6 +332,8 @@ export default {
         margin-top: 0.08rem;
         background-color: rgba(255, 255, 255, 0);
         margin-left: 0.12rem;
+        font-size: 0.16rem;
+        font-weight: bolder;
       }
     }
     .btn {
@@ -335,7 +348,6 @@ export default {
         border-radius: 0.23rem;
         border: none;
         font-size: 0.2rem;
-        font-family: PingFangSC-Medium;
         font-weight: bolder;
         color: rgba(255, 255, 255, 1);
         line-height: 0.28rem;
@@ -344,68 +356,66 @@ export default {
   }
 }
 
-.theme1{
-    background: rgba(209,220,228,1);
+.theme1 {
+  background: rgba(209, 220, 228, 1);
   // background-image: url("../../assets/yttjbg.png");
-  .desc{
+  .desc {
     font-size: 0.16rem;
     font-weight: bolder;
     color: rgba(112, 125, 138, 1);
     line-height: 0.22rem;
     padding-left: 0.03rem;
   }
-  .cinput{
+  .cinput {
     background-color: rgba(220, 229, 236, 0.63);
+    color: rgba(117, 132, 146, 0.4);
   }
-  .cbtn{
+  .cbtn {
     background: rgba(166, 184, 201, 1);
     box-shadow: 0px 2px 10px 0px rgba(207, 217, 227, 1);
     margin-top: 0.24rem;
   }
   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);
+    color: rgba(112,125,138,1);
     line-height: 0.22rem;
   }
 }
 
-.theme2{
+.theme2 {
   // background-image: url("../../assets/bgimg.jpg");
-      background: linear-gradient(#97796c,#705443);
-  .desc{
+  background: linear-gradient(#97796c, #705443);
+  .desc {
     font-size: 0.16rem;
     font-weight: bolder;
     color: rgba(112, 84, 75, 1);
     line-height: 0.22rem;
     padding-left: 0.03rem;
   }
-  .cinput{
+  .cinput {
     background-color: rgba(232, 224, 220, 1);
+    color: rgba(139, 116, 102, 0.4);
   }
-  .cbtn{
+  .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;
-    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;

vue.config.js

@@ -7,9 +7,13 @@ module.exports = {
     proxy: {
       '/voteapi': {
         // target: 'http://wechatconfigdev.ycjcjy.com',
-        // target: 'http://192.168.0.62:8080', // wf
+<<<<<<< HEAD
+        target: 'http://192.168.0.62:8080', // wf
+=======
+        target: 'http://localhost:8080', // wf
+>>>>>>> 83865c56adef1f6c6aea63317940c0a221574425
         // 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: {