Merge remote-tracking branch 'origin/master'

k94314517

2024-07-11 f2a41c2aa875e58ad374c053a32cd96ed628e0e3

 wechat_jiaxuan/app.js

@@ -7,10 +7,8 @@
  onLaunch: function () {
    //获取当前设备信息
    const WindowInfo = wx.getWindowInfo()
    console.log('WindowInfo', WindowInfo);
    if (WindowInfo.safeArea.top > 20) {
      this.globalData.bottomLift = WindowInfo.screenHeight - WindowInfo.safeArea.bottom;
      console.log(this.globalData.bottomLift);
    }
  }
})