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

src/components/CalendarPoster.vue

       backimg: require('../assets/buttonImg/backImg.png'),
       shaerBut: require('../assets/buttonImg/sayFriend.png'),
       pressImage: require('../assets/buttonImg/pressSave.png'),
-      shaerButRed: require('../assets/buttonImg/sayFriendRed.jpg'),
+      shaerButRed: require('../assets/buttonImg/sayFriendRed.png'),
       pressLucky: require('../assets/buttonImg/pressSave.png')
     }
   },

src/components/Popup.vue

       background-size: 100% auto;
       margin: 10px auto 0;
       .btn {
-        padding-top: 0;
-        width: 40px;
-        height: 34px;
+        width: 36px;
+        height: 30.6px;
       }
     }
   }