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

src/components/CalendarPoster.vue

@@ -222,21 +222,20 @@ export default {
       padding-bottom: 33px;
       align-items: center;
       .block1 {
-        width: 180px;
         height: 113px;
         .section1 {
-          height: 84px;
+          height: 75.6px;
           border-radius: 8px;
           background-size: 100% auto;
           background-color: #fff;
-          width: 180px;
+          width: 162px;
           justify-content: center;
           align-items: center;
           border: 0;
         }
         .info2 {
-          width: 156px;
-          height: 60px;
+          width: 140.4px;
+          height: 54px;
           display: block;
           color: #fff;
           text-align: center;
@@ -281,20 +280,19 @@ export default {
         .txt1 {
           background-size: 100% auto;
           background-repeat: no-repeat;
-          width: 160px;
-          height: 48px;
+          width: 152.1px;
+          height: 43.2px;
           margin-bottom: 80px;
         }
       }
 
       .main5-month {
-        // background-size: 100% 100%;
         background-position: 50% 50%;
         background-repeat: no-repeat;
-        height: 48px;
+        height: 43.2px;
         border-radius: 8px;
         margin-top: 11px;
-        width: 343px;
+        width: 308.7px;
         background-color: #b02c32;
         border: 0;
         position: fixed;

src/components/MyWinning.vue

@@ -1,20 +1,13 @@
 <template>
   <div v-if="show" class="dialog-my">
     <div style=" height:100vh; width:100%;">
-      <!-- 弹窗 -->
-      <!-- <ShaerPopup :show="shaerShow" @closeMyself="cancelPopup" /> -->
-      <!-- 弹窗 -->
-
-      <!-- <router-link :to="{path:'/'}"> -->
       <div
         class="backhome"
         :style="`background:url('${backimg}');background-size: 100% auto;`"
         @click="cancelPopupts"
       ></div>
-      <!-- </router-link> -->
-
       <div>
-        <div v-if="PrizeState===0">
+        <div v-if="Prize!=undefined">
           <!-- 领取屏保 -->
           <div class="outer3 flex-col">
             <div class="haibao">
@@ -28,20 +21,22 @@
           </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 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>-->
             </div>
           </div>
         </div>
@@ -78,6 +73,7 @@ export default {
     },
     Prize: {
       type: Object
+      // default: () => ({})
     }
   },
 
@@ -94,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
@@ -112,7 +111,6 @@ export default {
     /** 取消按钮操作 */
     cancelPopupts() {
       // this.shaerShow = false
-      // console.log(22222222222222222222222)
       this.$emit('cancelPopus', true)
     },
 
@@ -221,45 +219,6 @@ export default {
         }
       }
     }
-
-    .mod2 {
-      z-index: 35;
-      height: 210px;
-      background-image: linear-gradient(
-        180deg,
-        transparent,
-        rgba(0, 0, 0, 0.6)
-      );
-      width: 100vw;
-      justify-content: flex-end;
-      padding-bottom: 33px;
-      align-items: center;
-      .block1 {
-        width: 180px;
-        height: 113px;
-        .section1 {
-          height: 48px;
-          border-radius: 8px;
-          background-size: 100% auto;
-          background-color: #fff;
-          width: 180px;
-          justify-content: center;
-          align-items: center;
-          border: 0;
-        }
-        .info2 {
-          width: 152px;
-          height: 54px;
-          display: block;
-          color: #fff;
-          text-align: center;
-          align-self: center;
-          margin-top: 12px;
-          background-size: 100% auto;
-          background-repeat: no-repeat;
-        }
-      }
-    }
   }
 
   // 第二个页面
@@ -284,35 +243,6 @@ export default {
           top: 0;
         }
       }
-      .wrap5 {
-        height: 137px;
-        background-color: #efe9e0;
-        width: 100vw;
-        justify-content: center;
-        align-items: center;
-        display: flex;
-        .txt1 {
-          background-size: 100% auto;
-          background-repeat: no-repeat;
-          width: 112px;
-          height: 18px;
-          margin-bottom: 80px;
-        }
-      }
-
-      .main5 {
-        background-size: 100% auto;
-        background-repeat: no-repeat;
-        height: 48px;
-        border-radius: 8px;
-        margin-top: 11px;
-        width: 343px;
-        background-color: #b12b32;
-        border: 0;
-        position: fixed;
-        z-index: 15;
-        bottom: 5vh;
-      }
     }
   }
 }

src/components/Popup.vue

@@ -42,7 +42,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
@@ -119,9 +119,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
@@ -313,7 +311,7 @@ export default {
     justify-content: space-between;
 
     img {
-      width: 100%;
+      width: 90%;
       background-size: 100% auto;
       margin-top: 0;
       border-radius: 18px;

src/components/ShaerPopup.vue

@@ -149,6 +149,50 @@ export default {
       animation: tipup 1s ease infinite;
     }
   }
+
+  .dialog-sprite {
+    width: 100vw;
+    display: flex;
+    justify-content: center;
+    position: relative;
+    .dialog-body {
+      flex: 1;
+      overflow-x: hidden;
+      overflow-y: scroll;
+      padding: 0 15px 20px 15px;
+      //中间卡片
+      .bd2 {
+        z-index: 33;
+        width: 100%;
+        justify-content: flex-start;
+        align-items: center;
+        margin-top: 20px;
+
+        .pic1 {
+          z-index: 45;
+          width: 280px;
+          height: 464px;
+        }
+      }
+      //底部按钮
+      .bd1 {
+        width: 100%;
+        background-size: 100% auto;
+        margin: 10px auto 0;
+        .btn {
+          z-index: 42;
+          width: 162px;
+          height: 46.8px;
+          display: block;
+          text-align: center;
+          align-self: center;
+          margin-top: 12px;
+          background-size: 100% auto;
+          background-repeat: no-repeat;
+        }
+      }
+    }
+  }
 }
 @keyframes tipup {
   0% {
@@ -161,49 +205,5 @@ export default {
     transform: translateY(0%);
   }
 }
-
-.dialog-sprite {
-  width: 100vw;
-  display: flex;
-  justify-content: center;
-  position: relative;
-  .dialog-body {
-    flex: 1;
-    overflow-x: hidden;
-    overflow-y: scroll;
-    padding: 0 15px 20px 15px;
-    //中间卡片
-    .bd2 {
-      z-index: 33;
-      width: 100%;
-      justify-content: flex-start;
-      align-items: center;
-      margin-top: 20px;
-
-      .pic1 {
-        z-index: 45;
-        width: 280px;
-        height: 464px;
-      }
-    }
-    //底部按钮
-    .bd1 {
-      width: 100%;
-      background-size: 100% auto;
-      margin: 10px auto 0;
-      .btn {
-        z-index: 42;
-        width: 180px;
-        height: 52px;
-        display: block;
-        text-align: center;
-        align-self: center;
-        margin-top: 12px;
-        background-size: 100% auto;
-        background-repeat: no-repeat;
-      }
-    }
-  }
-}
 </style>
 

src/components/WinningPopup.vue

@@ -251,7 +251,7 @@ export default {
         background-position: 50% 50%;
         background-repeat: no-repeat;
         padding-top: 0;
-        width: 100%;
+        width: 90%;
       }
     }
   }

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 {

src/pages/SaveShare.vue

@@ -105,7 +105,7 @@ export default {
 }
 </script>
 
-<style lang="less" scoper>
+<style lang="less" scoped>
 .flex-col {
   display: flex;
   flex-direction: column;
@@ -138,21 +138,20 @@ export default {
     padding-bottom: 33px;
     align-items: center;
     .block1 {
-      width: 180px;
       height: 113px;
       .section1 {
-        height: 48px;
+        height: 43.2px;
         border-radius: 8px;
         background-size: 100% auto;
         background-color: #fff;
-        width: 180px;
+        width: 162px;
         justify-content: center;
         align-items: center;
         border: 0;
       }
       .info2 {
-        width: 152px;
-        height: 54px;
+        width: 136.8px;
+        height: 48.6px;
         display: block;
         color: #fff;
         text-align: center;