陈冉 6 vuotta sitten
vanhempi
commit
4d29b4f51c
4 muutettua tiedostoa jossa 63 lisäystä ja 116 poistoa
  1. 15
    9
      src/views/vote/detail.vue
  2. 2
    2
      src/views/vote/index.vue
  3. 24
    85
      src/views/vote/list.vue
  4. 22
    20
      src/views/vote/signup.vue

+ 15
- 9
src/views/vote/detail.vue Näytä tiedosto

@@ -50,7 +50,7 @@ export default {
50 50
       personnumber1:'personnumber1',
51 51
       personnumber2:'personnumber2',
52 52
       information1:'information1',
53
-      information2:'information1',
53
+      information2:'information2',
54 54
       informationnum1:'informationnum1',
55 55
       informationnum2:"informationnum2",
56 56
       line1:'line1',
@@ -148,7 +148,7 @@ this.desc = false;
148 148
       padding: 0.01rem 0.25rem;
149 149
       font-size: 0.18rem;
150 150
       font-family: PingFangSC-Medium;
151
-      font-weight: 500;
151
+      font-weight: bolder;
152 152
       color:rgba(70,86,101,1);
153 153
       line-height: 0.25rem;
154 154
     }
@@ -160,7 +160,7 @@ this.desc = false;
160 160
       padding: 0.01rem 0.25rem;
161 161
       font-size: 0.18rem;
162 162
       font-family: PingFangSC-Medium;
163
-      font-weight: 500;
163
+      font-weight: bolder;
164 164
       color:rgba(112,84,75,1);
165 165
       line-height: 0.25rem;
166 166
     }
@@ -174,7 +174,7 @@ this.desc = false;
174 174
       padding: 0.05rem 0.05rem 0.05rem 0.16rem;
175 175
       font-size: 0.18rem;
176 176
       font-family: PingFangSC-Medium;
177
-      font-weight: 500;
177
+      font-weight: bolder;
178 178
       color: rgba(255, 255, 255, 1);
179 179
       line-height: 0.25rem;
180 180
     }
@@ -210,26 +210,32 @@ this.desc = false;
210 210
           font-family: JQLaoSongJT;
211 211
           color:rgba(112,125,138,1);
212 212
           line-height: 0.28rem;
213
-          font-weight: 400;
213
+          font-weight: bold;
214
+          height: 0.28rem;
214 215
         }
215 216
         .information2 {
216 217
           font-size: 0.16rem;
217 218
           font-family: JQLaoSongJT;
218 219
           color:rgba(112,84,75,1);
219 220
           line-height: 0.28rem;
220
-          font-weight: 400;
221
+          font-weight: bold;
222
+           height: 0.28rem;
221 223
         }
222 224
         .informationnum1 {
223 225
           font-size: 0.24rem;
224 226
           font-family: JQLaoSongJT;
225 227
           color:rgba(112,125,138,1);
228
+          font-weight: bolder;
226 229
           line-height: 0.28rem;
230
+           height: 0.28rem;
227 231
         }
228 232
           .informationnum2 {
229 233
           font-size: 0.24rem;
230 234
           font-family: JQLaoSongJT;
231 235
           color:rgba(112,84,75,1);
236
+          font-weight: bolder;
232 237
           line-height: 0.28rem;
238
+           height: 0.28rem;
233 239
         }
234 240
       }
235 241
     }
@@ -242,7 +248,7 @@ this.desc = false;
242 248
     border-radius: 0.23rem;
243 249
     font-size: 0.2rem;
244 250
     font-family: PingFangSC-Medium;
245
-    font-weight: blod;
251
+    font-weight: bolder;
246 252
     color: rgba(255, 255, 255, 1);
247 253
     line-height: 0.28rem;
248 254
     border: none;
@@ -255,7 +261,7 @@ this.desc = false;
255 261
     border-radius: 0.23rem;
256 262
     font-size: 0.2rem;
257 263
     font-family: PingFangSC-Medium;
258
-    font-weight: blod;
264
+    font-weight: bolder;
259 265
     color: rgba(255, 255, 255, 1);
260 266
     line-height: 0.28rem;
261 267
     border: none;
@@ -281,7 +287,7 @@ this.desc = false;
281 287
       word-break: normal;
282 288
       font-size: 0.14rem;
283 289
       font-family: PingFangSC-Regular;
284
-      font-weight: 400;
290
+      font-weight: bold;
285 291
       color: rgba(77,87,97,1);
286 292
       line-height: 0.2rem;
287 293
     }

+ 2
- 2
src/views/vote/index.vue Näytä tiedosto

@@ -66,7 +66,7 @@ export default {
66 66
     border: none;
67 67
     font-size: 0.2rem;
68 68
     font-family: PingFangSC-Medium;
69
-    font-weight: bold;
69
+    font-weight: bolder;
70 70
     color: white;
71 71
     line-height: 0.28rem;
72 72
     position: fixed;
@@ -81,7 +81,7 @@ export default {
81 81
     border: none;
82 82
     font-size: 0.2rem;
83 83
     font-family: PingFangSC-Medium;
84
-    font-weight: bold;
84
+    font-weight: bolder;
85 85
     color: white;
86 86
     line-height: 0.28rem;
87 87
     position: fixed;

+ 24
- 85
src/views/vote/list.vue Näytä tiedosto

@@ -5,7 +5,6 @@
5 5
       <div :class="isOK?searchs:searchb">
6 6
         <input placeholder="输入编号或姓名" v-model="q">
7 7
         <img class="IconSearch" :src="IconSearch" @click="search">
8
-        <!-- <i class="iconfont icon-sousuo3 IconSearch"></i> -->
9 8
       </div>
10 9
     </div>
11 10
     <img class="informationimg" :src="activity.Desc">
@@ -20,8 +19,6 @@
20 19
           <span :class="active?newlyone:newlytwo" @click="qh(true)">最新上传</span>
21 20
           <span :class="active?newlytwo:newlyone" @click="qh(false)">TOP50</span>
22 21
         </div>
23
-        <!-- <van-tabs type="card">
24
-        <van-tab title="最新上传">-->
25 22
         <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
26 23
           <div class="LatestUpload" v-if="temp">
27 24
             <div class="LatestUploadList" v-for="(item,index) in newList" :key="index">
@@ -41,9 +38,7 @@
41 38
             </div>
42 39
           </div>
43 40
         </van-list>
44
-        <!-- </van-tab> -->
45
-        <!-- <van-tab title="TOP50"> -->
46
-           <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
41
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
47 42
         <div class="LatestUpload" v-if="!temp">
48 43
           <div class="LatestUploadList" v-for="(item,index) in topList" :key="index">
49 44
             <div
@@ -62,8 +57,6 @@
62 57
           </div>
63 58
         </div>
64 59
         </van-list>
65
-        <!-- </van-tab>
66
-        </van-tabs>-->
67 60
       </div>
68 61
     </div>
69 62
     <button :class="signupBtn?'signupBtnOne':'signupBtnTwo'" @click="signup">我要报名</button>
@@ -86,7 +79,6 @@ export default {
86 79
   name: "lotterylist",
87 80
   data() {
88 81
     return {
89
-      // AudioPlay: ''
90 82
       first:false,
91 83
       second:false,
92 84
       active:true,
@@ -143,7 +135,6 @@ export default {
143 135
   },
144 136
   created() {
145 137
     this.actid = this.$route.params.actid;
146
-    console.log(this.actid);
147 138
     if (this.actid == 1) {
148 139
       this.coverImgUrl = true;
149 140
       this.signupBtn = true;
@@ -222,21 +213,6 @@ export default {
222 213
         this.topList = toplist;
223 214
       });
224 215
     },
225
-    // onLoad() {
226
-    //   // 异步更新数据
227
-    //   setTimeout(() => {
228
-    //     for (let i = 0; i < 10; i++) {
229
-    //       this.list.push(this.list.length + 1);
230
-    //     }
231
-    //     // 加载状态结束
232
-    //     this.loading = false;
233
-
234
-    //     // 数据全部加载完成
235
-    //     if (this.list.length >= 40) {
236
-    //       this.finished = true;
237
-    //     }
238
-    //   }, 2000);
239
-    // },
240 216
     signup() {
241 217
       this.$router.push({
242 218
         path: `/vote/signup/${this.actid}`
@@ -265,43 +241,6 @@ export default {
265 241
 .van-list {
266 242
   width: 100%;
267 243
 }
268
-.van-tabs--card {
269
-  width: 100%;
270
-}
271
-.van-tabs__nav--card {
272
-  height: 100%;
273
-  border: none;
274
-  margin: 0;
275
-}
276
-.van-tabs__wrap {
277
-  width: 100%;
278
-  z-index: 0;
279
-}
280
-.van-tabs__nav--card .van-tab.van-tab--active {
281
-  background-color: rgba(166, 184, 201, 1);
282
-  border-radius: 0.06rem;
283
-}
284
-.van-tabs--card .van-tabs__wrap {
285
-  height: 0.4rem;
286
-}
287
-.van-tabs__nav--card .van-tab {
288
-  border-right: none;
289
-  background-color: rgba(217, 226, 233, 1);
290
-  border-radius: 0.06rem;
291
-  width: 100%;
292
-  margin: 0 0.075rem;
293
-  display: flex;
294
-  justify-content: center;
295
-  align-items: center;
296
-}
297
-.van-ellipsis {
298
-  font-size: 0.16rem;
299
-  font-family: PingFangSC-Medium;
300
-  font-weight: bold;
301
-  color: rgba(255, 255, 255, 1);
302
-  line-height: 0.22rem;
303
-  text-align: center;
304
-}
305 244
 </style>
306 245
 
307 246
 
@@ -343,22 +282,22 @@ export default {
343 282
         color: rgba(255, 255, 255, 1);
344 283
         font-size: 0.16rem;
345 284
         font-family: PingFangSC-Regular;
346
-        font-weight: 400;
285
+        font-weight: bold;
347 286
         line-height: 0.22rem;
348 287
         width: 5rem;
349
-        text-indent: 0.1rem;
288
+        text-indent: 0.14rem;
350 289
       }
351 290
       input::-webkit-input-placeholder {
352 291
         color: rgba(255, 255, 255, 1);
353 292
         font-size: 0.16rem;
354 293
         font-family: PingFangSC-Regular;
355
-        font-weight: 400;
294
+        font-weight: bold;
356 295
         line-height: 0.22rem;
357 296
       }
358 297
       .IconSearch {
359 298
         width: 0.2rem;
360 299
         height: 0.2rem;
361
-        margin-right: 0.1rem;
300
+        margin-right: 0.14rem;
362 301
       }
363 302
     }
364 303
   }
@@ -387,22 +326,22 @@ export default {
387 326
         color: rgba(255, 255, 255, 1);
388 327
         font-size: 0.16rem;
389 328
         font-family: PingFangSC-Regular;
390
-        font-weight: 400;
329
+        font-weight: bold;
391 330
         line-height: 0.22rem;
392 331
         width: 5rem;
393
-        text-indent: 0.1rem;
332
+        text-indent: 0.14rem;
394 333
       }
395 334
       input::-webkit-input-placeholder {
396 335
         color: rgba(255, 255, 255, 1);
397 336
         font-size: 0.16rem;
398 337
         font-family: PingFangSC-Regular;
399
-        font-weight: 400;
338
+        font-weight: bold;
400 339
         line-height: 0.22rem;
401 340
       }
402 341
       .IconSearch {
403 342
         width: 0.2rem;
404 343
         height: 0.2rem;
405
-        margin-right: 0.1rem;
344
+        margin-right: 0.14rem;
406 345
       }
407 346
     }
408 347
   }
@@ -431,7 +370,7 @@ export default {
431 370
         color: rgba(255, 255, 255, 1);
432 371
         font-size: 0.16rem;
433 372
         font-family: PingFangSC-Regular;
434
-        font-weight: 400;
373
+        font-weight: bold;
435 374
         line-height: 0.22rem;
436 375
         width: 5rem;
437 376
         text-indent: 0.1rem;
@@ -440,7 +379,7 @@ export default {
440 379
         color: rgba(255, 255, 255, 1);
441 380
         font-size: 0.16rem;
442 381
         font-family: PingFangSC-Regular;
443
-        font-weight: 400;
382
+        font-weight: bold;
444 383
         line-height: 0.22rem;
445 384
       }
446 385
 
@@ -476,7 +415,7 @@ export default {
476 415
         color: rgba(255, 255, 255, 1);
477 416
         font-size: 0.16rem;
478 417
         font-family: PingFangSC-Regular;
479
-        font-weight: 400;
418
+        font-weight: bold;
480 419
         line-height: 0.22rem;
481 420
         width: 5rem;
482 421
         text-indent: 0.1rem;
@@ -485,7 +424,7 @@ export default {
485 424
         color: rgba(255, 255, 255, 1);
486 425
         font-size: 0.16rem;
487 426
         font-family: PingFangSC-Regular;
488
-        font-weight: 400;
427
+        font-weight: bold;
489 428
         line-height: 0.22rem;
490 429
       }
491 430
 
@@ -535,7 +474,7 @@ export default {
535 474
         width: 47.5%;
536 475
         font-size: 0.16rem;
537 476
         font-family: PingFangSC-Medium;
538
-        font-weight: 500;
477
+        font-weight: bolder;
539 478
         color: rgba(255, 255, 255, 1);
540 479
         line-height: 0.22rem;
541 480
         background: rgba(166, 184, 201, 1);
@@ -547,7 +486,7 @@ export default {
547 486
          width: 47.5%;
548 487
         font-size: 0.16rem;
549 488
         font-family: PingFangSC-Medium;
550
-        font-weight: 500;
489
+        font-weight: bolder;
551 490
         color: rgba(255, 255, 255, 1);
552 491
         line-height: 0.22rem;
553 492
         background: rgba(217,226,233,1);
@@ -567,7 +506,7 @@ export default {
567 506
         width: 47.5%;
568 507
         font-size: 0.16rem;
569 508
         font-family: PingFangSC-Medium;
570
-        font-weight: 500;
509
+        font-weight: bolder;
571 510
         color: rgba(255, 255, 255, 1);
572 511
         line-height: 0.22rem;
573 512
         background: rgba(126,100,86,1);
@@ -579,7 +518,7 @@ export default {
579 518
          width: 47.5%;
580 519
         font-size: 0.16rem;
581 520
         font-family: PingFangSC-Medium;
582
-        font-weight: 500;
521
+        font-weight: bolder;
583 522
         color: rgba(255, 255, 255, 1);
584 523
         line-height: 0.22rem;
585 524
         background: rgba(173,145,129,0.62);
@@ -644,7 +583,7 @@ export default {
644 583
             padding: 0.02rem 0.12rem;
645 584
             font-size: 0.14rem;
646 585
             font-family: PingFangSC-Medium;
647
-            font-weight: bold;
586
+            font-weight: bolder;
648 587
             color: rgba(255, 255, 255, 1);
649 588
             line-height: 0.2rem;
650 589
           }
@@ -656,7 +595,7 @@ export default {
656 595
             padding: 0.02rem 0.12rem;
657 596
             font-size: 0.14rem;
658 597
             font-family: PingFangSC-Medium;
659
-            font-weight: bold;
598
+            font-weight: bolder;
660 599
             color: rgba(255, 255, 255, 1);
661 600
             line-height: 0.2rem;
662 601
           }
@@ -664,7 +603,7 @@ export default {
664 603
           .ActivePersonnelName {
665 604
             font-size: 0.16rem;
666 605
             font-family: PingFangSC-Regular;
667
-            font-weight: 400;
606
+            font-weight: bold;
668 607
             color: rgba(0, 0, 0, 1);
669 608
             line-height: 0.22rem;
670 609
             padding-bottom: 0.11rem;
@@ -678,7 +617,7 @@ export default {
678 617
             border: none;
679 618
             font-size: 0.14rem;
680 619
             font-family: PingFangSC-Medium;
681
-            font-weight: bold;
620
+            font-weight: bolder;
682 621
             color: rgba(255, 255, 255, 1);
683 622
             line-height: 0.2rem;
684 623
             margin-bottom: 0.14rem;
@@ -691,7 +630,7 @@ export default {
691 630
             border: none;
692 631
             font-size: 0.14rem;
693 632
             font-family: PingFangSC-Medium;
694
-            font-weight: bold;
633
+            font-weight: bolder;
695 634
             color: rgba(255, 255, 255, 1);
696 635
             line-height: 0.2rem;
697 636
             margin-bottom: 0.14rem;
@@ -704,14 +643,14 @@ export default {
704 643
             span {
705 644
               font-size: 0.12rem;
706 645
               font-family: PingFangSC-Medium;
707
-              font-weight: bold;
646
+              font-weight: bolder;
708 647
               color: rgba(0, 0, 0, 1);
709 648
               line-height: 0.17rem;
710 649
             }
711 650
             p {
712 651
               font-size: 0.12rem;
713 652
               font-family: PingFangSC-Medium;
714
-              font-weight: bold;
653
+              font-weight: bolder;
715 654
               color: #f0737e;
716 655
               line-height: 0.17rem;
717 656
             }

+ 22
- 20
src/views/vote/signup.vue Näytä tiedosto

@@ -181,7 +181,7 @@ export default {
181 181
       .desc1 {
182 182
         font-size: 0.16rem;
183 183
         font-family: PingFangSC-Medium;
184
-        font-weight: bold;
184
+        font-weight: bolder;
185 185
         color:rgba(112,125,138,1);
186 186
         line-height: 0.22rem;
187 187
         padding-left: 0.03rem;
@@ -189,7 +189,7 @@ export default {
189 189
       .desc2 {
190 190
         font-size: 0.16rem;
191 191
         font-family: PingFangSC-Medium;
192
-        font-weight: bold;
192
+        font-weight: bolder;
193 193
         color:rgba(112,84,75,1);
194 194
         line-height: 0.22rem;
195 195
         padding-left: 0.03rem;
@@ -214,7 +214,7 @@ export default {
214 214
      .desc1 {
215 215
         font-size: 0.16rem;
216 216
         font-family: PingFangSC-Medium;
217
-        font-weight: bold;
217
+        font-weight: bolder;
218 218
         color:rgba(112,125,138,1);
219 219
         line-height: 0.22rem;
220 220
         padding-left: 0.03rem;
@@ -222,7 +222,7 @@ export default {
222 222
       .desc2 {
223 223
         font-size: 0.16rem;
224 224
         font-family: PingFangSC-Medium;
225
-        font-weight: bold;
225
+        font-weight: bolder;
226 226
         color:rgba(112,84,75,1);
227 227
         line-height: 0.22rem;
228 228
         padding-left: 0.03rem;
@@ -241,7 +241,7 @@ export default {
241 241
         margin-left: 5%;
242 242
         border: none;
243 243
         font-size: 0.16rem;
244
-        font-weight: 400;
244
+        font-weight: bold;
245 245
         background:rgba(220,229,236,0.63);
246 246
         line-height: 0.22rem;
247 247
         border-radius: 0.06rem;
@@ -257,7 +257,7 @@ color:rgba(112,125,138,1);
257 257
 color:#707D8A;
258 258
 font-size:0.14rem;
259 259
 font-family:PingFangSC-Medium;
260
-font-weight:bold;
260
+font-weight:bolder;
261 261
 line-height:0.2rem;
262 262
         }
263 263
 
@@ -265,7 +265,7 @@ line-height:0.2rem;
265 265
 color:#B8C2CB;
266 266
 font-size:0.14rem;
267 267
 font-family:PingFangSC-Medium;
268
-font-weight:bold;
268
+font-weight:bolder;
269 269
 line-height:0.2rem;
270 270
         }
271 271
       }
@@ -283,7 +283,7 @@ line-height:0.2rem;
283 283
      .desc1 {
284 284
         font-size: 0.16rem;
285 285
         font-family: PingFangSC-Medium;
286
-        font-weight: bold;
286
+        font-weight: bolder;
287 287
         color:rgba(112,125,138,1);
288 288
         line-height: 0.22rem;
289 289
         padding-left: 0.03rem;
@@ -291,7 +291,7 @@ line-height:0.2rem;
291 291
       .desc2 {
292 292
         font-size: 0.16rem;
293 293
         font-family: PingFangSC-Medium;
294
-        font-weight: bold;
294
+        font-weight: bolder;
295 295
         color:rgba(112,84,75,1);
296 296
         line-height: 0.22rem;
297 297
         padding-left: 0.03rem;
@@ -315,8 +315,8 @@ width: 84%;
315 315
     input::-webkit-input-placeholder {
316 316
      font-size:0.16rem;
317 317
 font-family:PingFangSC-Medium;
318
-font-weight:bold;
319
-color:rgba(117,132,146,1);
318
+font-weight:bolder;
319
+color:rgba(117,132,146,0.4);
320 320
 line-height:0.22rem;
321 321
     }
322 322
     }
@@ -338,8 +338,8 @@ width: 84%;
338 338
     input::-webkit-input-placeholder {
339 339
      font-size:0.16rem;
340 340
 font-family:PingFangSC-Medium;
341
-font-weight:bold;
342
-color:rgba(139,116,102,1);
341
+font-weight:bolder;
342
+color:rgba(139,116,102,0.4);
343 343
 line-height:0.22rem;
344 344
     }
345 345
     }
@@ -359,8 +359,8 @@ border-radius:0.06rem;
359 359
      textarea::-webkit-input-placeholder {
360 360
      font-size:0.16rem;
361 361
 font-family:PingFangSC-Medium;
362
-font-weight:bold;
363
-color:rgba(112,125,138,1);
362
+font-weight:bolder;
363
+color:rgba(112,125,138,0.4);
364 364
 line-height:0.22rem;
365 365
     }
366 366
  }
@@ -381,8 +381,8 @@ border-radius:0.06rem;
381 381
      textarea::-webkit-input-placeholder {
382 382
      font-size:0.16rem;
383 383
 font-family:PingFangSC-Medium;
384
-font-weight:bold;
385
-color:rgba(139,116,102,1);
384
+font-weight:bolder;
385
+color:rgba(139,116,102,0.4);
386 386
 line-height:0.22rem;
387 387
     }
388 388
  }
@@ -393,7 +393,9 @@ line-height:0.22rem;
393 393
     display: flex;
394 394
     align-items: center;
395 395
     justify-content: center;
396
-    margin-top: 0.2rem;
396
+        position: absolute;
397
+    left: 0;
398
+    bottom: 1rem;
397 399
 
398 400
        .SubmitBtn1{
399 401
         width: 44%;
@@ -404,7 +406,7 @@ box-shadow:0px 2px 10px 0px rgba(207,217,227,1);
404 406
     border: none;
405 407
     font-size: 0.2rem;
406 408
     font-family: PingFangSC-Medium;
407
-    font-weight: bold;
409
+    font-weight: bolder;
408 410
     color: rgba(255, 255, 255, 1);
409 411
     line-height: 0.28rem;
410 412
     }
@@ -417,7 +419,7 @@ box-shadow:0px 2px 10px 0px rgba(120,108,101,0.46);
417 419
     border: none;
418 420
     font-size: 0.2rem;
419 421
     font-family: PingFangSC-Medium;
420
-    font-weight: bold;
422
+    font-weight: bolder;
421 423
     color: rgba(255, 255, 255, 1);
422 424
     line-height: 0.28rem;
423 425
     }