fix

src/components/MyWinning.vue

@@ -7,7 +7,7 @@
         @click="cancelPopupts"
       ></div>
       <div>
-        <div v-if="PrizeState===0">
+        <div v-if="Prize!=undefined">
           <!-- 领取屏保 -->
           <div class="outer3 flex-col">
             <div class="haibao">
@@ -21,11 +21,21 @@
           </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/notPrize.jpg" class="subhaibao" />
+                <!-- 没有奖品 -->
+              </div>
+            </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>
@@ -63,6 +73,7 @@ export default {
     },
     Prize: {
       type: Object
+      // default: () => ({})
     }
   },
 
@@ -79,7 +90,10 @@ export default {
 
   watch: {
     stater(val, res) {
-      console.log('🚀 ~ file: CalendarPoster.vue ~ line 98 ~ stater ~ res', res)
+      console.log(
+        '🚀 ~ file: CalendarPoster.vue ~ line 98 ~ stater ~ res',
+        this.Prize
+      )
     },
     created() {
       // this.showSelf = this.show

src/components/Popup.vue

@@ -41,7 +41,7 @@
           </div>
           <!-- 右侧 -->
           <div class="section-box">
-            <div class="section-box-share" @click="()=>{this.MyWinningShow=true}" v-if="isPrize">
+            <div class="section-box-share" @click="()=>{this.MyWinningShow=true}">
               <img src="../assets/buttonImg/myPrize.png" alt />
             </div>
             <div
@@ -117,9 +117,7 @@ export default {
   },
   watch: {
     show(val) {
-      console.log(this.isPrize, 'aaaaaaaaaaaa')
-
-      console.log('🚀 ~ file: Popup.vue ~ line 78 ~ show ~ val', val)
+      console.log('🚀 ~ file: Popup.vue ~ line 78 ~ show ~ val', this.isPrize)
       this.showSelf = val
       if (this.show === false) {
         this.myShareShow = false

src/pages/Honghe.vue

@@ -175,7 +175,7 @@ export default {
       prizeList: [],
       bingoId: rand(0, 12) + 1, // 可以抽奖的月份
       NOMyWinningShow: true,
-      PrizeState: 0
+      PrizeState: null
     }
   },
   computed: {
@@ -197,7 +197,7 @@ export default {
       return undefined
     },
     noPrize() {
-      if (this.prizeList.length && this.person.prizeId) {
+      if (this.prizeList.length) {
         return this.prizeList.reduce((sum, x) => x.exitsNum + sum, 0) <= 0
       }
 
@@ -258,7 +258,10 @@ export default {
 
       // 如果点击可以抽奖
       if (month.id === this.bingoId && !this.noPrize) {
-        //------------奖品没了-------------------------------------------
+        if (this.person.prizeId) {
+          this.PrizeState = 0
+        }
+
         if (!this.person.personId) {
           // 报错, 提示刷新页面
         } else {
@@ -271,6 +274,7 @@ export default {
         }
       } else {
         this.showPopup = true
+        this.PrizeState = 2
       }
     },
     // 抽奖
@@ -280,13 +284,15 @@ export default {
           // 更新人员信息
           this.person = res
           this.showMyWinning = true
+          // this.PrizeState = 0
+
           console.log('showMyWinning-----------')
 
           // 其他动作
         })
         .catch((err) => {
           if (err && err.code === 9999) {
-            this.PrizeState = 1
+            this.PrizeState = 2
 
             // 奖品没了
           } else {

vue.config.js

@@ -11,7 +11,7 @@ module.exports = {
   devServer: {
     proxy: {
       '/api': {
-        target: "http://192.168.89.147:8080/",
+        target: "http://192.168.89.147:9000/",
         // ws: true,
         changeOrigin: true,
         // pathRewrite: {