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

src/components/CalendarPoster.vue

@@ -272,7 +272,7 @@ export default {
         }
       }
       .wrap5 {
-        height: 137px;
+        height: 190px;
         background-color: #efe9e0;
         width: 100vw;
         justify-content: center;
@@ -299,7 +299,7 @@ export default {
         border: 0;
         position: fixed;
         z-index: 15;
-        bottom: 5vh;
+        bottom: 4vh;
       }
     }
   }

src/components/Popup.vue

@@ -285,7 +285,7 @@ export default {
         left: -0;
         opacity: 2;
         transform: scale(1);
-        transform: rotateY(180deg);
+        transform: rotateY(-180deg); //iPhone异常
       }
     }
     //底部按钮

src/pages/Honghe.vue

@@ -35,6 +35,7 @@ import { useModel } from '@/store'
 import { drawLottery, getPrizeList } from '@/services/person'
 import { rand, shuffle } from '@/utils/math'
 import { hideLoading } from '@/utils'
+import { share } from '@/utils/wx'
 
 /**
  * 月份信息
@@ -142,7 +143,7 @@ const monthList = [
     popImg: require('../assets/luckyImg/11.jpg'),
     shareImg: require('../assets/sharePagesImg/11.jpg'),
     screenImg: require('../assets/screenImg/11.jpg'),
-    calendarImg: require('../assets/monthImg/November11.jpg'),
+    calendarImg: require('../assets/monthImg/December12.jpg'),
     mode: 1
   },
   {
@@ -198,6 +199,21 @@ export default {
   },
   created() {
     this.getPrizes()
+
+    // 设置微信分享
+    share({ title: '抽取幸运签，解锁隐藏福利', desc: '每月都有欢乐发生' })
+  },
+  watch: {
+    showMyWinning(newValue, oldValue) {
+      // 微信分享
+      // 1、正常情况下, 分享主题是 抽取幸运签，解锁隐藏福利
+      // 2、中奖弹出情况下, 分享主题是 我中奖啦! 来试试你的运气吧
+      if (newValue && !oldValue) {
+        share({ title: '我中奖啦! 来试试你的运气吧', desc: '抽取幸运签，解锁隐藏福利' })
+      } else if (newValue !== oldValue) {
+        share({ title: '抽取幸运签，解锁隐藏福利', desc: '每月都有欢乐发生' })
+      }
+    }
   },
   methods: {
     //关闭