Merge branch '2.1.0' of http://git.ycjcjy.com/SpaceOfCheng/wechat into 2.1.0

src/pages/user/mainPage/index.vue

@@ -48,7 +48,7 @@ export default {
   created () {
     var aHeight = document.documentElement.clientHeight,
       aWidth = document.documentElement.clientWidth
-    if (aHeight === 375 && aWidth === 724) {
+    if (aHeight === 724 && aWidth === 375) {
       this.isIphoneX = true
     }
     if (!this.userInfo.customer.MapUser || !this.$route.query.hideTabbar) {