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

src/components/MyWinning.vue

@@ -18,35 +18,7 @@
           <!-- 领取屏保 -->
           <div class="outer3 flex-col">
             <div class="haibao">
-              <img class="haibao" :src="currentMonth.calendarImg" alt />
-            </div>
-            <div class="mod2 flex-col">
-              <!-- <div class="block1 flex-col">
-                <div
-                  class="section1 flex-col"
-                  @click="()=>{this.shaerShow=true}"
-                  :style="`background-image: url(${shaerBut});`"
-                ></div>
-                <span :style="`background-image: url(${pressImage});`" class="info2"></span>
-              </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="currentMonth.calendarImg" class="subhaibao" />
-              </div>
-              <!-- <div class="wrap5 flex-col">
-                <span class="txt1" :style="`background-image: url(${pressLucky});`"></span>
-                <div
-                  class="main5 flex-col"
-                  :style="`background-image: url(${shaerButRed});`"
-                  @click="()=>{this.shaerShow=true}"
-                ></div>
-              </div>-->
+              <img class="haibao" src="../assets/prizeImg/MyPrize.jpg" alt />
             </div>
           </div>
         </div>
@@ -59,7 +31,7 @@
 import { hideLoading } from '@/utils'
 
 export default {
-  name: 'CalendarPoster',
+  name: 'MyWinning',
   components: {
     ShaerPopup: () => import('@/components/ShaerPopup.vue')
   },
@@ -74,6 +46,9 @@ export default {
       default: '取消',
       required: false
     },
+    currentMonth: {
+      type: Object
+    },
     currentPerson: {
       type: Object
     },

src/components/Popup.vue

@@ -8,7 +8,7 @@
     />
 
     <!-- 我的奖品 -->
-    <MyWinning :show="MyWinningShow" @cancel="canclMyWinning" :current-month="currentMonth" />
+    <MyWinning :show="MyWinningShow" @cancelPopus="canclMyWinning" :current-month="currentMonth" />
 
     <div class="dialog-mark" @click.self="closeMyself">
       <div v-show="myShareShow" class="sharetiptxt" style>
@@ -36,7 +36,7 @@
           </div>
           <!-- 右侧 -->
           <div class="section-box">
-            <div class="section-box-share" @click="()=>{this.MyWinningShow=true}">
+            <div class="section-box-share" @click="()=>{this.MyWinningShow=true}" v-if="isPrize">
               <img src="../assets/buttonImg/myPrize.png" alt />
             </div>
             <div
@@ -74,6 +74,9 @@ export default {
     currentMonth: {
       type: Object
     },
+    isPrize: {
+      type: Object
+    },
     showCancel: {
       typs: Boolean,
       default: false,
@@ -111,6 +114,8 @@ export default {
   },
   watch: {
     show(val) {
+      console.log(this.isPrize, 'aaaaaaaaaaaa')
+
       console.log('🚀 ~ file: Popup.vue ~ line 78 ~ show ~ val', val)
       this.showSelf = val
       if (this.show === false) {

src/components/WinningPopup.vue

@@ -41,7 +41,7 @@
 
 <script>
 export default {
-  name: 'Popup',
+  name: 'WinningPopup',
   components: {},
   props: {
     show: {
@@ -196,17 +196,6 @@ export default {
     }
   }
 }
-@keyframes tipup {
-  0% {
-    transform: translateY(0%);
-  }
-  50% {
-    transform: translateY(5%);
-  }
-  100% {
-    transform: translateY(0%);
-  }
-}
 
 .dialog-sprite {
   width: 100vw;
@@ -265,24 +254,10 @@ export default {
         }
       }
       .flipped {
-        animation: change 0.8s linear forwards;
-      }
-    }
-    @keyframes change {
-      from {
-        top: -20vh;
-        left: -20vw;
-        opacity: 0;
-        transform: scale(0.5);
-      }
-      to {
-        top: -0;
-        left: -0;
-        opacity: 2;
-        transform: scale(1);
-        transform: rotateY(180deg);
+        // animation: change 0.8s linear forwards;
       }
     }
+
     //底部按钮
     .dialog-footer {
       width: 140px;

src/pages/Honghe.vue

@@ -1,8 +1,13 @@
 <template>
   <div class="index-box">
     <bg-music />
-    <popup :show="showPopup" @cancel="cancelFrom" :current-month="currentMonth" />
-    <MyWinning :show="showMyWinning" :current-month="currentMonth" />
+    <popup
+      :show="showPopup"
+      @cancel="cancelFrom"
+      :current-month="currentMonth"
+      :is-prize="myPrize"
+    />
+    <WinningPopup :show="showMyWinning" @cancel="cancelWinnint" :current-person="person" />
     <img class="topImage" src="../assets/indexImg/indexBgctop.jpg" alt />
     <div class="outer6-wrapper">
       <div class="outer6 flex-col">
@@ -166,6 +171,15 @@ export default {
       set(val) {
         useModel('person')[1](val)
       }
+    },
+    myPrize() {
+      if (this.prizeList.length && this.person.prizeId) {
+        return this.prizeList.filter(
+          (x) => x.prizeId === this.person.prizeId
+        )[0]
+      }
+
+      return undefined
     }
   },
   created() {
@@ -191,13 +205,11 @@ export default {
         }
       })
       this.currentMonth = month
-      this.showMyWinning = true
 
       console.log(
         '🚀 ~ file: Honghe.vue ~ line 193 ~ handleMonthClick ~ month',
         month
       )
-      
 
       // 如果点击可以抽奖
       if (month.id === this.bingoId) {
@@ -220,6 +232,7 @@ export default {
       drawLottery(this.person).then((res) => {
         // 更新人员信息
         this.person = res
+        this.showMyWinning = true
 
         // 其他动作
       })