diff --git a/pets-fe/app.json b/pets-fe/app.json index 501cfe2..4cd974d 100644 --- a/pets-fe/app.json +++ b/pets-fe/app.json @@ -1,6 +1,7 @@ { "pages": ["pages/home/home", "pages/meetups/meetups", "pages/walk/walk", "pages/tasks/tasks", "pages/pets/pets", "pages/pet-edit/pet-edit", "pages/meetup-edit/meetup-edit", "pages/share/share", "pages/walk-records/walk-records"], "window": { "navigationStyle": "custom", "backgroundColor": "#f6f9f6", "backgroundTextStyle": "dark" }, + "usingComponents": { "safe-top": "/components/safe-top/index" }, "permission": { "scope.userLocation": { "desc": "遛狗时记录轨迹，并在你主动开启分享后展示实时位置" } }, "requiredPrivateInfos": ["getLocation", "chooseLocation"], "sitemapLocation": "sitemap.json", diff --git a/pets-fe/app.wxss b/pets-fe/app.wxss index c0966db..b717c2b 100644 --- a/pets-fe/app.wxss +++ b/pets-fe/app.wxss @@ -25,7 +25,7 @@ button::after { } .screen { min-height: 100vh; - padding: calc(env(safe-area-inset-top) + 36rpx) 32rpx calc(170rpx + env(safe-area-inset-bottom)); + padding: 0 32rpx calc(170rpx + env(safe-area-inset-bottom)); } .eyebrow { color: #8fa39b; diff --git a/pets-fe/components/safe-top/index.js b/pets-fe/components/safe-top/index.js new file mode 100644 index 0000000..e5d1284 --- /dev/null +++ b/pets-fe/components/safe-top/index.js @@ -0,0 +1,21 @@ +function topHeight() { + const windowInfo = wx.getWindowInfo ? wx.getWindowInfo() : wx.getSystemInfoSync(); + const statusHeight = windowInfo.statusBarHeight || 24; + let menuBottom = 0; + try { + const menu = wx.getMenuButtonBoundingClientRect(); + menuBottom = menu && menu.bottom ? menu.bottom : 0; + } catch (_) { + // Some development environments do not expose the menu geometry. + } + return Math.ceil(Math.max(menuBottom, statusHeight + 44) + 12); +} + +Component({ + data: { height: 100 }, + lifetimes: { + attached() { + this.setData({ height: topHeight() }); + }, + }, +}); diff --git a/pets-fe/components/safe-top/index.json b/pets-fe/components/safe-top/index.json new file mode 100644 index 0000000..67f8e03 --- /dev/null +++ b/pets-fe/components/safe-top/index.json @@ -0,0 +1 @@ +{ "component": true } diff --git a/pets-fe/components/safe-top/index.wxml b/pets-fe/components/safe-top/index.wxml new file mode 100644 index 0000000..767c21f --- /dev/null +++ b/pets-fe/components/safe-top/index.wxml @@ -0,0 +1 @@ + diff --git a/pets-fe/components/safe-top/index.wxss b/pets-fe/components/safe-top/index.wxss new file mode 100644 index 0000000..138cbad --- /dev/null +++ b/pets-fe/components/safe-top/index.wxss @@ -0,0 +1,4 @@ +.safe-top { + width: 100%; + flex-shrink: 0; +} diff --git a/pets-fe/pages/home/home.wxml b/pets-fe/pages/home/home.wxml index afb4d1f..4b97aec 100644 --- a/pets-fe/pages/home/home.wxml +++ b/pets-fe/pages/home/home.wxml @@ -1,7 +1,8 @@ + 你好，今天也一起好好生活 - 早安，{{name}} ☀️ + 早安，{{name}} diff --git a/pets-fe/pages/home/home.wxss b/pets-fe/pages/home/home.wxss index b5b5975..6841aec 100644 --- a/pets-fe/pages/home/home.wxss +++ b/pets-fe/pages/home/home.wxss @@ -1,9 +1,16 @@ .top { margin-top: 10rpx; } +.top .title { + flex: 1; + min-width: 0; + margin-right: 16rpx; + overflow-wrap: anywhere; +} .avatar { width: 70rpx; height: 70rpx; + flex-shrink: 0; border-radius: 50%; border: 6rpx solid white; box-shadow: 0 5rpx 22rpx #174b3520; diff --git a/pets-fe/pages/meetup-edit/meetup-edit.wxml b/pets-fe/pages/meetup-edit/meetup-edit.wxml index 1d50ad5..1b87505 100644 --- a/pets-fe/pages/meetup-edit/meetup-edit.wxml +++ b/pets-fe/pages/meetup-edit/meetup-edit.wxml @@ -1,7 +1,8 @@ + HOST A WALK - 发起约遛 🌿 + 发起约遛 活动名称 + LET'S WALK TOGETHER - 约个伴一起遛 🌿 + 约个伴一起遛