feats

src/components/MyWinning.vue

@@ -6,38 +6,39 @@
         :style="`background:url('${backimg}');background-size: 100% auto;`"
         @click="cancelPopupts"
       ></div>
+
       <div>
-        <div v-if="!PrizeShow&& Prize!=undefined">
-          <div v-if="Prize.prizeId!=undefined">
-            <!-- 领取奖品-->
-            <div class="outer3 flex-col" style="overflow: auto;height:100vh;">
-              <div class="haibao-box" style="overflow: auto;height:100vh;">
-                <img class="haibao" src="../assets/prizeImg/MyPrize.jpg" alt />
-                <div class="haibao-jiangping">
-                  <img v-if="Prize" :src="`${Prize.thumb2}`" alt />
-                  <h1 v-else>暂无奖品</h1>
-                </div>
+        <!-- 领取奖品-->
+        <div v-if="Prize && Prize.prizeId">
+          <div class="outer3 flex-col" style="overflow: auto;height:100vh;">
+            <div class="haibao-box" style="overflow: auto;height:100vh;">
+              <img class="haibao" src="../assets/prizeImg/MyPrize.jpg" alt />
+              <div class="haibao-jiangping">
+                <img v-if="Prize" :src="`${Prize.thumb2}`" alt />
               </div>
             </div>
           </div>
-          <div v-else style="overflow: auto;height:100vh;">
+        </div>
+
+        <!-- 没有抽奖 -->
+        <div v-if="!noPrize && (!Prize || !Prize.prizeId)">
+          <div style="overflow: auto;height:100vh;">
             <div class="page flex-col">
               <div class="group1 flex-col">
                 <div class="wrap3 flex-col">
                   <img src="../assets/prizeImg/notPrize.jpg" class="subhaibao" />
-                  <!-- 没有抽奖 -->
                 </div>
               </div>
             </div>
           </div>
         </div>
 
+        <!-- 没有奖品 -->
         <div v-else 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>
@@ -64,22 +65,11 @@ export default {
       default: '取消',
       required: false
     },
-    currentMonth: {
-      type: Object
-    },
-    currentPerson: {
-      type: Object
-    },
-    PrizeState: {
-      type: [Number || Boolean]
-    },
     Prize: {
       type: Object,
       default: () => ({})
     },
-    prizeList: {
-      type: Array
-    }
+    noPrize: Boolean
   },
 
   data() {
@@ -113,17 +103,7 @@ export default {
       }
     }
   },
-  created() {
-    this.noShowMy()
-  },
   methods: {
-    noShowMy() {
-      let a = this.prizeList.reduce((sum, x) => x.exitsNum + sum, 0) <= 0
-      this.PrizeShow = a
-      console.log('🚀 ~ file: MyWinning.vue ~ line 119 ~ noShowMy ~ a', a)
-      // if (this.Prize.prizeId==''&& ) {
-      // }
-    },
     /** 取消按钮操作 */
     cancelPopupts() {
       // this.shaerShow = false

src/components/Popup.vue

@@ -12,9 +12,8 @@
       :show="MyWinningShow"
       @cancelPopus="canclMyWinning"
       :current-month="currentMonth"
-      :PrizeState="PrizeState"
       :Prize="isPrize"
-      :prizeList="prizeList"
+      :no-prize="noPrize"
     />
     <div class="dialog-mark" @click.self="closeMyself">
       <div v-show="myShareShow" class="sharetiptxt" style>
@@ -101,7 +100,8 @@ export default {
     },
     prizeList: {
       type: Array
-    }
+    },
+    noPrize: Boolean
     // LoadingShow: {
     //   type: Boolean,
     //   default: false,

src/pages/Honghe.vue

@@ -8,6 +8,7 @@
       :is-prize="myPrize"
       :PrizeState="PrizeState"
       :prizeList="prizeList"
+      :no-prize="noPrize"
     />
 
     <WinningPopup