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

src/components/MyWinning.vue

@@ -7,6 +7,16 @@
         @click="cancelPopupts"
       ></div>
       <div>
+        <div v-if="PrizeState==2" style="overflow: auto;height:100vh;">
+          <div class="page flex-col">
+            <div class="group1 flex-col">
+              <div class="wrap3 flex-col">
+                <img src="../assets/prizeImg/activityOver.jpg" class="subhaibao" />
+                <!-- 活动结束 -->
+              </div>
+            </div>
+          </div>
+        </div>
         <div v-if="Prize!=undefined">
           <!-- 领取屏保 -->
           <div class="outer3 flex-col">
@@ -30,16 +40,6 @@
             </div>
           </div>
         </div>
-        <div v-if="PrizeState===2" style="overflow: auto;height:100vh;">
-          <div class="page flex-col">
-            <div class="group1 flex-col">
-              <div class="wrap3 flex-col">
-                <img src="../assets/prizeImg/activityOver.jpg" class="subhaibao" />
-                <!-- 活动结束 -->
-              </div>
-            </div>
-          </div>
-        </div>
       </div>
     </div>
   </div>
@@ -74,6 +74,9 @@ export default {
     Prize: {
       type: Object
       // default: () => ({})
+    },
+    prizeList: {
+      type: Array
     }
   },
 

src/components/Popup.vue

@@ -14,6 +14,7 @@
       :current-month="currentMonth"
       :PrizeState="PrizeState"
       :Prize="isPrize"
+      :prizeList="prizeList"
     />
     <div class="dialog-mark" @click.self="closeMyself">
       <div v-show="myShareShow" class="sharetiptxt" style>
@@ -96,6 +97,9 @@ export default {
     },
     PrizeState: {
       type: Number
+    },
+    prizeList: {
+      type: Array
     }
     // LoadingShow: {
     //   type: Boolean,

src/pages/Honghe.vue

@@ -7,6 +7,7 @@
       :current-month="currentMonth"
       :is-prize="myPrize"
       :PrizeState="PrizeState"
+      :prizeList="prizeList"
     />
 
     <WinningPopup
@@ -258,9 +259,9 @@ export default {
 
       // 如果点击可以抽奖
       if (month.id === this.bingoId && !this.noPrize) {
-        if (this.person.prizeId) {
-          this.PrizeState = 0
-        }
+        // if (!this.noPrize) {
+        //   this.PrizeState = 2
+        // }
 
         if (!this.person.personId) {
           // 报错, 提示刷新页面