Baozhangchao 3 years ago
parent
commit
24f1727019
3 changed files with 21 additions and 13 deletions
  1. 13
    10
      src/components/MyWinning.vue
  2. 4
    0
      src/components/Popup.vue
  3. 4
    3
      src/pages/Honghe.vue

+ 13
- 10
src/components/MyWinning.vue View File

7
         @click="cancelPopupts"
7
         @click="cancelPopupts"
8
       ></div>
8
       ></div>
9
       <div>
9
       <div>
10
+        <div v-if="PrizeState==2" style="overflow: auto;height:100vh;">
11
+          <div class="page flex-col">
12
+            <div class="group1 flex-col">
13
+              <div class="wrap3 flex-col">
14
+                <img src="../assets/prizeImg/activityOver.jpg" class="subhaibao" />
15
+                <!-- 活动结束 -->
16
+              </div>
17
+            </div>
18
+          </div>
19
+        </div>
10
         <div v-if="Prize!=undefined">
20
         <div v-if="Prize!=undefined">
11
           <!-- 领取屏保 -->
21
           <!-- 领取屏保 -->
12
           <div class="outer3 flex-col">
22
           <div class="outer3 flex-col">
30
             </div>
40
             </div>
31
           </div>
41
           </div>
32
         </div>
42
         </div>
33
-        <div v-if="PrizeState===2" style="overflow: auto;height:100vh;">
34
-          <div class="page flex-col">
35
-            <div class="group1 flex-col">
36
-              <div class="wrap3 flex-col">
37
-                <img src="../assets/prizeImg/activityOver.jpg" class="subhaibao" />
38
-                <!-- 活动结束 -->
39
-              </div>
40
-            </div>
41
-          </div>
42
-        </div>
43
       </div>
43
       </div>
44
     </div>
44
     </div>
45
   </div>
45
   </div>
74
     Prize: {
74
     Prize: {
75
       type: Object
75
       type: Object
76
       // default: () => ({})
76
       // default: () => ({})
77
+    },
78
+    prizeList: {
79
+      type: Array
77
     }
80
     }
78
   },
81
   },
79
 
82
 

+ 4
- 0
src/components/Popup.vue View File

14
       :current-month="currentMonth"
14
       :current-month="currentMonth"
15
       :PrizeState="PrizeState"
15
       :PrizeState="PrizeState"
16
       :Prize="isPrize"
16
       :Prize="isPrize"
17
+      :prizeList="prizeList"
17
     />
18
     />
18
     <div class="dialog-mark" @click.self="closeMyself">
19
     <div class="dialog-mark" @click.self="closeMyself">
19
       <div v-show="myShareShow" class="sharetiptxt" style>
20
       <div v-show="myShareShow" class="sharetiptxt" style>
94
     },
95
     },
95
     PrizeState: {
96
     PrizeState: {
96
       type: Number
97
       type: Number
98
+    },
99
+    prizeList: {
100
+      type: Array
97
     }
101
     }
98
     // LoadingShow: {
102
     // LoadingShow: {
99
     //   type: Boolean,
103
     //   type: Boolean,

+ 4
- 3
src/pages/Honghe.vue View File

7
       :current-month="currentMonth"
7
       :current-month="currentMonth"
8
       :is-prize="myPrize"
8
       :is-prize="myPrize"
9
       :PrizeState="PrizeState"
9
       :PrizeState="PrizeState"
10
+      :prizeList="prizeList"
10
     />
11
     />
11
 
12
 
12
     <WinningPopup
13
     <WinningPopup
258
 
259
 
259
       // 如果点击可以抽奖
260
       // 如果点击可以抽奖
260
       if (month.id === this.bingoId && !this.noPrize) {
261
       if (month.id === this.bingoId && !this.noPrize) {
261
-        if (this.person.prizeId) {
262
-          this.PrizeState = 0
263
-        }
262
+        // if (!this.noPrize) {
263
+        //   this.PrizeState = 2
264
+        // }
264
 
265
 
265
         if (!this.person.personId) {
266
         if (!this.person.personId) {
266
           // 报错, 提示刷新页面
267
           // 报错, 提示刷新页面