Baozhangchao 3 年前
父节点
当前提交
0f883fa0a6
共有 3 个文件被更改,包括 19 次插入38 次删除
  1. 15
    35
      src/components/MyWinning.vue
  2. 3
    3
      src/components/Popup.vue
  3. 1
    0
      src/pages/Honghe.vue

+ 15
- 35
src/components/MyWinning.vue 查看文件

6
         :style="`background:url('${backimg}');background-size: 100% auto;`"
6
         :style="`background:url('${backimg}');background-size: 100% auto;`"
7
         @click="cancelPopupts"
7
         @click="cancelPopupts"
8
       ></div>
8
       ></div>
9
+
9
       <div>
10
       <div>
10
-        <div v-if="!PrizeShow&& Prize!=undefined">
11
-          <div v-if="Prize.prizeId!=undefined">
12
-            <!-- 领取奖品-->
13
-            <div class="outer3 flex-col" style="overflow: auto;height:100vh;">
14
-              <div class="haibao-box" style="overflow: auto;height:100vh;">
15
-                <img class="haibao" src="../assets/prizeImg/MyPrize.jpg" alt />
16
-                <div class="haibao-jiangping">
17
-                  <img v-if="Prize" :src="`${Prize.thumb2}`" alt />
18
-                  <h1 v-else>暂无奖品</h1>
19
-                </div>
11
+        <!-- 领取奖品-->
12
+        <div v-if="Prize && Prize.prizeId">
13
+          <div class="outer3 flex-col" style="overflow: auto;height:100vh;">
14
+            <div class="haibao-box" style="overflow: auto;height:100vh;">
15
+              <img class="haibao" src="../assets/prizeImg/MyPrize.jpg" alt />
16
+              <div class="haibao-jiangping">
17
+                <img v-if="Prize" :src="`${Prize.thumb2}`" alt />
20
               </div>
18
               </div>
21
             </div>
19
             </div>
22
           </div>
20
           </div>
23
-          <div v-else style="overflow: auto;height:100vh;">
21
+        </div>
22
+
23
+        <!-- 没有抽奖 -->
24
+        <div v-if="!noPrize && (!Prize || !Prize.prizeId)">
25
+          <div style="overflow: auto;height:100vh;">
24
             <div class="page flex-col">
26
             <div class="page flex-col">
25
               <div class="group1 flex-col">
27
               <div class="group1 flex-col">
26
                 <div class="wrap3 flex-col">
28
                 <div class="wrap3 flex-col">
27
                   <img src="../assets/prizeImg/notPrize.jpg" class="subhaibao" />
29
                   <img src="../assets/prizeImg/notPrize.jpg" class="subhaibao" />
28
-                  <!-- 没有抽奖 -->
29
                 </div>
30
                 </div>
30
               </div>
31
               </div>
31
             </div>
32
             </div>
32
           </div>
33
           </div>
33
         </div>
34
         </div>
34
 
35
 
36
+        <!-- 没有奖品 -->
35
         <div v-else style="overflow: auto;height:100vh;">
37
         <div v-else style="overflow: auto;height:100vh;">
36
           <div class="page flex-col">
38
           <div class="page flex-col">
37
             <div class="group1 flex-col">
39
             <div class="group1 flex-col">
38
               <div class="wrap3 flex-col">
40
               <div class="wrap3 flex-col">
39
                 <img src="../assets/prizeImg/activityOver.jpg" class="subhaibao" />
41
                 <img src="../assets/prizeImg/activityOver.jpg" class="subhaibao" />
40
-                <!-- 没有奖品 -->
41
               </div>
42
               </div>
42
             </div>
43
             </div>
43
           </div>
44
           </div>
64
       default: '取消',
65
       default: '取消',
65
       required: false
66
       required: false
66
     },
67
     },
67
-    currentMonth: {
68
-      type: Object
69
-    },
70
-    currentPerson: {
71
-      type: Object
72
-    },
73
-    PrizeState: {
74
-      type: [Number || Boolean]
75
-    },
76
     Prize: {
68
     Prize: {
77
       type: Object,
69
       type: Object,
78
       default: () => ({})
70
       default: () => ({})
79
     },
71
     },
80
-    prizeList: {
81
-      type: Array
82
-    }
72
+    noPrize: Boolean
83
   },
73
   },
84
 
74
 
85
   data() {
75
   data() {
113
       }
103
       }
114
     }
104
     }
115
   },
105
   },
116
-  created() {
117
-    this.noShowMy()
118
-  },
119
   methods: {
106
   methods: {
120
-    noShowMy() {
121
-      let a = this.prizeList.reduce((sum, x) => x.exitsNum + sum, 0) <= 0
122
-      this.PrizeShow = a
123
-      console.log('🚀 ~ file: MyWinning.vue ~ line 119 ~ noShowMy ~ a', a)
124
-      // if (this.Prize.prizeId==''&& ) {
125
-      // }
126
-    },
127
     /** 取消按钮操作 */
107
     /** 取消按钮操作 */
128
     cancelPopupts() {
108
     cancelPopupts() {
129
       // this.shaerShow = false
109
       // this.shaerShow = false

+ 3
- 3
src/components/Popup.vue 查看文件

12
       :show="MyWinningShow"
12
       :show="MyWinningShow"
13
       @cancelPopus="canclMyWinning"
13
       @cancelPopus="canclMyWinning"
14
       :current-month="currentMonth"
14
       :current-month="currentMonth"
15
-      :PrizeState="PrizeState"
16
       :Prize="isPrize"
15
       :Prize="isPrize"
17
-      :prizeList="prizeList"
16
+      :no-prize="noPrize"
18
     />
17
     />
19
     <div class="dialog-mark" @click.self="closeMyself">
18
     <div class="dialog-mark" @click.self="closeMyself">
20
       <div v-show="myShareShow" class="sharetiptxt" style>
19
       <div v-show="myShareShow" class="sharetiptxt" style>
101
     },
100
     },
102
     prizeList: {
101
     prizeList: {
103
       type: Array
102
       type: Array
104
-    }
103
+    },
104
+    noPrize: Boolean
105
     // LoadingShow: {
105
     // LoadingShow: {
106
     //   type: Boolean,
106
     //   type: Boolean,
107
     //   default: false,
107
     //   default: false,

+ 1
- 0
src/pages/Honghe.vue 查看文件

8
       :is-prize="myPrize"
8
       :is-prize="myPrize"
9
       :PrizeState="PrizeState"
9
       :PrizeState="PrizeState"
10
       :prizeList="prizeList"
10
       :prizeList="prizeList"
11
+      :no-prize="noPrize"
11
     />
12
     />
12
 
13
 
13
     <WinningPopup
14
     <WinningPopup