陈冉 6 years ago
parent
commit
3b18cbf555
3 changed files with 60 additions and 54 deletions
  1. 1
    1
      src/components/music.vue
  2. 2
    2
      src/views/vote/index.vue
  3. 57
    51
      src/views/vote/signup.vue

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

89
 
89
 
90
   .musicbox {
90
   .musicbox {
91
     position: fixed;
91
     position: fixed;
92
-    top: 0.09rem;
92
+    top: 0.6rem;
93
     right: 0.09rem;
93
     right: 0.09rem;
94
     width: 0.35rem;
94
     width: 0.35rem;
95
     height: 0.35rem;
95
     height: 0.35rem;

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

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

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

48
 
48
 
49
 <script>
49
 <script>
50
 import { createNamespacedHelpers } from "vuex";
50
 import { createNamespacedHelpers } from "vuex";
51
-import { Toast } from 'vant';
51
+import { Toast } from "vant";
52
 const {
52
 const {
53
   mapState: mapVoteState,
53
   mapState: mapVoteState,
54
   mapActions: mapVoteActions
54
   mapActions: mapVoteActions
56
 export default {
56
 export default {
57
   name: "signup",
57
   name: "signup",
58
   data() {
58
   data() {
59
-    return{
59
+    return {
60
       messagenum: 0,
60
       messagenum: 0,
61
       postData: {
61
       postData: {
62
         photo: "",
62
         photo: "",
65
         addr: "",
65
         addr: "",
66
         message: ""
66
         message: ""
67
       },
67
       },
68
-      uploadimg: '',
68
+      uploadimg: "",
69
       actid: "",
69
       actid: "",
70
       yttjlove:
70
       yttjlove:
71
         "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yttj_icon_love.png",
71
         "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yttj_icon_love.png",
78
       yjspen:
78
       yjspen:
79
         "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/xiegenjin.png",
79
         "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/xiegenjin.png",
80
       yjsphone:
80
       yjsphone:
81
-        "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/dianhua.png",
81
+        "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/dianhua.png"
82
     };
82
     };
83
   },
83
   },
84
   computed: {
84
   computed: {
85
     ...mapVoteState({
85
     ...mapVoteState({
86
       user: x => x.user,
86
       user: x => x.user,
87
-      theme: x => x.theme,
87
+      theme: x => x.theme
88
     })
88
     })
89
   },
89
   },
90
   created() {
90
   created() {
92
     if (this.$route.params.actid != "") {
92
     if (this.$route.params.actid != "") {
93
       this.actid = this.$route.params.actid;
93
       this.actid = this.$route.params.actid;
94
       this.getActivity({
94
       this.getActivity({
95
-        actid: this.actid,
95
+        actid: this.actid
96
       }).then(() => {
96
       }).then(() => {
97
-        if (this.theme === 1){
98
-          this.uploadimg = 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/uploadimg.png'
97
+        if (this.theme === 1) {
98
+          this.uploadimg =
99
+            "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/uploadimg.png";
99
         } else {
100
         } else {
100
-          this.uploadimg = 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yjsuploadimg.png'
101
+          this.uploadimg =
102
+            "https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yjsuploadimg.png";
101
         }
103
         }
102
-      })
104
+      });
103
     } else {
105
     } else {
104
       alert("不存在对应的活动信息!");
106
       alert("不存在对应的活动信息!");
105
     }
107
     }
106
   },
108
   },
107
   methods: {
109
   methods: {
108
-    ...mapVoteActions(["voteMember","getActivity"]),
110
+    ...mapVoteActions(["voteMember", "getActivity"]),
109
     onRead(file) {
111
     onRead(file) {
110
       let that = this;
112
       let that = this;
111
       this.isLoading = true;
113
       this.isLoading = true;
133
       this.messagenum = this.postData.message.length;
135
       this.messagenum = this.postData.message.length;
134
     },
136
     },
135
     SubmitBtn() {
137
     SubmitBtn() {
136
-      if(this.postData.photo == ""){
138
+      if (this.postData.photo == "") {
137
         Toast.fail({
139
         Toast.fail({
138
           duration: 2000, // 持续展示 toast
140
           duration: 2000, // 持续展示 toast
139
           forbidClick: true, // 禁用背景点击
141
           forbidClick: true, // 禁用背景点击
140
           message: "请先上传您的全家福!"
142
           message: "请先上传您的全家福!"
141
-        })
142
-        return false
143
+        });
144
+        return false;
143
       }
145
       }
144
-      if(this.postData.name == ""){
146
+      if (this.postData.name == "") {
145
         Toast.fail({
147
         Toast.fail({
146
           duration: 2000, // 持续展示 toast
148
           duration: 2000, // 持续展示 toast
147
           forbidClick: true, // 禁用背景点击
149
           forbidClick: true, // 禁用背景点击
148
           message: "请输入您的姓名!"
150
           message: "请输入您的姓名!"
149
-        })
150
-        return false
151
+        });
152
+        return false;
151
       }
153
       }
152
-      if(this.postData.phone == ""){
154
+      if (this.postData.phone == "") {
153
         Toast.fail({
155
         Toast.fail({
154
           duration: 2000, // 持续展示 toast
156
           duration: 2000, // 持续展示 toast
155
           forbidClick: true, // 禁用背景点击
157
           forbidClick: true, // 禁用背景点击
156
           message: "请输入您的联系方式!"
158
           message: "请输入您的联系方式!"
157
-        })
158
-        return false
159
+        });
160
+        return false;
159
       }
161
       }
160
-      var myreg=/^[1][0-9]{10}$/;
162
+      var myreg = /^[1][0-9]{10}$/;
161
       if (!myreg.test(this.postData.phone)) {
163
       if (!myreg.test(this.postData.phone)) {
162
         Toast.fail({
164
         Toast.fail({
163
           duration: 2000, // 持续展示 toast
165
           duration: 2000, // 持续展示 toast
164
           forbidClick: true, // 禁用背景点击
166
           forbidClick: true, // 禁用背景点击
165
           message: "手机号格式不正确!"
167
           message: "手机号格式不正确!"
166
-        })
167
-        return false
168
+        });
169
+        return false;
168
       }
170
       }
169
 
171
 
170
       this.voteMember({
172
       this.voteMember({
230
       width: 90%;
232
       width: 90%;
231
       height: 1.17rem;
233
       height: 1.17rem;
232
       position: relative;
234
       position: relative;
235
+      background: rgba(220, 229, 236, 0.63);
236
+      margin: 0 auto;
237
+      border-radius: 0.06rem;
233
 
238
 
234
       .content_txt {
239
       .content_txt {
235
-        width: 95%;
236
-        height: 100%;
237
-        padding: 2% 3% 0 3%;
238
-        margin-left: 5%;
240
+        width: 93%;
241
+        height: 0.89rem;
239
         border: none;
242
         border: none;
240
         font-size: 0.16rem;
243
         font-size: 0.16rem;
241
         font-weight: bold;
244
         font-weight: bold;
242
-        background: rgba(220, 229, 236, 0.63);
245
+        background: rgba(220, 229, 236, 0);
243
         line-height: 0.22rem;
246
         line-height: 0.22rem;
244
-        border-radius: 0.06rem;
245
         font-weight: bold;
247
         font-weight: bold;
246
-        color: rgba(112, 125, 138, 1);
248
+        color: rgba(112,125,138,0.96);
249
+        padding-top: 0.08rem;
250
+        margin-left: calc(4.5%);
251
+        overflow-y: scroll;
252
+
253
+
247
       }
254
       }
248
       .number {
255
       .number {
249
         position: absolute;
256
         position: absolute;
250
-        bottom: 0;
251
-        right: -0.1rem;
257
+        bottom: 0.02rem;
258
+        right: 0.05rem;
252
 
259
 
253
         #textNum {
260
         #textNum {
254
-          color: #707d8a;
261
+          color: rgba(112,125,138,0.96);
255
           font-size: 0.14rem;
262
           font-size: 0.14rem;
256
-          font-family: PingFangSC-Medium;
257
           font-weight: bolder;
263
           font-weight: bolder;
258
           line-height: 0.2rem;
264
           line-height: 0.2rem;
259
         }
265
         }
261
         .totalnum {
267
         .totalnum {
262
           color: #b8c2cb;
268
           color: #b8c2cb;
263
           font-size: 0.14rem;
269
           font-size: 0.14rem;
264
-          font-family: PingFangSC-Medium;
265
           font-weight: bolder;
270
           font-weight: bolder;
266
           line-height: 0.2rem;
271
           line-height: 0.2rem;
267
         }
272
         }
291
         height: 100%;
296
         height: 100%;
292
         background-color: rgba(255, 255, 255, 0);
297
         background-color: rgba(255, 255, 255, 0);
293
         text-indent: 0.12rem;
298
         text-indent: 0.12rem;
299
+        font-size: 0.16rem;
300
+        font-weight: bolder;
294
       }
301
       }
295
     }
302
     }
296
     .textareabox {
303
     .textareabox {
304
         margin-top: 0.08rem;
311
         margin-top: 0.08rem;
305
         background-color: rgba(255, 255, 255, 0);
312
         background-color: rgba(255, 255, 255, 0);
306
         margin-left: 0.12rem;
313
         margin-left: 0.12rem;
314
+        font-size: 0.16rem;
315
+        font-weight: bolder;
307
       }
316
       }
308
     }
317
     }
309
     .btn {
318
     .btn {
318
         border-radius: 0.23rem;
327
         border-radius: 0.23rem;
319
         border: none;
328
         border: none;
320
         font-size: 0.2rem;
329
         font-size: 0.2rem;
321
-        font-family: PingFangSC-Medium;
322
         font-weight: bolder;
330
         font-weight: bolder;
323
         color: rgba(255, 255, 255, 1);
331
         color: rgba(255, 255, 255, 1);
324
         line-height: 0.28rem;
332
         line-height: 0.28rem;
327
   }
335
   }
328
 }
336
 }
329
 
337
 
330
-.theme1{
331
-    background: rgba(209,220,228,1);
338
+.theme1 {
339
+  background: rgba(209, 220, 228, 1);
332
   // background-image: url("../../assets/yttjbg.png");
340
   // background-image: url("../../assets/yttjbg.png");
333
-  .desc{
341
+  .desc {
334
     font-size: 0.16rem;
342
     font-size: 0.16rem;
335
     font-weight: bolder;
343
     font-weight: bolder;
336
     color: rgba(112, 125, 138, 1);
344
     color: rgba(112, 125, 138, 1);
337
     line-height: 0.22rem;
345
     line-height: 0.22rem;
338
     padding-left: 0.03rem;
346
     padding-left: 0.03rem;
339
   }
347
   }
340
-  .cinput{
348
+  .cinput {
341
     background-color: rgba(220, 229, 236, 0.63);
349
     background-color: rgba(220, 229, 236, 0.63);
350
+    color: rgba(117, 132, 146, 0.4);
342
   }
351
   }
343
-  .cbtn{
352
+  .cbtn {
344
     background: rgba(166, 184, 201, 1);
353
     background: rgba(166, 184, 201, 1);
345
     box-shadow: 0px 2px 10px 0px rgba(207, 217, 227, 1);
354
     box-shadow: 0px 2px 10px 0px rgba(207, 217, 227, 1);
346
     margin-top: 0.24rem;
355
     margin-top: 0.24rem;
347
   }
356
   }
348
   input::-webkit-input-placeholder {
357
   input::-webkit-input-placeholder {
349
     font-size: 0.16rem;
358
     font-size: 0.16rem;
350
-    font-family: PingFangSC-Medium;
351
     font-weight: bolder;
359
     font-weight: bolder;
352
     color: rgba(117, 132, 146, 0.4);
360
     color: rgba(117, 132, 146, 0.4);
353
     line-height: 0.22rem;
361
     line-height: 0.22rem;
354
   }
362
   }
355
   textarea::-webkit-input-placeholder {
363
   textarea::-webkit-input-placeholder {
356
     font-size: 0.16rem;
364
     font-size: 0.16rem;
357
-    font-family: PingFangSC-Medium;
358
     font-weight: bolder;
365
     font-weight: bolder;
359
-    color: rgba(112, 125, 138, 0.4);
366
+    color: rgba(112,125,138,1);
360
     line-height: 0.22rem;
367
     line-height: 0.22rem;
361
   }
368
   }
362
 }
369
 }
363
 
370
 
364
-.theme2{
371
+.theme2 {
365
   // background-image: url("../../assets/bgimg.jpg");
372
   // background-image: url("../../assets/bgimg.jpg");
366
-      background: linear-gradient(#97796c,#705443);
367
-  .desc{
373
+  background: linear-gradient(#97796c, #705443);
374
+  .desc {
368
     font-size: 0.16rem;
375
     font-size: 0.16rem;
369
     font-weight: bolder;
376
     font-weight: bolder;
370
     color: rgba(112, 84, 75, 1);
377
     color: rgba(112, 84, 75, 1);
371
     line-height: 0.22rem;
378
     line-height: 0.22rem;
372
     padding-left: 0.03rem;
379
     padding-left: 0.03rem;
373
   }
380
   }
374
-  .cinput{
381
+  .cinput {
375
     background-color: rgba(232, 224, 220, 1);
382
     background-color: rgba(232, 224, 220, 1);
383
+    color: rgba(139, 116, 102, 0.4);
376
   }
384
   }
377
-  .cbtn{
385
+  .cbtn {
378
     background: rgba(173, 145, 129, 1);
386
     background: rgba(173, 145, 129, 1);
379
     box-shadow: 0px 2px 10px 0px rgba(120, 108, 101, 0.46);
387
     box-shadow: 0px 2px 10px 0px rgba(120, 108, 101, 0.46);
380
     margin-top: 1rem;
388
     margin-top: 1rem;
381
   }
389
   }
382
   input::-webkit-input-placeholder {
390
   input::-webkit-input-placeholder {
383
     font-size: 0.16rem;
391
     font-size: 0.16rem;
384
-    font-family: PingFangSC-Medium;
385
     font-weight: bolder;
392
     font-weight: bolder;
386
     color: rgba(139, 116, 102, 0.4);
393
     color: rgba(139, 116, 102, 0.4);
387
     line-height: 0.22rem;
394
     line-height: 0.22rem;
388
   }
395
   }
389
   textarea::-webkit-input-placeholder {
396
   textarea::-webkit-input-placeholder {
390
     font-size: 0.16rem;
397
     font-size: 0.16rem;
391
-    font-family: PingFangSC-Medium;
392
     font-weight: bolder;
398
     font-weight: bolder;
393
     color: rgba(139, 116, 102, 0.4);
399
     color: rgba(139, 116, 102, 0.4);
394
     line-height: 0.22rem;
400
     line-height: 0.22rem;