diff --git a/pages.json b/pages.json
index a5dec58..dc3120c 100644
--- a/pages.json
+++ b/pages.json
@@ -80,17 +80,7 @@
"group": "物业管理"
}
},
- {
- "path": "pages/notice/detail",
- "style": {
- "navigationBarTitleText": "通知公告"
- },
- "meta": {
- "sync": true,
- "title": "通知公告",
- "group": "物业管理"
- }
- },
+
{
"path": "pages/index/search",
"style": {
@@ -522,18 +512,6 @@
"title": "申请提现",
"group": "分销商城"
}
- },
- {
- "path": "message",
- "style": {
- "navigationBarTitleText": "消息通知"
- },
- "meta": {
- "auth": true,
- "sync": true,
- "title": "消息通知",
- "group": "分销商城"
- }
}
]
},
@@ -602,9 +580,9 @@
]
},
{
- "root": "pages/community",
+ "root": "pages/sub",
"pages": [{
- "path": "dynamics",
+ "path": "community/dynamics",
"style": {
"navigationBarTitleText": "社区动态"
},
@@ -613,6 +591,73 @@
"title": "社区动态",
"group": "物业管理"
}
+ },
+ {
+ "path": "notice/detail",
+ "style": {
+ "navigationBarTitleText": "通知公告"
+ },
+ "meta": {
+ "sync": true,
+ "title": "通知公告",
+ "group": "物业管理"
+ }
+ },
+ {
+ "path": "activity/list",
+ "style": {
+ "navigationBarTitleText": "小区活动"
+ },
+ "meta": {
+ "sync": true,
+ "title": "小区活动",
+ "group": "物业管理"
+ }
+ },
+ {
+ "path": "activity/detail",
+ "style": {
+ "navigationBarTitleText": "小区活动"
+ },
+ "meta": {
+ "sync": true,
+ "title": "小区活动",
+ "group": "物业管理"
+ }
+ },
+ {
+ "path": "staff/index",
+ "style": {
+ "navigationBarTitleText": "物业人员"
+ },
+ "meta": {
+ "sync": true,
+ "title": "物业人员",
+ "group": "物业管理"
+ }
+ },
+ {
+ "path": "knowledge/classroom",
+ "style": {
+ "navigationBarTitleText": "知识课堂"
+ },
+ "meta": {
+ "sync": true,
+ "title": "知识课堂",
+ "group": "物业管理"
+ }
+ },
+ {
+ "path": "community/daily",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom"
+ },
+ "meta": {
+ "sync": true,
+ "title": "物业日常",
+ "group": "物业管理"
+ }
}
]
},
diff --git a/pages/index/guest.vue b/pages/index/guest.vue
index fcb79bd..c703ba9 100644
--- a/pages/index/guest.vue
+++ b/pages/index/guest.vue
@@ -43,12 +43,12 @@
/* 导航栏 */
.navbar {
width: 100%;
- height: 88rpx;
background-color: transparent;
display: flex;
align-items: center;
justify-content: center;
- padding-top: env(safe-area-inset-top);
+ padding-top: calc(env(safe-area-inset-top) + 44rpx);
+ height: calc(44rpx + env(safe-area-inset-top));
.navbar-content {
width: 100%;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index afaf6a3..dd6c0bb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -125,12 +125,12 @@ const bannerList = ref([
// 功能入口列表
const functionList = ref([
- { label: '工作计划', icon: '/static/img/Group_1.png', bgGradient: 'linear-gradient(35deg, #FF7F69 0%, #FC5A5D 100%)', path: '/pages/community/dynamics' },
- { label: '业主投票', icon: '/static/img/Group_2.png', bgGradient: 'linear-gradient(35deg, #52C41A 0%, #36AD1A 100%)', path: '' },
+ { label: '工作计划', icon: '/static/img/Group_1.png', bgGradient: 'linear-gradient(35deg, #FF7F69 0%, #FC5A5D 100%)', path: '/pages/sub/community/dynamics' },
+ { label: '业主投票', icon: '/static/img/Group_2.png', bgGradient: 'linear-gradient(35deg, #52C41A 0%, #36AD1A 100%)', path: '/pages/sub/community/daily' },
{ label: '收益公示', icon: '/static/img/Group_3.png', bgGradient: 'linear-gradient(35deg, #FFA940 0%, #FA8C16 100%)', path: '' },
{ label: '在线缴费', icon: '/static/img/Group_4.png', bgGradient: 'linear-gradient(35deg, #4096FF 0%, #1890FF 100%)', path: '' },
{ label: '报事报修', icon: '/static/img/Group_5.png', bgGradient: 'linear-gradient(35deg, #69B1FF 0%, #4096FF 100%)', path: '' },
- { label: '物业人员', icon: '/static/img/Group_6.png', bgGradient: 'linear-gradient(35deg, #9254DE 0%, #722ED1 100%)', path: '' },
+ { label: '物业人员', icon: '/static/img/Group_6.png', bgGradient: 'linear-gradient(35deg, #9254DE 0%, #722ED1 100%)', path: '/pages/sub/staff/index' },
{ label: '业委会组织', icon: '/static/img/Group_7.png', bgGradient: 'linear-gradient(35deg, #7B61FF 0%, #597EF7 100%)', path: '' },
{ label: '更多服务', icon: '/static/img/Group_8.png', bgGradient: 'linear-gradient(35deg, #36CFC9 0%, #13C2C2 100%)', path: '' },
]);
@@ -152,7 +152,7 @@ const handleFunctionTap = (item) => {
// 通知
const goNotice = () => {
- uni.navigateTo({ url: '/pages/notice/detail?id=1' });
+ uni.navigateTo({ url: '/pages/sub/notice/detail?id=1' });
};
// 跳转登录页
@@ -166,22 +166,22 @@ const goCheck = () => {
// 法律小课堂
const goLawClass = () => {
- uni.navigateTo({ url: '/pages/public/richtext?title=法律小课堂' });
+ uni.navigateTo({ url: '/pages/sub/knowledge/classroom?tab=0', fail: (err) => { console.error('跳转失败', err); } });
};
// 小区治理
const goCommunityGov = () => {
- uni.navigateTo({ url: '/pages/public/richtext?title=小区治理' });
+ uni.navigateTo({ url: '/pages/sub/knowledge/classroom?tab=1', fail: (err) => { console.error('跳转失败', err); } });
};
// 活动列表
const goActivityList = () => {
- uni.navigateTo({ url: '/pages/activity/index' });
+ uni.navigateTo({ url: '/pages/sub/activity/list' });
};
// 活动详情
const goActivityDetail = () => {
- uni.navigateTo({ url: '/pages/activity/detail' });
+ uni.navigateTo({ url: '/pages/sub/activity/detail?id=1' });
};
diff --git a/pages/index/user.vue b/pages/index/user.vue
index e666a13..a85750e 100644
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@@ -35,7 +35,7 @@
-