From a37992d6d73e72b15a4573916dccfbe0db577f4b Mon Sep 17 00:00:00 2001 From: lilin <2516625820@qq.com> Date: Mon, 5 Aug 2024 16:04:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meeting/components/custom_navbar.vue | 163 +++++++++++++++++++++++++++ meeting/index/index.vue | 34 ++++++ meeting/record/index.vue | 30 +++++ meeting/utils/systeminfo.js | 30 +++++ pages.json | 9 +- 5 files changed, 265 insertions(+), 1 deletion(-) create mode 100644 meeting/components/custom_navbar.vue create mode 100644 meeting/record/index.vue create mode 100644 meeting/utils/systeminfo.js diff --git a/meeting/components/custom_navbar.vue b/meeting/components/custom_navbar.vue new file mode 100644 index 0000000..16d1562 --- /dev/null +++ b/meeting/components/custom_navbar.vue @@ -0,0 +1,163 @@ + + + + + diff --git a/meeting/index/index.vue b/meeting/index/index.vue index e69de29..2bf0821 100644 --- a/meeting/index/index.vue +++ b/meeting/index/index.vue @@ -0,0 +1,34 @@ + + + + + \ No newline at end of file diff --git a/meeting/record/index.vue b/meeting/record/index.vue new file mode 100644 index 0000000..3c24005 --- /dev/null +++ b/meeting/record/index.vue @@ -0,0 +1,30 @@ + + + + + \ No newline at end of file diff --git a/meeting/utils/systeminfo.js b/meeting/utils/systeminfo.js new file mode 100644 index 0000000..86aa9a5 --- /dev/null +++ b/meeting/utils/systeminfo.js @@ -0,0 +1,30 @@ +let _sysInfo = uni.getSystemInfoSync(); +let statusBarHeight = 0; //状态栏高度 +let titleBarHeight = 0; //导航栏高度 +let customBarHeight = 0; //导航栏高度+导航栏高度 + +statusBarHeight = _sysInfo.statusBarHeight; +// #ifndef MP +if (_sysInfo.platform == 'android') { + titleBarHeight = 50; +} else { + titleBarHeight = 45; +} +// #endif + +// #ifdef MP-WEIXIN +let custom = wx.getMenuButtonBoundingClientRect(); +// 导航栏高度(标题栏高度) = 胶囊高度 + (顶部距离 - 状态栏高度) * 2 +titleBarHeight = custom.height + (custom.top - _sysInfo.statusBarHeight) * 2; +// customBarHeight = custom.bottom + custom.top - statusBarHeight; +// #endif +// #ifdef MP-ALIPAY +titleBarHeight = _sysInfo.titleBarHeight; +// #endif +customBarHeight = statusBarHeight + titleBarHeight; + +_sysInfo.titleBarHeight = titleBarHeight; +_sysInfo.statusBarHeight = statusBarHeight; +_sysInfo.customBarHeight = customBarHeight; + +export const sysInfo = _sysInfo; diff --git a/pages.json b/pages.json index 7abeb01..b73b798 100644 --- a/pages.json +++ b/pages.json @@ -153,7 +153,6 @@ ] }, { - "name":"", "root":"meeting", "pages":[ { @@ -171,6 +170,14 @@ "navigationStyle": "custom", "enablePullDownRefresh":false } + }, + { + "path":"record/index", + "style": { + "navigationBarTitleText": "会议记录", + "navigationStyle": "custom", + "enablePullDownRefresh":false + } } ] }