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

.gitignore

@@ -1,7 +1,7 @@
 .DS_Store
 node_modules
 /dist
-
+*.mp3
 
 # local env files
 .env.local

src/components/BgMusic.vue

@@ -0,0 +1,25 @@
+<template>
+  <div class="bg-music">
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BgMusic',
+  data() {
+    const { origin, pathname } = window.location
+
+    return {
+      url: `${origin}${pathname}/bg.mp3`
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.bg-music {
+  width: 64px;
+  height: 64px;
+}
+</style>

src/components/CalendarPoster.vue

@@ -263,7 +263,6 @@ export default {
         width: 100vw;
         overflow: hidden;
         align-self: center;
-        margin-top: 1vw;
         margin-left: 0;
         .subhaibao {
           // position: absolute;

src/components/MyWinning.vue

@@ -236,7 +236,6 @@ export default {
         width: 100vw;
         overflow: hidden;
         align-self: center;
-        margin-top: 1vw;
         margin-left: 0;
         .subhaibao {
           // position: absolute;

src/components/Popup.vue

@@ -333,14 +333,11 @@ export default {
   }
   .section-box {
     position: absolute;
-    right: 15vw;
-    top: 57px;
-    height: 394px;
+    left: 82vw;
     display: flex;
     flex-direction: column;
-    width: 36px;
     justify-content: space-between;
-    margin-top: 2em;
+    margin-top: 5em;
 
     img {
       width: 36px;

src/pages/Honghe.vue

@@ -17,7 +17,6 @@
         </div>
       </div>
     </div>
-    <img class="bottomImage" src="../assets/indexImg/loading_bar.png" alt />
   </div>
 </template>
 
@@ -158,8 +157,7 @@ export default {
       showPopup: false,
       showMyWinning: false,
       prizeList: [],
-      clickNum: 0,
-      bingoClickNum: rand(0, 12),
+      bingoId: rand(0, 12) + 1, // 可以抽奖的月份
       prizeIds: null
     }
   },
@@ -212,7 +210,7 @@ export default {
       )
 
       // 如果点击可以抽奖
-      if (this.clickNum === this.bingoClickNum) {
+      if (month.id === this.bingoId) {
         if (!this.person.personId) {
           // 报错, 提示刷新页面
         } else {
@@ -226,10 +224,6 @@ export default {
       } else {
         this.showPopup = true
       }
-
-      if (this.clickNum < this.bingoClickNum) {
-        this.clickNum += 1
-      }
     },
     // 抽奖
     drawLots() {
@@ -279,21 +273,19 @@ export default {
     z-index: 2;
   }
   .topImage {
-    width: 100vw;
-  }
-  .bottomImage {
+    padding-top: 2em;
     width: 100vw;
   }
   .outer6-wrapper {
     width: 92vw;
     border: 1px solid #d0b69a;
-    margin: 0 auto;
+    margin: 0 auto 2em;
 
     .outer6 {
       flex-flow: row wrap;
       align-content: flex-start;
       z-index: 2;
-      background-color: #9c0014;
+      background-color: #b12b32;
       align-self: center;
       width: 90vw;
       margin: 3px auto;

src/pages/SaveShare.vue

@@ -181,7 +181,6 @@ export default {
       width: 98vw;
       overflow: hidden;
       align-self: center;
-      margin-top: 1vw;
       margin-left: 0;
       .subhaibao {
         // position: absolute;