diff --git a/pets-fe/app.json b/pets-fe/app.json
index 4cd974d..39e1b6b 100644
--- a/pets-fe/app.json
+++ b/pets-fe/app.json
@@ -1,9 +1,34 @@
{
- "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"],
+ "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",
+ "navigationBarTextStyle": "black",
+ "backgroundColor": "#f6f9f6",
+ "backgroundTextStyle": "dark"
+ },
+ "usingComponents": {
+ "page-layout": "/components/page-layout/index",
+ "app-icon": "/components/app-icon/index"
+ },
+ "permission": {
+ "scope.userLocation": {
+ "desc": "遛狗时记录轨迹，并在你主动开启分享后展示实时位置"
+ }
+ },
+ "requiredPrivateInfos": [
+ "getLocation",
+ "chooseLocation"
+ ],
"sitemapLocation": "sitemap.json",
"style": "v2",
"lazyCodeLoading": "requiredComponents"
diff --git a/pets-fe/app.wxss b/pets-fe/app.wxss
index c4988a8..6026f47 100644
--- a/pets-fe/app.wxss
+++ b/pets-fe/app.wxss
@@ -3,8 +3,9 @@ page {
overflow: hidden;
background: #f6f9f6;
color: #173e36;
- font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", sans-serif;
+ font-family: ui-rounded, "Hiragino Maru Gothic ProN", "PingFang SC", sans-serif;
font-size: 28rpx;
+ line-height: 1.5;
}
::-webkit-scrollbar {
display: none;
@@ -12,21 +13,12 @@ page {
height: 0;
color: transparent;
}
-.page-scroll {
- display: block;
- width: 100%;
- height: 100vh;
-}
-.page-scroll::-webkit-scrollbar {
- display: none;
- width: 0;
- height: 0;
-}
view,
text,
button,
input,
-textarea {
+textarea,
+picker {
box-sizing: border-box;
}
button {
@@ -36,8 +28,8 @@ button::after {
border: 0;
}
.screen {
- min-height: 100vh;
- padding: 0 32rpx calc(170rpx + env(safe-area-inset-bottom));
+ min-height: 100%;
+ padding: 16rpx 32rpx calc(170rpx + env(safe-area-inset-bottom));
}
.eyebrow {
color: #8fa39b;
@@ -45,15 +37,9 @@ button::after {
font-weight: 600;
letter-spacing: 2rpx;
}
-.title {
- font-size: 48rpx;
- font-weight: 800;
- line-height: 1.2;
- margin: 12rpx 0 26rpx;
-}
.section-title {
font-size: 34rpx;
- font-weight: 800;
+ font-weight: 600;
margin: 38rpx 0 20rpx;
}
.muted {
@@ -71,7 +57,7 @@ button::after {
color: white;
border-radius: 23rpx;
font-size: 28rpx;
- font-weight: 700;
+ font-weight: 600;
padding: 22rpx 30rpx;
line-height: 1.3;
}
@@ -80,7 +66,7 @@ button::after {
color: #28674e;
border-radius: 23rpx;
font-size: 27rpx;
- font-weight: 700;
+ font-weight: 600;
padding: 20rpx;
}
.row {
@@ -111,8 +97,7 @@ button::after {
margin-bottom: 12rpx;
}
.field input,
-.field textarea,
-.field picker {
+.field textarea {
width: 100%;
background: #fff;
border-radius: 20rpx;
@@ -120,6 +105,10 @@ button::after {
font-size: 28rpx;
min-height: 76rpx;
}
+.field picker {
+ display: block;
+ width: 100%;
+}
.field textarea {
height: 170rpx;
}
diff --git a/pets-fe/components/app-icon/index.js b/pets-fe/components/app-icon/index.js
new file mode 100644
index 0000000..a2ab771
--- /dev/null
+++ b/pets-fe/components/app-icon/index.js
@@ -0,0 +1,7 @@
+Component({
+ properties: {
+ kind: { type: String, value: "paw" },
+ size: { type: Number, value: 48 },
+ color: { type: String, value: "#398668" },
+ },
+});
diff --git a/pets-fe/components/page-back/index.json b/pets-fe/components/app-icon/index.json
similarity index 100%
rename from pets-fe/components/page-back/index.json
rename to pets-fe/components/app-icon/index.json
diff --git a/pets-fe/components/app-icon/index.wxml b/pets-fe/components/app-icon/index.wxml
new file mode 100644
index 0000000..600ac20
--- /dev/null
+++ b/pets-fe/components/app-icon/index.wxml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/pets-fe/components/app-icon/index.wxss b/pets-fe/components/app-icon/index.wxss
new file mode 100644
index 0000000..866a8d7
--- /dev/null
+++ b/pets-fe/components/app-icon/index.wxss
@@ -0,0 +1,12 @@
+.app-icon-icon { position: relative; display: flex; align-items: center; justify-content: center; }
+.app-icon-drop { width: 48%; height: 48%; border: 3rpx solid currentColor; border-radius: 50% 50% 50% 0; transform: rotate(135deg); }
+.app-icon-bowl { position: relative; width: 70%; height: 40%; border: 3rpx solid currentColor; border-radius: 5rpx 5rpx 50% 50%; }
+.app-icon-bowl-rim { position: absolute; left: -8%; top: -5rpx; width: 116%; height: 3rpx; border-radius: 4rpx; background: currentColor; }
+.app-icon-paw { position: relative; width: 85%; height: 85%; }
+.app-icon-toe, .app-icon-pad { position: absolute; background: currentColor; }
+.app-icon-toe { width: 17%; height: 24%; border-radius: 50%; }
+.app-icon-one { left: 0; top: 26%; transform: rotate(-28deg); }
+.app-icon-two { left: 24%; top: 3%; transform: rotate(-12deg); }
+.app-icon-three { right: 24%; top: 3%; transform: rotate(12deg); }
+.app-icon-four { right: 0; top: 26%; transform: rotate(28deg); }
+.app-icon-pad { left: 24%; top: 48%; width: 52%; height: 42%; border-radius: 50% 50% 45% 45%; }
diff --git a/pets-fe/components/page-back/index.js b/pets-fe/components/page-back/index.js
deleted file mode 100644
index a6b503f..0000000
--- a/pets-fe/components/page-back/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-Component({
- methods: {
- goBack() {
- if (getCurrentPages().length > 1) {
- wx.navigateBack({ delta: 1 });
- } else {
- wx.reLaunch({ url: "/pages/home/home" });
- }
- },
- },
-});
diff --git a/pets-fe/components/page-back/index.wxml b/pets-fe/components/page-back/index.wxml
deleted file mode 100644
index 8857fc1..0000000
--- a/pets-fe/components/page-back/index.wxml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- 返回
-
diff --git a/pets-fe/components/page-back/index.wxss b/pets-fe/components/page-back/index.wxss
deleted file mode 100644
index 32dd1c6..0000000
--- a/pets-fe/components/page-back/index.wxss
+++ /dev/null
@@ -1,18 +0,0 @@
-.page-back {
- display: inline-flex;
- align-items: center;
- gap: 12rpx;
- min-height: 58rpx;
- margin-bottom: 22rpx;
- color: #2a7357;
- font-size: 26rpx;
- font-weight: 700;
-}
-.page-back-arrow {
- width: 17rpx;
- height: 17rpx;
- border-left: 4rpx solid currentColor;
- border-bottom: 4rpx solid currentColor;
- transform: rotate(45deg);
- margin-left: 5rpx;
-}
diff --git a/pets-fe/components/page-layout/index.js b/pets-fe/components/page-layout/index.js
new file mode 100644
index 0000000..a556bab
--- /dev/null
+++ b/pets-fe/components/page-layout/index.js
@@ -0,0 +1,33 @@
+const { navigationGeometry } = require("../../utils/layout");
+
+Component({
+ properties: {
+ title: String,
+ back: { type: Boolean, value: false },
+ },
+ data: navigationGeometry(),
+ lifetimes: {
+ attached() {
+ this.updateLayout();
+ },
+ },
+ pageLifetimes: {
+ resize() {
+ this.updateLayout();
+ },
+ },
+ methods: {
+ updateLayout() {
+ const info = wx.getWindowInfo ? wx.getWindowInfo() : wx.getSystemInfoSync();
+ let menu = {};
+ try {
+ menu = wx.getMenuButtonBoundingClientRect();
+ } catch (_) {}
+ this.setData(navigationGeometry(info, menu));
+ },
+ goBack() {
+ if (getCurrentPages().length > 1) wx.navigateBack({ delta: 1 });
+ else wx.reLaunch({ url: "/pages/home/home" });
+ },
+ },
+});
diff --git a/pets-fe/components/safe-top/index.json b/pets-fe/components/page-layout/index.json
similarity index 100%
rename from pets-fe/components/safe-top/index.json
rename to pets-fe/components/page-layout/index.json
diff --git a/pets-fe/components/page-layout/index.wxml b/pets-fe/components/page-layout/index.wxml
new file mode 100644
index 0000000..b0f3ac1
--- /dev/null
+++ b/pets-fe/components/page-layout/index.wxml
@@ -0,0 +1,11 @@
+
+
+
+
+
+ {{title}}
+
+
+
+
+
diff --git a/pets-fe/components/page-layout/index.wxss b/pets-fe/components/page-layout/index.wxss
new file mode 100644
index 0000000..4183a5d
--- /dev/null
+++ b/pets-fe/components/page-layout/index.wxss
@@ -0,0 +1,53 @@
+.navigation {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ z-index: 25;
+ background: #f6f9f6;
+}
+.navigation-row {
+ position: absolute;
+ left: 16px;
+ display: flex;
+ align-items: center;
+ gap: 10px;
+}
+.navigation-title {
+ flex: 1;
+ min-width: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ color: #194f42;
+ font-size: 19px;
+ font-weight: 600;
+ letter-spacing: 0.5px;
+}
+.back {
+ width: 28px;
+ height: 36px;
+ flex-shrink: 0;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+.back-arrow {
+ width: 10px;
+ height: 10px;
+ border-left: 2px solid #194f42;
+ border-bottom: 2px solid #194f42;
+ transform: rotate(45deg);
+}
+.content {
+ position: fixed;
+ left: 0;
+ right: 0;
+ width: 100%;
+ overflow: hidden;
+}
+::-webkit-scrollbar {
+ display: none;
+ width: 0;
+ height: 0;
+}
diff --git a/pets-fe/components/pet-picker/index.json b/pets-fe/components/pet-picker/index.json
index 67f8e03..a10079d 100644
--- a/pets-fe/components/pet-picker/index.json
+++ b/pets-fe/components/pet-picker/index.json
@@ -1 +1,6 @@
-{ "component": true }
+{
+ "component": true,
+ "usingComponents": {
+ "app-icon": "/components/app-icon/index"
+ }
+}
diff --git a/pets-fe/components/pet-picker/index.wxml b/pets-fe/components/pet-picker/index.wxml
index 65456f2..a4dd6c7 100644
--- a/pets-fe/components/pet-picker/index.wxml
+++ b/pets-fe/components/pet-picker/index.wxml
@@ -10,7 +10,7 @@
bindtap="toggle"
>
- 🐕
+
{{item.name}}
{{item.chosen?'✓':'+'}}
diff --git a/pets-fe/components/safe-top/index.js b/pets-fe/components/safe-top/index.js
deleted file mode 100644
index e5d1284..0000000
--- a/pets-fe/components/safe-top/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-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.wxml b/pets-fe/components/safe-top/index.wxml
deleted file mode 100644
index 767c21f..0000000
--- a/pets-fe/components/safe-top/index.wxml
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/pets-fe/components/safe-top/index.wxss b/pets-fe/components/safe-top/index.wxss
deleted file mode 100644
index 138cbad..0000000
--- a/pets-fe/components/safe-top/index.wxss
+++ /dev/null
@@ -1,4 +0,0 @@
-.safe-top {
- width: 100%;
- flex-shrink: 0;
-}
diff --git a/pets-fe/pages/home/home.json b/pets-fe/pages/home/home.json
index 7d08347..2f486b5 100644
--- a/pets-fe/pages/home/home.json
+++ b/pets-fe/pages/home/home.json
@@ -1 +1,7 @@
-{ "disableScroll": true, "usingComponents": { "tab-bar": "/components/tab-bar/index", "pet-picker": "/components/pet-picker/index" } }
+{
+ "disableScroll": true,
+ "usingComponents": {
+ "tab-bar": "/components/tab-bar/index",
+ "pet-picker": "/components/pet-picker/index"
+ }
+}
diff --git a/pets-fe/pages/home/home.wxml b/pets-fe/pages/home/home.wxml
index 2f33c1e..0ce3d6b 100644
--- a/pets-fe/pages/home/home.wxml
+++ b/pets-fe/pages/home/home.wxml
@@ -1,16 +1,10 @@
-
+
-
- 你好，今天也一起好好生活
-
- 早安，{{name}}
-
-
今日的主角
- 小短腿，出发吧!
- 多只狗狗 · 每一天都是好日子
+ 出门走走吧
+ 一起出发，收集今天的小快乐
● 陪伴它们的每一天，都值得记录
@@ -21,7 +15,7 @@
- 🐕
+
今天的风刚刚好
选择同行的狗狗，一起出门转转。
@@ -70,7 +64,7 @@
{{item.completed?'✓':''}}
- {{item.category==='water'?'💧':item.category==='food'?'🥣':'🐾'}}
+
{{item.title}}
@@ -78,9 +72,9 @@
- 今天还没有任务，给狗狗安排一件小事吧 🐾
+ 今天还没有任务，给狗狗安排一件小事吧
-
+
diff --git a/pets-fe/pages/home/home.wxss b/pets-fe/pages/home/home.wxss
index 6841aec..d4a4f80 100644
--- a/pets-fe/pages/home/home.wxss
+++ b/pets-fe/pages/home/home.wxss
@@ -1,20 +1,3 @@
-.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;
-}
.hero {
min-height: 330rpx;
background: #194f42;
@@ -34,11 +17,11 @@
.hero-small {
color: #abd9b8;
font-size: 23rpx;
- font-weight: 700;
+ font-weight: 600;
}
.hero-title {
- font-size: 43rpx;
- font-weight: 800;
+ font-size: 38rpx;
+ font-weight: 600;
margin: 16rpx 0;
}
.hero-meta {
@@ -61,7 +44,7 @@
.link {
font-size: 24rpx;
color: #398668;
- font-weight: 700;
+ font-weight: 600;
}
.walk-card {
padding: 26rpx;
@@ -71,7 +54,7 @@
gap: 22rpx;
align-items: center;
}
-.dog-emoji {
+.walk-art {
width: 145rpx;
height: 145rpx;
border-radius: 26rpx;
@@ -82,7 +65,7 @@
}
.walk-title {
font-size: 31rpx;
- font-weight: 800;
+ font-weight: 600;
margin-bottom: 12rpx;
}
.walk-intro .muted {
@@ -169,7 +152,7 @@
gap: 6rpx;
}
.task-name {
- font-weight: 700;
+ font-weight: 600;
}
.task-main .muted {
font-size: 22rpx;
diff --git a/pets-fe/pages/meetup-edit/meetup-edit.json b/pets-fe/pages/meetup-edit/meetup-edit.json
index a7f359b..4f3ed30 100644
--- a/pets-fe/pages/meetup-edit/meetup-edit.json
+++ b/pets-fe/pages/meetup-edit/meetup-edit.json
@@ -1 +1,6 @@
-{ "disableScroll": true, "usingComponents": { "pet-picker": "/components/pet-picker/index", "page-back": "/components/page-back/index" } }
+{
+ "disableScroll": true,
+ "usingComponents": {
+ "pet-picker": "/components/pet-picker/index"
+ }
+}
diff --git a/pets-fe/pages/meetup-edit/meetup-edit.wxml b/pets-fe/pages/meetup-edit/meetup-edit.wxml
index 73093f2..be856d3 100644
--- a/pets-fe/pages/meetup-edit/meetup-edit.wxml
+++ b/pets-fe/pages/meetup-edit/meetup-edit.wxml
@@ -1,9 +1,5 @@
-
+
-
-
- HOST A WALK
- 发起约遛
活动名称
集合地点
- 📍 {{place_name||'选择地图位置'}}
+ {{place_name||'选择地图位置'}}
@@ -54,4 +50,4 @@
-
+
diff --git a/pets-fe/pages/meetups/meetups.json b/pets-fe/pages/meetups/meetups.json
index 7d08347..2f486b5 100644
--- a/pets-fe/pages/meetups/meetups.json
+++ b/pets-fe/pages/meetups/meetups.json
@@ -1 +1,7 @@
-{ "disableScroll": true, "usingComponents": { "tab-bar": "/components/tab-bar/index", "pet-picker": "/components/pet-picker/index" } }
+{
+ "disableScroll": true,
+ "usingComponents": {
+ "tab-bar": "/components/tab-bar/index",
+ "pet-picker": "/components/pet-picker/index"
+ }
+}
diff --git a/pets-fe/pages/meetups/meetups.wxml b/pets-fe/pages/meetups/meetups.wxml
index 548c6b9..f5bfe2d 100644
--- a/pets-fe/pages/meetups/meetups.wxml
+++ b/pets-fe/pages/meetups/meetups.wxml
@@ -1,8 +1,5 @@
-
+
-
- LET'S WALK TOGETHER
- 约个伴一起遛
好天气，和新朋友一起走走
@@ -24,21 +21,21 @@
>
- 🐾 {{item.participants}} / {{item.max_people}} 人
+ {{item.participants}} / {{item.max_people}} 人
›
{{item.title}}
- 📍 {{item.place_name}}
- 🗓 {{item.date}}
+ 地点 · {{item.place_name}}
+ 时间 · {{item.date}}
{{item.description}}
- 还没有约遛，发起第一场吧 🐕
+ 还没有约遛，发起第一场吧
-
+
@@ -46,9 +43,9 @@
×
- 📍 {{active.place_name}} {{active.latitude?'· 点开地图':''}}
- 🗓 {{active.date}}
- 🐕 {{active.participants}} / {{active.max_people}} 人已报名
+ 地点 · {{active.place_name}} {{active.latitude?'· 点开地图':''}}
+ 时间 · {{active.date}}
+ {{active.participants}} / {{active.max_people}} 人已报名
{{active.description}}
diff --git a/pets-fe/pages/meetups/meetups.wxss b/pets-fe/pages/meetups/meetups.wxss
index ad19af4..9582951 100644
--- a/pets-fe/pages/meetups/meetups.wxss
+++ b/pets-fe/pages/meetups/meetups.wxss
@@ -22,7 +22,7 @@
.banner-title {
font-size: 35rpx;
line-height: 1.3;
- font-weight: 800;
+ font-weight: 600;
white-space: nowrap;
}
.banner-title.first {
@@ -36,7 +36,7 @@
.add {
font-size: 24rpx;
color: #328965;
- font-weight: 700;
+ font-weight: 600;
}
.meetup strong {
display: block;
@@ -92,7 +92,7 @@
}
.select-title {
font-size: 25rpx;
- font-weight: 700;
+ font-weight: 600;
margin: 30rpx 0 15rpx;
}
.sheet button {
diff --git a/pets-fe/pages/pet-edit/pet-edit.js b/pets-fe/pages/pet-edit/pet-edit.js
index f532f37..d18eae4 100644
--- a/pets-fe/pages/pet-edit/pet-edit.js
+++ b/pets-fe/pages/pet-edit/pet-edit.js
@@ -3,7 +3,7 @@ Page({
data: {
id: "",
name: "",
- breed: "柯基",
+ breed: "",
gender: "male",
birth_date: "",
weight_kg: "",
diff --git a/pets-fe/pages/pet-edit/pet-edit.json b/pets-fe/pages/pet-edit/pet-edit.json
index 674bc9c..4d09db8 100644
--- a/pets-fe/pages/pet-edit/pet-edit.json
+++ b/pets-fe/pages/pet-edit/pet-edit.json
@@ -1 +1,4 @@
-{ "disableScroll": true, "usingComponents": { "page-back": "/components/page-back/index" } }
+{
+ "disableScroll": true,
+ "usingComponents": {}
+}
diff --git a/pets-fe/pages/pet-edit/pet-edit.wxml b/pets-fe/pages/pet-edit/pet-edit.wxml
index 509aaef..e141f4d 100644
--- a/pets-fe/pages/pet-edit/pet-edit.wxml
+++ b/pets-fe/pages/pet-edit/pet-edit.wxml
@@ -1,13 +1,9 @@
-
+
-
-
- PET PROFILE
- {{id?'编辑档案':'认识新朋友'}}
- 🐕
- 点击上传照片
+
+ 点击上传照片
名字 *
@@ -20,7 +16,7 @@
品种
-
+
性别
@@ -65,4 +61,4 @@
-
+
diff --git a/pets-fe/pages/pet-edit/pet-edit.wxss b/pets-fe/pages/pet-edit/pet-edit.wxss
index 3c2f50a..25aea1d 100644
--- a/pets-fe/pages/pet-edit/pet-edit.wxss
+++ b/pets-fe/pages/pet-edit/pet-edit.wxss
@@ -14,7 +14,7 @@
width: 100%;
height: 100%;
}
-.photo view {
+.photo-caption {
position: absolute;
bottom: 0;
left: 0;
diff --git a/pets-fe/pages/pets/pets.json b/pets-fe/pages/pets/pets.json
index 6c0f76b..e2b624a 100644
--- a/pets-fe/pages/pets/pets.json
+++ b/pets-fe/pages/pets/pets.json
@@ -1 +1,6 @@
-{ "disableScroll": true, "usingComponents": { "tab-bar": "/components/tab-bar/index" } }
+{
+ "disableScroll": true,
+ "usingComponents": {
+ "tab-bar": "/components/tab-bar/index"
+ }
+}
diff --git a/pets-fe/pages/pets/pets.wxml b/pets-fe/pages/pets/pets.wxml
index ba0f0fc..96d6659 100644
--- a/pets-fe/pages/pets/pets.wxml
+++ b/pets-fe/pages/pets/pets.wxml
@@ -1,11 +1,8 @@
-
+
-
- MY LITTLE FAMILY
- 我的毛孩子
- 五只柯基，也能一起遛
+ 每一位家人，都值得被好好照顾
每一只都有自己的故事
@@ -27,7 +24,7 @@
src="{{item.avatar_url}}"
mode="aspectFill"
/>
- 🐕
+
{{item.name}}
@@ -39,8 +36,8 @@
›
- 给第一只狗狗建个档案吧 🐾
+ 给第一只狗狗建个档案吧
-
+
diff --git a/pets-fe/pages/pets/pets.wxss b/pets-fe/pages/pets/pets.wxss
index 30d3f69..ede5c1a 100644
--- a/pets-fe/pages/pets/pets.wxss
+++ b/pets-fe/pages/pets/pets.wxss
@@ -30,7 +30,7 @@
flex-shrink: 0;
}
.add {
- font-weight: 800;
+ font-weight: 600;
color: #368764;
}
.pet {
diff --git a/pets-fe/pages/share/share.json b/pets-fe/pages/share/share.json
index 674bc9c..4d09db8 100644
--- a/pets-fe/pages/share/share.json
+++ b/pets-fe/pages/share/share.json
@@ -1 +1,4 @@
-{ "disableScroll": true, "usingComponents": { "page-back": "/components/page-back/index" } }
+{
+ "disableScroll": true,
+ "usingComponents": {}
+}
diff --git a/pets-fe/pages/share/share.wxml b/pets-fe/pages/share/share.wxml
index 8c655f4..13f0aee 100644
--- a/pets-fe/pages/share/share.wxml
+++ b/pets-fe/pages/share/share.wxml
@@ -1,9 +1,5 @@
-
+
-
-
- 肉垫计划 · 位置分享
- 找到小短腿的脚印
-
+
diff --git a/pets-fe/pages/tasks/tasks.json b/pets-fe/pages/tasks/tasks.json
index 6c0f76b..e2b624a 100644
--- a/pets-fe/pages/tasks/tasks.json
+++ b/pets-fe/pages/tasks/tasks.json
@@ -1 +1,6 @@
-{ "disableScroll": true, "usingComponents": { "tab-bar": "/components/tab-bar/index" } }
+{
+ "disableScroll": true,
+ "usingComponents": {
+ "tab-bar": "/components/tab-bar/index"
+ }
+}
diff --git a/pets-fe/pages/tasks/tasks.wxml b/pets-fe/pages/tasks/tasks.wxml
index e34e5e9..6a91c46 100644
--- a/pets-fe/pages/tasks/tasks.wxml
+++ b/pets-fe/pages/tasks/tasks.wxml
@@ -1,8 +1,5 @@
-
+
-
- LITTLE THINGS, BIG LOVE
- 今日小任务
这一天也要照顾好它们
@@ -32,7 +29,7 @@
{{item.completed?'✓':''}}
- {{item.category==='water'?'💧':item.category==='food'?'🥣':'🐾'}}
+
{{item.title}}
@@ -45,12 +42,12 @@
×
- 从喝水、喂食开始，安排温柔的小日常 ✨
+ 从喝水、喂食开始，安排温柔的小日常
-
+
diff --git a/pets-fe/pages/tasks/tasks.wxss b/pets-fe/pages/tasks/tasks.wxss
index df65da4..368e970 100644
--- a/pets-fe/pages/tasks/tasks.wxss
+++ b/pets-fe/pages/tasks/tasks.wxss
@@ -31,7 +31,7 @@
.add {
color: #2b8a63;
font-size: 24rpx;
- font-weight: 700;
+ font-weight: 600;
}
.date-nav {
display: flex;
diff --git a/pets-fe/pages/walk-records/walk-records.json b/pets-fe/pages/walk-records/walk-records.json
index 674bc9c..4d09db8 100644
--- a/pets-fe/pages/walk-records/walk-records.json
+++ b/pets-fe/pages/walk-records/walk-records.json
@@ -1 +1,4 @@
-{ "disableScroll": true, "usingComponents": { "page-back": "/components/page-back/index" } }
+{
+ "disableScroll": true,
+ "usingComponents": {}
+}
diff --git a/pets-fe/pages/walk-records/walk-records.wxml b/pets-fe/pages/walk-records/walk-records.wxml
index 5e03487..2077019 100644
--- a/pets-fe/pages/walk-records/walk-records.wxml
+++ b/pets-fe/pages/walk-records/walk-records.wxml
@@ -1,10 +1,6 @@
-
+
-
-
‹ 全部记录
- OUR LITTLE FOOTPRINTS
- {{selected?'这次的脚印':'遛狗记录'}}
{{selected.date}}
@@ -23,10 +19,10 @@
{{item.date}}›
- 🐕 {{item.petNames}}
+ {{item.petNames}}
{{item.duration}} · {{item.distance}} km · {{item.points.length}} 个足迹
- 完成一次遛狗，脚印就会出现在这里 🐾
+ 完成一次遛狗，脚印就会出现在这里
-
+
diff --git a/pets-fe/pages/walk/walk.js b/pets-fe/pages/walk/walk.js
index 89ae288..e65d49b 100644
--- a/pets-fe/pages/walk/walk.js
+++ b/pets-fe/pages/walk/walk.js
@@ -203,7 +203,7 @@ Page({
onShareAppMessage() {
const walk = this.data.walk;
return {
- title: "肉垫计划 · 看看我们遛到哪儿了 🐾",
+ title: "肉垫计划 · 看看我们遛到哪儿了",
path:
walk && walk.share_enabled
? "/pages/share/share?token=" + walk.share_token
diff --git a/pets-fe/pages/walk/walk.json b/pets-fe/pages/walk/walk.json
index 7d08347..2f486b5 100644
--- a/pets-fe/pages/walk/walk.json
+++ b/pets-fe/pages/walk/walk.json
@@ -1 +1,7 @@
-{ "disableScroll": true, "usingComponents": { "tab-bar": "/components/tab-bar/index", "pet-picker": "/components/pet-picker/index" } }
+{
+ "disableScroll": true,
+ "usingComponents": {
+ "tab-bar": "/components/tab-bar/index",
+ "pet-picker": "/components/pet-picker/index"
+ }
+}
diff --git a/pets-fe/pages/walk/walk.wxml b/pets-fe/pages/walk/walk.wxml
index 6d8b5ad..095bd8e 100644
--- a/pets-fe/pages/walk/walk.wxml
+++ b/pets-fe/pages/walk/walk.wxml
@@ -1,8 +1,5 @@
-
+
-
- PAWPRINT WALK
- 一起去兜风
+
diff --git a/pets-fe/pages/walk/walk.wxss b/pets-fe/pages/walk/walk.wxss
index ce8cc80..a729d65 100644
--- a/pets-fe/pages/walk/walk.wxss
+++ b/pets-fe/pages/walk/walk.wxss
@@ -2,10 +2,6 @@
padding-left: 0;
padding-right: 0;
}
-.walk-screen > .eyebrow,
-.walk-screen > .title {
- margin-left: 32rpx;
-}
.map-box {
height: 450rpx;
position: relative;
@@ -30,7 +26,7 @@
}
.session-title {
font-size: 35rpx;
- font-weight: 800;
+ font-weight: 600;
margin: 12rpx 0 30rpx;
}
.stats {
@@ -58,7 +54,7 @@
color: #99aa9d;
}
.picker-title {
- font-weight: 700;
+ font-weight: 600;
margin: 26rpx 0 18rpx;
}
.main-button {
diff --git a/pets-fe/utils/layout.js b/pets-fe/utils/layout.js
new file mode 100644
index 0000000..8e67a64
--- /dev/null
+++ b/pets-fe/utils/layout.js
@@ -0,0 +1,19 @@
+function navigationGeometry(info = {}, menu = {}) {
+ const width = info.windowWidth || 375;
+ const height = info.windowHeight || 812;
+ const status = info.statusBarHeight || 24;
+ const validMenu = menu.top >= status && menu.height > 0 && menu.left > 0 && menu.left < width;
+ const top = validMenu ? menu.top : status + 6;
+ const rowHeight = validMenu ? menu.height : 32;
+ const menuLeft = validMenu ? menu.left : width - 100;
+ const headerHeight = top + rowHeight + 12;
+ return {
+ top,
+ rowHeight,
+ titleWidth: Math.max(80, menuLeft - 28),
+ headerHeight,
+ scrollHeight: Math.max(0, height - headerHeight),
+ };
+}
+
+module.exports = { navigationGeometry };