5 Commits

Author SHA1 Message Date
  陈冉 e6c306e1be Merge branch 'master' of http://git.ycjcjy.com/support-game/wechat 6 years ago
  陈冉 643906dae2 beizhu 6 years ago
  陈冉 5e488f6f92 beizhu 6 years ago
  陈冉 7fe14e7e1d beizhu 6 years ago
  陈冉 3b18cbf555 beizhu 6 years ago
6 changed files with 201 additions and 162 deletions
  1. 1
    1
      src/components/music.vue
  2. 1
    1
      src/views/vote/detail.vue
  3. 2
    2
      src/views/vote/index.vue
  4. 136
    111
      src/views/vote/list.vue
  5. 57
    47
      src/views/vote/signup.vue
  6. 4
    0
      vue.config.js

+ 1
- 1
src/components/music.vue View File

@@ -86,7 +86,7 @@ export default {
86 86
 
87 87
   .musicbox {
88 88
     position: fixed;
89
-    top: 0.09rem;
89
+    top: 0.6rem;
90 90
     right: 0.09rem;
91 91
     width: 0.35rem;
92 92
     height: 0.35rem;

+ 1
- 1
src/views/vote/detail.vue View File

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

+ 2
- 2
src/views/vote/index.vue View File

@@ -74,7 +74,7 @@ export default {
74 74
     color: white;
75 75
     line-height: 0.28rem;
76 76
     position: fixed;
77
-    bottom: 0.3rem;
77
+    bottom: 0.2rem;
78 78
     left: calc(12.5%);
79 79
   }
80 80
   .classtwo {
@@ -88,7 +88,7 @@ export default {
88 88
     color: white;
89 89
     line-height: 0.28rem;
90 90
     position: fixed;
91
-    bottom: 0.3rem;
91
+    bottom: 0.2rem;
92 92
     left: calc(12.5%);
93 93
   }
94 94
 

+ 136
- 111
src/views/vote/list.vue View File

@@ -1,6 +1,7 @@
1 1
 <template>
2
-  <div class="context" :style="{backgroundImage: 'url(' + (coverImgUrl ?BgImage:BgImg) + ')'}">
3
-    <img class="BannerImage" :src="activity.Banner">
2
+  <div :class="'context theme'+theme">
3
+    <!-- <img :src="banner">  -->
4
+    <img :class="signupBtn?BannerImage1:BannerImage2" :src="activity.Banner">
4 5
     <div :class="IsOk?onscroll1:onscroll2">
5 6
       <div :class="isOK?searchs:searchb">
6 7
         <input placeholder="输入编号或姓名" v-model="q" @focus="showBtn = false" @blur="showBtn = true">
@@ -16,15 +17,18 @@
16 17
             <span :class="{ [`theme${theme}`]: true, 'active': active }">最新上传</span>
17 18
           </div>
18 19
           <!-- <pull-to :bottom-load-method="loadNewList"> -->
19
-            <van-list
20
-              v-model="loading"
21
-              :finished="finished"
22
-              finished-text="没有更多了"
23
-              @load="loadNewList"
24
-            >
20
+          <van-list
21
+            v-model="loading"
22
+            :finished="finished"
23
+            finished-text="没有更多了"
24
+            @load="loadNewList"
25
+          >
25 26
             <div class="LatestUpload">
26 27
               <div class="LatestUploadList" v-for="(item,index) in newList" :key="index">
27
-                <div :class="signupBtn?ActivePersonnelBox1:ActivePersonnelBox2" @click="gotovotingdetails(item.MemberId)">
28
+                <div
29
+                  :class="signupBtn?ActivePersonnelBox1:ActivePersonnelBox2"
30
+                  @click="gotovotingdetails(item.MemberId)"
31
+                >
28 32
                   <img :src="item.Photo + '?x-oss-process=style/compress-rotate'">
29 33
                 </div>
30 34
                 <span :class="signupBtn?ballot1:ballot2">NO.{{item.MemberId}}</span>
@@ -36,41 +40,47 @@
36 40
                 </div>
37 41
               </div>
38 42
             </div>
39
-          <!-- </pull-to> -->
40
-            </van-list>
43
+            <!-- </pull-to> -->
44
+          </van-list>
41 45
         </van-tab>
42 46
         <van-tab title="TOP50">
43 47
           <div slot="title">
44 48
             <span :class="{ [`theme${theme}`]: true, 'active': !active }">Top50</span>
45 49
           </div>
46
-            <!-- <pull-to :bottom-load-method="loadTopList"> -->
47
-            <van-list
48
-              v-model="loading"
49
-              :finished="finished"
50
-              finished-text="没有更多了"
51
-              @load="loadTopList"
52
-            >
53
-              <div class="LatestUpload">
54
-                <div class="LatestUploadList" v-for="(item,index) in topList" :key="index">
55
-                  <div :class="signupBtn?ActivePersonnelBox1:ActivePersonnelBox2" @click="gotovotingdetails(item.MemberId)">
56
-                    <img :src="item.Photo + '?x-oss-process=style/compress-rotate'">
57
-                  </div>
58
-                  <span :class="signupBtn?ballot1:ballot2">NO.{{item.MemberId}}</span>
59
-                  <span class="ActivePersonnelName">{{item.Name}}</span>
60
-                  <button :class="signupBtn?VoteBtn1:VoteBtn2" @click="Vote(item.MemberId)">投TA一票</button>
61
-                  <div class="VoteNumber">
62
-                    <span>已获投票数:</span>
63
-                    <p>{{item.Vote}}票</p>
64
-                  </div>
50
+          <!-- <pull-to :bottom-load-method="loadTopList"> -->
51
+          <van-list
52
+            v-model="loading"
53
+            :finished="finished"
54
+            finished-text="没有更多了"
55
+            @load="loadTopList"
56
+          >
57
+            <div class="LatestUpload">
58
+              <div class="LatestUploadList" v-for="(item,index) in topList" :key="index">
59
+                <div
60
+                  :class="signupBtn?ActivePersonnelBox1:ActivePersonnelBox2"
61
+                  @click="gotovotingdetails(item.MemberId)"
62
+                >
63
+                  <img :src="item.Photo + '?x-oss-process=style/compress-rotate'">
64
+                </div>
65
+                <span :class="signupBtn?ballot1:ballot2">NO.{{item.MemberId}}</span>
66
+                <span class="ActivePersonnelName">{{item.Name}}</span>
67
+                <button :class="signupBtn?VoteBtn1:VoteBtn2" @click="Vote(item.MemberId)">投TA一票</button>
68
+                <div class="VoteNumber">
69
+                  <span>已获投票数:</span>
70
+                  <p>{{item.Vote}}票</p>
65 71
                 </div>
66 72
               </div>
67
-              </van-list>
68
-            <!-- </pull-to> -->
73
+            </div>
74
+          </van-list>
75
+          <!-- </pull-to> -->
69 76
         </van-tab>
70 77
       </van-tabs>
71 78
     </div>
72 79
     <div class="btn" v-show="showBtn">
73
-    <button :class="signupBtn?'signupBtnOne':'signupBtnTwo'" @click="signup">{{ myID > 0 ? '我的上传' : '我要报名'}}</button>
80
+      <button
81
+        :class="signupBtn?'signupBtnOne':'signupBtnTwo'"
82
+        @click="signup"
83
+      >{{ myID > 0 ? '我的上传' : '我要报名'}}</button>
74 84
     </div>
75 85
     <toast v-if="show" :url="activity.AfterVote" @close="close" @confirmbtn="tolink"></toast>
76 86
   </div>
@@ -81,8 +91,8 @@
81 91
 import { createNamespacedHelpers } from "vuex";
82 92
 import wxsdk from "../../util/share.js";
83 93
 import toast from "../../components/toast.vue";
84
-import BgImg from "../../assets/bgimg.jpg";
85
-import BgImage from "../../assets/yttjbg.png";
94
+// import BgImg from "../../assets/bgimg.jpg";
95
+// import BgImage from "../../assets/yttjbg.png";
86 96
 import { Toast } from 'vant';
87 97
 
88 98
 const {
@@ -97,6 +107,8 @@ export default {
97 107
       active: true,
98 108
       temp: true,
99 109
       signupBtn: true,
110
+      BannerImage1: "BannerImage1",
111
+      BannerImage2: "BannerImage2",
100 112
       signupBtnOne: "signupBtnOne",
101 113
       signupBtnTwo: "signupBtnTwo",
102 114
       VoteBtn1: "VoteBtn1",
@@ -112,8 +124,8 @@ export default {
112 124
       onscroll2: "onscroll2",
113 125
       ActivePersonnelBox1: "ActivePersonnelBox1",
114 126
       ActivePersonnelBox2: "ActivePersonnelBox2",
115
-      BgImg,
116
-      BgImage,
127
+      // BgImg,
128
+      // BgImage,
117 129
       IconSearch:
118 130
         "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yttj_icon_search.png",
119 131
       tab: "",
@@ -126,11 +138,11 @@ export default {
126 138
       show: false,
127 139
       pageSize: 10,
128 140
       loaddingData: false,
129
-      showBtn: true,
141
+      showBtn: true
130 142
     };
131 143
   },
132 144
   components: {
133
-    toast,
145
+    toast
134 146
     // PullTo
135 147
   },
136 148
   mounted() {
@@ -150,8 +162,13 @@ export default {
150 162
       user: x => x.user,
151 163
       theme: x => x.theme,
152 164
       myprofile: x => x.myprofile,
153
-      myID: s => (s.myprofile.filter(x => x.ActivityId === (s.activity || {}).ActivityId)[0] || {}).MemberId
154
-    }),
165
+      myID: s =>
166
+        (
167
+          s.myprofile.filter(
168
+            x => x.ActivityId === (s.activity || {}).ActivityId
169
+          )[0] || {}
170
+        ).MemberId
171
+    })
155 172
   },
156 173
   created() {
157 174
     this.pageSize = this.$store.state.pageSize;
@@ -168,9 +185,9 @@ export default {
168 185
     this.getActivity({
169 186
       actid: this.actid
170 187
     }).then(act => {
171
-      let hash = window.location.hash
172
-      if (hash.indexOf('/vote') < 0) {
173
-        hash = `#/vote/${this.actid}`
188
+      let hash = window.location.hash;
189
+      if (hash.indexOf("/vote") < 0) {
190
+        hash = `#/vote/${this.actid}`;
174 191
       }
175 192
 
176 193
       wxsdk(
@@ -187,7 +204,7 @@ export default {
187 204
         }
188 205
       );
189 206
 
190
-      console.log('------>', this.activity, this.myprofile, this.myID)
207
+      console.log("------>", this.activity, this.myprofile, this.myID);
191 208
     });
192 209
     // this.getMine({
193 210
     //   actid: this.actid,
@@ -214,15 +231,15 @@ export default {
214 231
       "getMine"
215 232
     ]),
216 233
     handleScroll() {
217
-      this.showBtn = true
218
-
234
+      this.showBtn = true;
219 235
 
220 236
       // 页面滚动距顶部距离
221 237
       var scrollTop =
222 238
         window.pageYOffset ||
223 239
         document.documentElement.scrollTop ||
224 240
         document.body.scrollTop;
225
-      if (scrollTop >= 269) {
241
+
242
+      if (scrollTop >= 240) {
226 243
         this.IsOk = false;
227 244
       } else {
228 245
         this.IsOk = true;
@@ -263,12 +280,12 @@ export default {
263 280
     },
264 281
     loadNewList(loaded) {
265 282
       if (this.loaddingData) {
266
-        return
283
+        return;
267 284
       }
268 285
 
269
-      this.loaddingData = true
286
+      this.loaddingData = true;
270 287
       this.newlist().then(res => {
271
-        console.log(res.length, this.pageSize)
288
+        console.log(res.length, this.pageSize);
272 289
 
273 290
         if ((res || []).length >= this.pageSize) {
274 291
           this.newpage += 1;
@@ -277,13 +294,13 @@ export default {
277 294
         }
278 295
 
279 296
         this.loading = false;
280
-        this.loaddingData = false
281
-        loaded && loaded('done')
297
+        this.loaddingData = false;
298
+        loaded && loaded("done");
282 299
       });
283 300
     },
284 301
     loadTopList(loaded) {
285 302
       if (this.loaddingData) {
286
-        return
303
+        return;
287 304
       }
288 305
 
289 306
       this.toplist().then(res => {
@@ -294,8 +311,8 @@ export default {
294 311
         }
295 312
 
296 313
         this.loading = false;
297
-        this.loaddingData = false
298
-        loaded && loaded('done')
314
+        this.loaddingData = false;
315
+        loaded && loaded("done");
299 316
       });
300 317
     },
301 318
     signup() {
@@ -343,9 +360,9 @@ export default {
343 360
       window.location.href = this.info.AfterVote;
344 361
     },
345 362
     search() {
346
-      this.newpage = 1
347
-      this.toppage = 1
348
-      this.showBtn = true
363
+      this.newpage = 1;
364
+      this.toppage = 1;
365
+      this.showBtn = true;
349 366
 
350 367
       this.newlist();
351 368
       this.toplist();
@@ -376,6 +393,12 @@ export default {
376 393
 
377 394
 
378 395
 <style lang="scss" scoped>
396
+.theme1 {
397
+  background: rgba(209, 220, 228, 1);
398
+}
399
+.theme2 {
400
+  background: linear-gradient(#9c7e70, #70544b);
401
+}
379 402
 .context {
380 403
   width: 100%;
381 404
   display: flex;
@@ -383,17 +406,22 @@ export default {
383 406
   justify-content: center;
384 407
   align-items: center;
385 408
 
386
-  .BannerImage {
409
+  .BannerImage1 {
387 410
     width: 100%;
388 411
     max-height: 10rem;
412
+    margin-bottom: 0.8rem;
413
+  }
414
+  .BannerImage2 {
415
+    width: 92.5%;
416
+    max-height: 10rem;
417
+    margin: 0.6rem 0 1.4rem 0;
389 418
   }
390
-
391 419
   .onscroll1 {
392 420
     width: 90%;
393 421
     height: 0.44rem;
394 422
     position: absolute;
395
-    top: 2.8rem;
396
-    left: calc(5%);
423
+    top: 2.4rem;
424
+    left: calc(3.1%);
397 425
     z-index: 120;
398 426
 
399 427
     .searchb {
@@ -477,7 +505,7 @@ export default {
477 505
     width: 93%;
478 506
     height: 0.44rem;
479 507
     position: absolute;
480
-    top: 2.8rem;
508
+    top: 2.4rem;
481 509
     left: calc(3.1%);
482 510
     z-index: 120;
483 511
 
@@ -600,18 +628,17 @@ export default {
600 628
       font-size: 0.16rem;
601 629
       font-weight: bolder;
602 630
       color: rgba(255, 255, 255, 1);
603
-      background: rgba(173,145,129,0.62);
631
+      background: rgba(173, 145, 129, 0.62);
604 632
       line-height: 0.22rem;
605 633
       border-radius: 0.06rem;
606 634
       text-align: center;
607 635
       padding: 0.09rem 0;
608 636
 
609 637
       &.active {
610
-        background: rgba(126,100,86,1);
638
+        background: rgba(126, 100, 86, 1);
611 639
       }
612 640
     }
613 641
 
614
-
615 642
     .LatestUpload {
616 643
       width: 90%;
617 644
       display: flex;
@@ -646,12 +673,12 @@ export default {
646 673
           }
647 674
         }
648 675
 
649
-         .ActivePersonnelBox2 {
676
+        .ActivePersonnelBox2 {
650 677
           width: 90%;
651 678
           height: 1.83rem;
652 679
           border-radius: 0.15rem;
653 680
           margin-bottom: 0.11rem;
654
-          border: 0.04rem solid rgba(126,100,86,1);
681
+          border: 0.04rem solid rgba(126, 100, 86, 1);
655 682
 
656 683
           img {
657 684
             width: 100%;
@@ -674,7 +701,7 @@ export default {
674 701
         .ballot2 {
675 702
           position: absolute;
676 703
           top: 0;
677
-          background: rgba(126,100,86,1);
704
+          background: rgba(126, 100, 86, 1);
678 705
           border-radius: 0 0 0.08rem 0.08rem;
679 706
           padding: 0.02rem 0.12rem;
680 707
           font-size: 0.14rem;
@@ -707,7 +734,7 @@ export default {
707 734
           width: 56%;
708 735
           height: 0.23rem;
709 736
           border-radius: 0.25rem;
710
-          background-color: rgba(126,100,86,1);
737
+          background-color: rgba(126, 100, 86, 1);
711 738
           border: none;
712 739
           font-size: 0.14rem;
713 740
           font-weight: bolder;
@@ -736,61 +763,59 @@ export default {
736 763
     }
737 764
   }
738 765
 
739
-  .btn{
740
-        width: 100%;
766
+  .btn {
767
+    width: 100%;
741 768
     height: 0.6rem;
742 769
     display: flex;
743 770
     justify-content: center;
744 771
     align-items: center;
745
-    background: rgba(255,255,255,1);
772
+    background: rgba(255, 255, 255, 1);
746 773
     position: fixed;
747 774
     bottom: 0;
748 775
     left: 0;
749 776
     z-index: 100;
750 777
 
751
-  .signupBtnOne {
752
-    width: 91%;
753
-    height: 0.5rem;
754
-    border-radius: 0.25rem;
755
-    background: rgba(166, 184, 201, 1);
756
-    border: none;
757
-    font-size: 0.2rem;
758
-    font-weight: bold;
759
-    color: rgba(255, 255, 255, 1);
760
-    line-height: 0.28rem;
761
-    // position: fixed;
762
-    // bottom: 0.19rem;
763
-    // left: calc(4.25%);
764
-    // z-index: 100;
765
-  }
766
-  .signupBtnTwo {
767
-    width: 91%;
768
-    height: 0.5rem;
769
-    border-radius: 0.25rem;
770
-    background: rgba(173, 145, 129, 1);
771
-    border: none;
772
-    font-size: 0.2rem;
773
-    font-weight: bold;
774
-    color: rgba(255, 255, 255, 1);
775
-    line-height: 0.28rem;
776
-    // position: fixed;
777
-    // bottom: 0.19rem;
778
-    // left: calc(4.25%);
779
-    // z-index: 100;
780
-  }
781
-
778
+    .signupBtnOne {
779
+      width: 91%;
780
+      height: 0.5rem;
781
+      border-radius: 0.25rem;
782
+      background: rgba(166, 184, 201, 1);
783
+      border: none;
784
+      font-size: 0.2rem;
785
+      font-weight: bold;
786
+      color: rgba(255, 255, 255, 1);
787
+      line-height: 0.28rem;
788
+      // position: fixed;
789
+      // bottom: 0.19rem;
790
+      // left: calc(4.25%);
791
+      // z-index: 100;
792
+    }
793
+    .signupBtnTwo {
794
+      width: 91%;
795
+      height: 0.5rem;
796
+      border-radius: 0.25rem;
797
+      background: rgba(173, 145, 129, 1);
798
+      border: none;
799
+      font-size: 0.2rem;
800
+      font-weight: bold;
801
+      color: rgba(255, 255, 255, 1);
802
+      line-height: 0.28rem;
803
+      // position: fixed;
804
+      // bottom: 0.19rem;
805
+      // left: calc(4.25%);
806
+      // z-index: 100;
807
+    }
782 808
   }
783
-
784 809
 }
785 810
 
786 811
 .theme1 {
787 812
   // background-image: url('../../assets/bgimg.jpg');
788
-   background: rgba(209,220,228,1);
789
-   }
790
-   .theme2 {
813
+  background: rgba(209, 220, 228, 1);
814
+}
815
+.theme2 {
791 816
   // background-image: url('../../assets/bgimg.jpg');
792
-    background: linear-gradient(#97796c,#705443);
793
-   }
817
+  background: linear-gradient(#97796c, #705443);
818
+}
794 819
 </style>
795 820
 
796 821
 

+ 57
- 47
src/views/vote/signup.vue View File

@@ -1,5 +1,8 @@
1 1
 <template>
2 2
   <div :class="'context theme'+theme">
3
+    <div v-if="isLoading">
4
+      <img src="">
5
+    </div>
3 6
     <div class="ContextBox">
4 7
       <div class="uploadimg">
5 8
         <img :src="theme===1?yttjlove:yjslove">
@@ -48,7 +51,7 @@
48 51
 
49 52
 <script>
50 53
 import { createNamespacedHelpers } from "vuex";
51
-import { Toast } from 'vant';
54
+import { Toast } from "vant";
52 55
 const {
53 56
   mapState: mapVoteState,
54 57
   mapActions: mapVoteActions
@@ -56,7 +59,8 @@ const {
56 59
 export default {
57 60
   name: "signup",
58 61
   data() {
59
-    return{
62
+    return {
63
+      isLoading:false,
60 64
       messagenum: 0,
61 65
       postData: {
62 66
         photo: "",
@@ -65,7 +69,7 @@ export default {
65 69
         addr: "",
66 70
         message: ""
67 71
       },
68
-      uploadimg: '',
72
+      uploadimg: "",
69 73
       actid: "",
70 74
       yttjlove:
71 75
         "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yttj_icon_love.png",
@@ -78,13 +82,13 @@ export default {
78 82
       yjspen:
79 83
         "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/xiegenjin.png",
80 84
       yjsphone:
81
-        "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/dianhua.png",
85
+        "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/dianhua.png"
82 86
     };
83 87
   },
84 88
   computed: {
85 89
     ...mapVoteState({
86 90
       user: x => x.user,
87
-      theme: x => x.theme,
91
+      theme: x => x.theme
88 92
     })
89 93
   },
90 94
   created() {
@@ -92,20 +96,22 @@ export default {
92 96
     if (this.$route.params.actid != "") {
93 97
       this.actid = this.$route.params.actid;
94 98
       this.getActivity({
95
-        actid: this.actid,
99
+        actid: this.actid
96 100
       }).then(() => {
97
-        if (this.theme === 1){
98
-          this.uploadimg = 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/uploadimg.png'
101
+        if (this.theme === 1) {
102
+          this.uploadimg =
103
+            "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/uploadimg.png";
99 104
         } else {
100
-          this.uploadimg = 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yjsuploadimg.png'
105
+          this.uploadimg =
106
+            "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yjsuploadimg.png";
101 107
         }
102
-      })
108
+      });
103 109
     } else {
104 110
       alert("不存在对应的活动信息!");
105 111
     }
106 112
   },
107 113
   methods: {
108
-    ...mapVoteActions(["voteMember","getActivity"]),
114
+    ...mapVoteActions(["voteMember", "getActivity"]),
109 115
     onRead(file) {
110 116
       let that = this;
111 117
       this.isLoading = true;
@@ -133,13 +139,13 @@ export default {
133 139
       this.messagenum = this.postData.message.length;
134 140
     },
135 141
     SubmitBtn() {
136
-      if(this.postData.photo == ""){
142
+      if (this.postData.photo == "") {
137 143
         Toast.fail({
138 144
           duration: 2000, // 持续展示 toast
139 145
           forbidClick: true, // 禁用背景点击
140 146
           message: "请先上传您的全家福!"
141
-        })
142
-        return false
147
+        });
148
+        return false;
143 149
       }
144 150
       if(this.theme === 1 && this.postData.message == '') {
145 151
         Toast.fail({
@@ -155,17 +161,17 @@ export default {
155 161
           duration: 2000, // 持续展示 toast
156 162
           forbidClick: true, // 禁用背景点击
157 163
           message: "请输入您的联系方式!"
158
-        })
159
-        return false
164
+        });
165
+        return false;
160 166
       }
161
-      var myreg=/^[1][0-9]{10}$/;
167
+      var myreg = /^[1][0-9]{10}$/;
162 168
       if (!myreg.test(this.postData.phone)) {
163 169
         Toast.fail({
164 170
           duration: 2000, // 持续展示 toast
165 171
           forbidClick: true, // 禁用背景点击
166 172
           message: "手机号格式不正确!"
167
-        })
168
-        return false
173
+        });
174
+        return false;
169 175
       }
170 176
       if(this.postData.name == ""){
171 177
         Toast.fail({
@@ -247,30 +253,34 @@ export default {
247 253
       width: 90%;
248 254
       height: 1.17rem;
249 255
       position: relative;
256
+      background: rgba(220, 229, 236, 0.63);
257
+      margin: 0 auto;
258
+      border-radius: 0.06rem;
250 259
 
251 260
       .content_txt {
252
-        width: 95%;
253
-        height: 100%;
254
-        padding: 2% 3% 0 3%;
255
-        margin-left: 5%;
261
+        width: 93%;
262
+        height: 0.89rem;
256 263
         border: none;
257 264
         font-size: 0.16rem;
258 265
         font-weight: bold;
259
-        background: rgba(220, 229, 236, 0.63);
266
+        background: rgba(220, 229, 236, 0);
260 267
         line-height: 0.22rem;
261
-        border-radius: 0.06rem;
262 268
         font-weight: bold;
263
-        color: rgba(112, 125, 138, 1);
269
+        color: rgba(112,125,138,0.96);
270
+        padding-top: 0.08rem;
271
+        margin-left: calc(4.5%);
272
+        overflow-y: scroll;
273
+
274
+
264 275
       }
265 276
       .number {
266 277
         position: absolute;
267
-        bottom: 0;
268
-        right: -0.1rem;
278
+        bottom: 0.02rem;
279
+        right: 0.05rem;
269 280
 
270 281
         #textNum {
271
-          color: #707d8a;
282
+          color: rgba(112,125,138,0.96);
272 283
           font-size: 0.14rem;
273
-          font-family: PingFangSC-Medium;
274 284
           font-weight: bolder;
275 285
           line-height: 0.2rem;
276 286
         }
@@ -278,7 +288,6 @@ export default {
278 288
         .totalnum {
279 289
           color: #b8c2cb;
280 290
           font-size: 0.14rem;
281
-          font-family: PingFangSC-Medium;
282 291
           font-weight: bolder;
283 292
           line-height: 0.2rem;
284 293
         }
@@ -308,6 +317,8 @@ export default {
308 317
         height: 100%;
309 318
         background-color: rgba(255, 255, 255, 0);
310 319
         text-indent: 0.12rem;
320
+        font-size: 0.16rem;
321
+        font-weight: bolder;
311 322
       }
312 323
     }
313 324
     .textareabox {
@@ -321,6 +332,8 @@ export default {
321 332
         margin-top: 0.08rem;
322 333
         background-color: rgba(255, 255, 255, 0);
323 334
         margin-left: 0.12rem;
335
+        font-size: 0.16rem;
336
+        font-weight: bolder;
324 337
       }
325 338
     }
326 339
     .btn {
@@ -335,7 +348,6 @@ export default {
335 348
         border-radius: 0.23rem;
336 349
         border: none;
337 350
         font-size: 0.2rem;
338
-        font-family: PingFangSC-Medium;
339 351
         font-weight: bolder;
340 352
         color: rgba(255, 255, 255, 1);
341 353
         line-height: 0.28rem;
@@ -344,68 +356,66 @@ export default {
344 356
   }
345 357
 }
346 358
 
347
-.theme1{
348
-    background: rgba(209,220,228,1);
359
+.theme1 {
360
+  background: rgba(209, 220, 228, 1);
349 361
   // background-image: url("../../assets/yttjbg.png");
350
-  .desc{
362
+  .desc {
351 363
     font-size: 0.16rem;
352 364
     font-weight: bolder;
353 365
     color: rgba(112, 125, 138, 1);
354 366
     line-height: 0.22rem;
355 367
     padding-left: 0.03rem;
356 368
   }
357
-  .cinput{
369
+  .cinput {
358 370
     background-color: rgba(220, 229, 236, 0.63);
371
+    color: rgba(117, 132, 146, 0.4);
359 372
   }
360
-  .cbtn{
373
+  .cbtn {
361 374
     background: rgba(166, 184, 201, 1);
362 375
     box-shadow: 0px 2px 10px 0px rgba(207, 217, 227, 1);
363 376
     margin-top: 0.24rem;
364 377
   }
365 378
   input::-webkit-input-placeholder {
366 379
     font-size: 0.16rem;
367
-    font-family: PingFangSC-Medium;
368 380
     font-weight: bolder;
369 381
     color: rgba(117, 132, 146, 0.4);
370 382
     line-height: 0.22rem;
371 383
   }
372 384
   textarea::-webkit-input-placeholder {
373 385
     font-size: 0.16rem;
374
-    font-family: PingFangSC-Medium;
375 386
     font-weight: bolder;
376
-    color: rgba(112, 125, 138, 0.4);
387
+    color: rgba(112,125,138,1);
377 388
     line-height: 0.22rem;
378 389
   }
379 390
 }
380 391
 
381
-.theme2{
392
+.theme2 {
382 393
   // background-image: url("../../assets/bgimg.jpg");
383
-      background: linear-gradient(#97796c,#705443);
384
-  .desc{
394
+  background: linear-gradient(#97796c, #705443);
395
+  .desc {
385 396
     font-size: 0.16rem;
386 397
     font-weight: bolder;
387 398
     color: rgba(112, 84, 75, 1);
388 399
     line-height: 0.22rem;
389 400
     padding-left: 0.03rem;
390 401
   }
391
-  .cinput{
402
+  .cinput {
392 403
     background-color: rgba(232, 224, 220, 1);
404
+    color: rgba(139, 116, 102, 0.4);
393 405
   }
394
-  .cbtn{
406
+  .cbtn {
395 407
     background: rgba(173, 145, 129, 1);
396 408
     box-shadow: 0px 2px 10px 0px rgba(120, 108, 101, 0.46);
397 409
     margin-top: 1rem;
398 410
   }
399 411
   input::-webkit-input-placeholder {
400 412
     font-size: 0.16rem;
401
-    font-family: PingFangSC-Medium;
402 413
     font-weight: bolder;
403 414
     color: rgba(139, 116, 102, 0.4);
404 415
     line-height: 0.22rem;
405 416
   }
406 417
   textarea::-webkit-input-placeholder {
407 418
     font-size: 0.16rem;
408
-    font-family: PingFangSC-Medium;
409 419
     font-weight: bolder;
410 420
     color: rgba(139, 116, 102, 0.4);
411 421
     line-height: 0.22rem;

+ 4
- 0
vue.config.js View File

@@ -7,7 +7,11 @@ module.exports = {
7 7
     proxy: {
8 8
       '/voteapi': {
9 9
         // target: 'http://wechatconfigdev.ycjcjy.com',
10
+<<<<<<< HEAD
11
+        target: 'http://192.168.0.62:8080', // wf
12
+=======
10 13
         target: 'http://localhost:8080', // wf
14
+>>>>>>> 83865c56adef1f6c6aea63317940c0a221574425
11 15
         // target: 'http://192.168.0.102:8080', // hyq
12 16
         // target: 'http://192.168.0.11:8080', // zys
13 17
         // target: 'http://dev.ycjcjy.com', // frp