Browse Source

Merge branch 'master' of http://git.ycjcjy.com/honghe/h5-draw-lots

Baozhangchao 3 years ago
parent
commit
0f9635f472

+ 1
- 1
.gitignore View File

1
 .DS_Store
1
 .DS_Store
2
 node_modules
2
 node_modules
3
 /dist
3
 /dist
4
-
4
+*.mp3
5
 
5
 
6
 # local env files
6
 # local env files
7
 .env.local
7
 .env.local

BIN
public/images/paused.png View File


BIN
public/images/play.png View File


BIN
public/loading.gif View File


+ 25
- 0
src/components/BgMusic.vue View File

1
+<template>
2
+  <div class="bg-music">
3
+
4
+  </div>
5
+</template>
6
+
7
+<script>
8
+export default {
9
+  name: 'BgMusic',
10
+  data() {
11
+    const { origin, pathname } = window.location
12
+
13
+    return {
14
+      url: `${origin}${pathname}/bg.mp3`
15
+    }
16
+  }
17
+}
18
+</script>
19
+
20
+<style lang="less" scoped>
21
+.bg-music {
22
+  width: 64px;
23
+  height: 64px;
24
+}
25
+</style>

+ 0
- 1
src/components/CalendarPoster.vue View File

263
         width: 100vw;
263
         width: 100vw;
264
         overflow: hidden;
264
         overflow: hidden;
265
         align-self: center;
265
         align-self: center;
266
-        margin-top: 1vw;
267
         margin-left: 0;
266
         margin-left: 0;
268
         .subhaibao {
267
         .subhaibao {
269
           // position: absolute;
268
           // position: absolute;

+ 0
- 1
src/components/MyWinning.vue View File

236
         width: 100vw;
236
         width: 100vw;
237
         overflow: hidden;
237
         overflow: hidden;
238
         align-self: center;
238
         align-self: center;
239
-        margin-top: 1vw;
240
         margin-left: 0;
239
         margin-left: 0;
241
         .subhaibao {
240
         .subhaibao {
242
           // position: absolute;
241
           // position: absolute;

+ 2
- 5
src/components/Popup.vue View File

333
   }
333
   }
334
   .section-box {
334
   .section-box {
335
     position: absolute;
335
     position: absolute;
336
-    right: 15vw;
337
-    top: 57px;
338
-    height: 394px;
336
+    left: 82vw;
339
     display: flex;
337
     display: flex;
340
     flex-direction: column;
338
     flex-direction: column;
341
-    width: 36px;
342
     justify-content: space-between;
339
     justify-content: space-between;
343
-    margin-top: 2em;
340
+    margin-top: 5em;
344
 
341
 
345
     img {
342
     img {
346
       width: 36px;
343
       width: 36px;

+ 5
- 13
src/pages/Honghe.vue View File

17
         </div>
17
         </div>
18
       </div>
18
       </div>
19
     </div>
19
     </div>
20
-    <img class="bottomImage" src="../assets/indexImg/loading_bar.png" alt />
21
   </div>
20
   </div>
22
 </template>
21
 </template>
23
 
22
 
158
       showPopup: false,
157
       showPopup: false,
159
       showMyWinning: false,
158
       showMyWinning: false,
160
       prizeList: [],
159
       prizeList: [],
161
-      clickNum: 0,
162
-      bingoClickNum: rand(0, 12),
160
+      bingoId: rand(0, 12) + 1, // 可以抽奖的月份
163
       prizeIds: null
161
       prizeIds: null
164
     }
162
     }
165
   },
163
   },
212
       )
210
       )
213
 
211
 
214
       // 如果点击可以抽奖
212
       // 如果点击可以抽奖
215
-      if (this.clickNum === this.bingoClickNum) {
213
+      if (month.id === this.bingoId) {
216
         if (!this.person.personId) {
214
         if (!this.person.personId) {
217
           // 报错, 提示刷新页面
215
           // 报错, 提示刷新页面
218
         } else {
216
         } else {
226
       } else {
224
       } else {
227
         this.showPopup = true
225
         this.showPopup = true
228
       }
226
       }
229
-
230
-      if (this.clickNum < this.bingoClickNum) {
231
-        this.clickNum += 1
232
-      }
233
     },
227
     },
234
     // 抽奖
228
     // 抽奖
235
     drawLots() {
229
     drawLots() {
279
     z-index: 2;
273
     z-index: 2;
280
   }
274
   }
281
   .topImage {
275
   .topImage {
282
-    width: 100vw;
283
-  }
284
-  .bottomImage {
276
+    padding-top: 2em;
285
     width: 100vw;
277
     width: 100vw;
286
   }
278
   }
287
   .outer6-wrapper {
279
   .outer6-wrapper {
288
     width: 92vw;
280
     width: 92vw;
289
     border: 1px solid #d0b69a;
281
     border: 1px solid #d0b69a;
290
-    margin: 0 auto;
282
+    margin: 0 auto 2em;
291
 
283
 
292
     .outer6 {
284
     .outer6 {
293
       flex-flow: row wrap;
285
       flex-flow: row wrap;
294
       align-content: flex-start;
286
       align-content: flex-start;
295
       z-index: 2;
287
       z-index: 2;
296
-      background-color: #9c0014;
288
+      background-color: #b12b32;
297
       align-self: center;
289
       align-self: center;
298
       width: 90vw;
290
       width: 90vw;
299
       margin: 3px auto;
291
       margin: 3px auto;

+ 0
- 1
src/pages/SaveShare.vue View File

181
       width: 98vw;
181
       width: 98vw;
182
       overflow: hidden;
182
       overflow: hidden;
183
       align-self: center;
183
       align-self: center;
184
-      margin-top: 1vw;
185
       margin-left: 0;
184
       margin-left: 0;
186
       .subhaibao {
185
       .subhaibao {
187
         // position: absolute;
186
         // position: absolute;