Fix bottom height for iPhone X later devices

fanfoujs · Nov 5, 2024 · 712a6fd · 712a6fd
1 parent cb20259
commit 712a6fd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/src/pages/feed/feed.js b/src/pages/feed/feed.js
@@ -5,14 +5,13 @@ const animations = require('../../utils/animations')
 const post = require('../../mixins/post')
 const tap = require('../../mixins/tap')
 const i18n = require('../../i18n/index')
-const util = require('../../utils/util')
 const vibrate = require('../../utils/vibrate')
 
 Page(
   extend({}, tap, post, {
     data: {
       statusBarHeight: wx.getSystemInfoSync().statusBarHeight,
-      bottomHeight: util.isIpx() ? 64 : 0,
+      bottomHeight: wx.getSystemInfoSync().statusBarHeight,
       hide: false,
     },
     onLoad(event) {

diff --git a/src/pages/message/message.js b/src/pages/message/message.js
@@ -3,7 +3,6 @@ const extend = require('../../utils/extend')
 const animations = require('../../utils/animations')
 const post = require('../../mixins/post')
 const i18n = require('../../i18n/index')
-const util = require('../../utils/util')
 const vibrate = require('../../utils/vibrate')
 
 const url = '/direct_messages/conversation'
@@ -13,7 +12,7 @@ Page(
     id: null,
     data: {
       statusBarHeight: wx.getSystemInfoSync().statusBarHeight,
-      bottomHeight: util.isIpx() ? 64 : 0,
+      bottomHeight: wx.getSystemInfoSync().statusBarHeight,
     },
     onLoad(event) {
       this.setData({i18n})

diff --git a/src/utils/util.js b/src/utils/util.js
@@ -41,14 +41,9 @@ function getBlockIds() {
   return blockIds
 }
 
-function isIpx() {
-  return Boolean(wx.getSystemInfoSync().model.match('iPhone X'))
-}
-
 module.exports = {
   formatTime,
   getSettings,
   getBlocks,
   getBlockIds,
-  isIpx,
 }