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

src/components/Modal.vue

@@ -3,16 +3,18 @@
     <div class="modal" :style="modalStyle" @click.stop="handleMaskClick">
       <fire-flies v-if="showFireflies"></fire-flies>
       <div class="modal-action back-btn" v-if="showBack" @click.stop="$emit('close')">
-        <img src="~@/assets/buttonImg/backImg.png" alt="">
+        <img src="~@/assets/buttonImg/backImg.png" alt />
       </div>
       <div class="modal-action share-guide" v-if="showShare">
-        <img src="~@/assets/buttonImg/shareText.png" alt="">
+        <img src="~@/assets/buttonImg/shareText.png" alt />
+      </div>
+      <div class="modal-action">
+        <slot name="action"></slot>
+      </div>
+      <div class="modal-body">
+        <slot></slot>
       </div>
-      <div class="modal-action"><slot name="action"></slot></div>
-      <div class="modal-body"><slot></slot></div>
-
     </div>
-
   </div>
 </template>
 
@@ -26,11 +28,11 @@ export default {
     show: Boolean,
     mask: {
       type: Boolean,
-      default: true,
+      default: true
     },
     maskClickCloseable: {
       type: Boolean,
-      default: true,
+      default: true
     },
     showBack: Boolean,
     showFireflies: {
@@ -43,17 +45,17 @@ export default {
     modalStyle() {
       return {
         background: 'rgba(0, 0, 0, 0.6)'
-      }
+      };
     }
   },
   methods: {
     handleMaskClick() {
       if (this.maskClickCloseable) {
-        this.$emit('close')
+        this.$emit('close');
       }
     }
   }
-}
+};
 </script>
 
 <style lang="less" scoped>
@@ -92,7 +94,7 @@ export default {
       top: 0.5em;
       right: 0em;
       width: 3em;
-      
+
       & > img {
         width: 100%;
       }

src/components/MyWinning.vue

@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import { hideLoading } from '@/utils'
+import { hideLoading } from '@/utils';
 
 export default {
   name: 'MyWinning',
@@ -81,7 +81,7 @@ export default {
       shaerButRed: require('../assets/buttonImg/sayFriend.png'),
       pressLucky: require('../assets/buttonImg/happyAccept.png'),
       PrizeShow: null
-    }
+    };
   },
 
   watch: {
@@ -89,11 +89,11 @@ export default {
       // this.showSelf = this.show
     },
     mounted() {
-      hideLoading() //loading
+      hideLoading(); //loading
 
-      this.forbidScroll()
+      this.forbidScroll();
       if (this.show === true) {
-        this.transform()
+        this.transform();
       }
     }
   },
@@ -101,11 +101,11 @@ export default {
     /** 取消按钮操作 */
     cancelPopupts() {
       // this.shaerShow = false
-      this.$emit('cancelPopus', true)
+      this.$emit('cancelPopus', true);
     },
 
     cancelPopup() {
-      this.shaerShow = false
+      this.shaerShow = false;
     },
     // shareClick() {
     //   this.$router.replace({
@@ -121,39 +121,39 @@ export default {
     // },
     transform() {
       setTimeout(() => {
-        this.classDivAA = this.show
-      }, 0)
+        this.classDivAA = this.show;
+      }, 0);
     },
     /** 禁止页面滚动 */
     forbidScroll() {
-      this.bodyOverflow = document.body.style.overflow
-      document.body.style.overflow = 'hidden'
+      this.bodyOverflow = document.body.style.overflow;
+      document.body.style.overflow = 'hidden';
     },
 
     /**  每次获取之后 zindex 自动增加 */
     getZIndex() {
-      let zIndexInit = 2022112
-      return zIndexInit++
+      let zIndexInit = 2022112;
+      return zIndexInit++;
     },
 
     /** 确认按钮操作 */
     confirm() {
-      this.$emit('confirm', true)
+      this.$emit('confirm', true);
     },
 
     /** 点击遮罩关闭弹窗 */
     closeMyself(event) {
       // this.sloveBodyOverflow()
-      this.$emit('closeMyself', true)
+      this.$emit('closeMyself', true);
     },
 
     /** 恢复页面的滚动 */
     sloveBodyOverflow() {
       // this.showSelf = false
-      document.body.style.overflow = this.bodyOverflow
+      document.body.style.overflow = this.bodyOverflow;
     }
   }
-}
+};
 </script>
 
 <style lang="less" scoped>

src/components/Popup.vue

@@ -40,6 +40,10 @@
             <div class="dialog-footer">
               <img @click="cancel" class="btn" src="../assets/buttonImg/closeBut.png" alt />
             </div>
+
+            <div class="footer-tip" v-if="!noPrize && !(isPrize && isPrize.prizeId)">
+              再试几次，惊喜礼品在等你哟
+            </div>
           </div>
           <!-- 右侧 -->
           <div class="section-box">
@@ -120,61 +124,61 @@ export default {
       showPopupCalendarPoster: false,
       stater: null,
       MyWinningShow: false
-    }
+    };
   },
   watch: {
     show(val) {
-      console.log('🚀 ~ file: Popup.vue ~ line 78 ~ show ~ val', this.isPrize)
-      this.showSelf = val
+      console.log('🚀 ~ file: Popup.vue ~ line 78 ~ show ~ val', this.isPrize);
+      this.showSelf = val;
       if (this.show === false) {
-        this.myShareShow = false
+        this.myShareShow = false;
       }
-      this.transform()
+      this.transform();
     }
   },
   created() {
-    this.showSelf = this.show
+    this.showSelf = this.show;
   },
   mounted() {
-    this.forbidScroll()
+    this.forbidScroll();
     if (this.show === true) {
-      this.transform()
+      this.transform();
     }
   },
   methods: {
     canclMyWinning() {
-      this.MyWinningShow = false
+      this.MyWinningShow = false;
     },
     canckle() {
-      this.showPopupCalendarPoster = false
+      this.showPopupCalendarPoster = false;
     },
     shareClick() {
       this.$router.replace({
         path: 'SaveShare',
         query: { states: 0 }
-      })
+      });
     },
     transform() {
       setTimeout(() => {
-        this.classDivAA = this.show
-      }, 0)
+        this.classDivAA = this.show;
+      }, 0);
     },
     /** 禁止页面滚动 */
     forbidScroll() {
-      this.bodyOverflow = document.body.style.overflow
-      document.body.style.overflow = 'hidden'
+      this.bodyOverflow = document.body.style.overflow;
+      document.body.style.overflow = 'hidden';
     },
 
     /**  每次获取之后 zindex 自动增加 */
     getZIndex() {
-      let zIndexInit = 2022112
-      return zIndexInit++
+      let zIndexInit = 2022112;
+      return zIndexInit++;
     },
 
     /** 取消按钮操作 */
     cancel() {
-      event.stopPropagation()
-      this.$emit('cancel', true)
+      event.stopPropagation();
+      this.$emit('cancel', true);
     },
 
     /** 点击遮罩关闭弹窗 */
@@ -184,10 +188,10 @@ export default {
 
     /** 恢复页面的滚动 */
     sloveBodyOverflow() {
-      document.body.style.overflow = this.bodyOverflow
+      document.body.style.overflow = this.bodyOverflow;
     }
   }
-}
+};
 </script>
 
 <style lang="less" scoped>
@@ -303,6 +307,22 @@ export default {
         height: 30.6px;
       }
     }
+
+    .footer-tip {
+      color: #fff;
+      margin-top: 1em;
+      font-size: 0.9em;
+      letter-spacing: 1px;
+      opacity: 0.2;
+
+      animation: breaf 2.6s ease infinite;
+    }
+  }
+
+  @keyframes breaf {
+    50% {
+      opacity: 0.8;
+    }    
   }
   .section-box {
     position: absolute;

src/components/ShaerPopup.vue

@@ -58,6 +58,7 @@ export default {
   },
   watch: {
     show(val) {
+      console.log('🚀 ~ file: Popup.vue ~ line 78 ~ show ~ val', val)
       this.showSelf = val
     }
   },

src/components/WinningPopup.vue

@@ -220,9 +220,9 @@ export default {
           transform: rotateY(-180deg); //iPhone异常
 
           .PrizeImg {
-            width: 55vw;
+            width: 40vw;
             position: absolute;
-            height: 48vw;
+            height: 40vw;
             top: 20vh;
           }
         }

src/pages/Honghe.vue

@@ -335,6 +335,10 @@ export default {
           if (err && err.code === 9999) {
             this.PrizeState = 2
 
+            this.prizeList = this.prizeList.map(x => ({ ...x, exitsNum: 0 }))
+            
+            alert('对不起，您来晚了，奖品已抽完')
+
             // 奖品没了
           } else {
             // 其他错误