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

src/components/CalendarPoster.vue

@@ -42,11 +42,12 @@
               </div>
               <div class="wrap5 flex-col">
                 <span class="txt1" :style="`background-image: url(${pressLucky});`"></span>
-                <div
+                <!-- <div
                   class="main5-month flex-col"
                   :style="`background-image: url(${shaerButRed});`"
                   @click="()=>{this.shaerShow=true}"
-                ></div>
+                ></div> -->
+              <img class="main5-month flex-col" :src="shaerButRed" @click="()=>{this.shaerShow=true}" />
               </div>
             </div>
           </div>
@@ -191,8 +192,8 @@ export default {
 
   // 内容层 z-index要比遮罩大，否则会被遮盖
   .backhome {
-    width: 85px;
-    height: 42px;
+    width: 80.5px;
+    height: 37.8px;
     position: fixed;
     left: 1rem;
     top: 1rem;
@@ -287,17 +288,11 @@ export default {
       }
 
       .main5-month {
-        background-position: 50% 50%;
-        background-repeat: no-repeat;
-        height: 43.2px;
-        border-radius: 8px;
-        margin-top: 11px;
-        width: 308.7px;
-        background-color: #b02c32;
-        border: 0;
+        height: 8.64vw;
+        width: 86.4vw;
+        bottom: 5vh;        
         position: fixed;
         z-index: 15;
-        bottom: 4vh;
       }
     }
   }

src/components/MyWinning.vue

@@ -7,30 +7,33 @@
         @click="cancelPopupts"
       ></div>
       <div>
-        <div v-if="Prize!=undefined">
-          <!-- 领取屏保 -->
-          <div class="outer3 flex-col">
-            <div class="haibao">
-              <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 v-show="!PrizeShow">
+          <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>
             </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/notPrize.jpg" class="subhaibao" />
-                <!-- 没有奖品 -->
+          <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>
-        <div v-if="PrizeState==2" style="overflow: auto;height:100vh;">
+
+        <div v-show="PrizeShow" style="overflow: auto;height:100vh;">
           <div class="page flex-col">
             <div class="group1 flex-col">
               <div class="wrap3 flex-col">
@@ -69,11 +72,11 @@ export default {
       type: Object
     },
     PrizeState: {
-      type: Number
+      type: [Number || Boolean]
     },
     Prize: {
-      type: Object
-      // default: () => ({})
+      type: Object,
+      default: () => ({})
     },
     prizeList: {
       type: Array
@@ -87,7 +90,8 @@ export default {
       shaerBut: require('../assets/buttonImg/sayFriend.png'),
       pressImage: require('../assets/buttonImg/pressSave.png'),
       shaerButRed: require('../assets/buttonImg/sayFriend.png'),
-      pressLucky: require('../assets/buttonImg/happyAccept.png')
+      pressLucky: require('../assets/buttonImg/happyAccept.png'),
+      PrizeShow: null
     }
   },
 
@@ -110,7 +114,17 @@ 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
@@ -189,8 +203,8 @@ export default {
 
   // 内容层 z-index要比遮罩大，否则会被遮盖
   .backhome {
-    width: 85px;
-    height: 42px;
+    width: 80.5px;
+    height: 37.8px;
     position: fixed;
     left: 1rem;
     top: 1rem;
@@ -198,24 +212,29 @@ export default {
     background-repeat: no-repeat !important;
   }
   .outer3 {
-    width: 100vw;
+    width: 100%;
     height: 100vh;
     justify-content: flex-end;
-    .haibao {
-      width: 100vw;
+    .haibao-box {
+      width: 100%;
+      height: 100vh;
+
       position: absolute;
       left: 0;
       top: 0;
+      .haibao {
+        width: 100%;
+      }
       .haibao-jiangping {
         // border: 1px solid black;
-        width: 110vw;
-        height: 65vw;
+        width: 100vw;
+        height: 60vw;
         position: relative;
         margin: 0 auto;
         display: flex;
         top: 18vh;
         position: absolute;
-        left: -9vw;
+        // left: -9vw;
         img {
           width: 100%;
           height: 100%;

src/components/Popup.vue

@@ -97,7 +97,7 @@ export default {
       required: false
     },
     PrizeState: {
-      type: Number
+      type: [Number || Boolean]
     },
     prizeList: {
       type: Array

src/pages/Honghe.vue

@@ -230,10 +230,12 @@ export default {
   },
   methods: {
     noShowMy() {
-      if (this.noPrize) {
+      if (this.person.prizeId !== '' && this.noPrize) {
         console.log('有奖品')
       } else {
-        this.PrizeState = 2
+        this.PrizeState = true
+
+        console.log('没有奖品')
       }
     },
     //关闭

src/pages/SaveShare.vue

@@ -111,8 +111,8 @@ export default {
   flex-direction: column;
 }
 .backhome {
-  width: 85px;
-  height: 42px;
+  width: 80.5px;
+  height: 37.8px;
   position: fixed;
   left: 1rem;
   top: 1rem;