From c587b77c947d23378659565c1bed38a0e0f4300f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Thu, 28 Sep 2023 10:11:05 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 40 ++++++++++++++++++- pages/homepage/homepage.vue | 18 +++++++-- pagesC/Screeningrecords/Screeningrecords.vue | 17 +++++++- .../ServiceAppointment/ServiceAppointment.vue | 4 +- pagesC/appointmenttime/appointmenttime.vue | 2 +- 5 files changed, 71 insertions(+), 10 deletions(-) diff --git a/pages.json b/pages.json index f16362d..49e0b64 100644 --- a/pages.json +++ b/pages.json @@ -341,12 +341,50 @@ }, { "root": "pagesC", "pages": [{ - "path": "ServiceAppointmenttime/ServiceAppointmenttime", + "path": "ServiceAppointment/ServiceAppointment", "style": { "navigationBarTitleText": "服务预约", "enablePullDownRefresh": false } }, + { + "path": "appointmenttime/appointmenttime", + "style": { + "navigationBarTitleText": "服务预约", + "enablePullDownRefresh": false + } + }, + { + "path": "Screeningdetails/Screeningdetails", + "style": { + "navigationBarTitleText": "筛查详情", + "enablePullDownRefresh": false + } + }, + { + "path": "Healthrecords/Healthrecords", + "style": { + "navigationBarTitleText": "健康档案", + "enablePullDownRefresh": false + } + }, + { + "path": "Screeningrecords/Screeningrecords", + "style": { + "navigationBarTitleText": "筛查记录", + "enablePullDownRefresh": false + } + }, + + { + "path": "ServiceAppointment/ServiceAppointment", + "style": { + "navigationStyle": "custom", // 隐藏系统导航栏 + // "navigationBarTitleText": "商品订单", + "onReachBottomDistance": 20, //距离底部多远时触发 单位为px + "enablePullDownRefresh": true //设置参数为true + } + }, { "path": "ServiceAppointment/ServiceAppointment", "style": { diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index f27f11b..03ed4b3 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -14,13 +14,13 @@ 家医签约 - + 健康档案 - + 服务预约 @@ -56,7 +56,7 @@ - + @@ -75,6 +75,16 @@ this.login() }, methods: { + goHealthrecords() { + uni.navigateTo({ + url: '/pagesC/Healthrecords/Healthrecords' + }) + }, + gorecords() { + uni.navigateTo({ + url: '/pagesC/Screeningrecords/Screeningrecords' + }) + }, goappoint() { uni.navigateTo({ url: '/pagesC/ServiceAppointment/ServiceAppointment' @@ -106,4 +116,4 @@ \ No newline at end of file + diff --git a/pagesC/Screeningrecords/Screeningrecords.vue b/pagesC/Screeningrecords/Screeningrecords.vue index cbb2af4..e1bf28c 100644 --- a/pagesC/Screeningrecords/Screeningrecords.vue +++ b/pagesC/Screeningrecords/Screeningrecords.vue @@ -11,6 +11,19 @@ 详情 + + 眼底筛查 + + + + 2023-12-12 12:12:12 + + + 详情 + + + + @@ -32,7 +45,7 @@ \ No newline at end of file + diff --git a/pagesC/ServiceAppointment/ServiceAppointment.vue b/pagesC/ServiceAppointment/ServiceAppointment.vue index 2840601..4f47000 100644 --- a/pagesC/ServiceAppointment/ServiceAppointment.vue +++ b/pagesC/ServiceAppointment/ServiceAppointment.vue @@ -53,7 +53,7 @@ }, goapponint() { uni.navigateTo({ - url: '/pagesC/ServiceAppointmenttime/ServiceAppointmenttime' + url: '/pagesC/appointmenttime/appointmenttime' }) } }, @@ -168,4 +168,4 @@ } } } - \ No newline at end of file + diff --git a/pagesC/appointmenttime/appointmenttime.vue b/pagesC/appointmenttime/appointmenttime.vue index 4a40187..f9d126d 100644 --- a/pagesC/appointmenttime/appointmenttime.vue +++ b/pagesC/appointmenttime/appointmenttime.vue @@ -11,7 +11,6 @@ 提交 - @@ -44,6 +43,7 @@ .submit { width: 496rpx; height: 61rpx; + background: #26A888; border-radius: 5rpx; line-height: 61rpx; From 82b6501ee0fd3b8a7f858ff265fba15eb2cc20cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Thu, 28 Sep 2023 10:11:53 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E8=AE=B0=E5=BD=95+?= =?UTF-8?q?=E5=81=A5=E5=BA=B7=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesC/Healthrecords/Healthrecords.vue | 56 ++++++++ pagesC/Screeningdetails/Screeningdetails.vue | 140 +++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 pagesC/Healthrecords/Healthrecords.vue create mode 100644 pagesC/Screeningdetails/Screeningdetails.vue diff --git a/pagesC/Healthrecords/Healthrecords.vue b/pagesC/Healthrecords/Healthrecords.vue new file mode 100644 index 0000000..0dc6126 --- /dev/null +++ b/pagesC/Healthrecords/Healthrecords.vue @@ -0,0 +1,56 @@ + + + + + \ No newline at end of file diff --git a/pagesC/Screeningdetails/Screeningdetails.vue b/pagesC/Screeningdetails/Screeningdetails.vue new file mode 100644 index 0000000..f8cad02 --- /dev/null +++ b/pagesC/Screeningdetails/Screeningdetails.vue @@ -0,0 +1,140 @@ + + + + + \ No newline at end of file From b0bb473c10906f1616747e3e8c9c820375c0e4b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Thu, 28 Sep 2023 10:13:52 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=A2=84=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesC/ServiceAppointment/ServiceAppointment.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/pagesC/ServiceAppointment/ServiceAppointment.vue b/pagesC/ServiceAppointment/ServiceAppointment.vue index 4f47000..9f6fb65 100644 --- a/pagesC/ServiceAppointment/ServiceAppointment.vue +++ b/pagesC/ServiceAppointment/ServiceAppointment.vue @@ -43,6 +43,7 @@ background: { backgroundColor: '#26A888', }, + goodsName:'', }; }, methods: { From 40f07bed1a17d1a9818243b7ad580905017086c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Thu, 28 Sep 2023 10:14:35 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=AD=9B=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesC/Screeningrecords/Screeningrecords.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pagesC/Screeningrecords/Screeningrecords.vue b/pagesC/Screeningrecords/Screeningrecords.vue index e1bf28c..a083fb5 100644 --- a/pagesC/Screeningrecords/Screeningrecords.vue +++ b/pagesC/Screeningrecords/Screeningrecords.vue @@ -45,7 +45,7 @@ \ No newline at end of file From 7bf271410b938be83b152191e6b633c06706ece9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Thu, 28 Sep 2023 14:12:35 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesC/Screeningrecords/Screeningrecords.vue | 5 +++-- pagesC/ServiceAppointment/ServiceAppointment.vue | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pagesC/Screeningrecords/Screeningrecords.vue b/pagesC/Screeningrecords/Screeningrecords.vue index a083fb5..f5b9767 100644 --- a/pagesC/Screeningrecords/Screeningrecords.vue +++ b/pagesC/Screeningrecords/Screeningrecords.vue @@ -5,7 +5,7 @@ - 2023-12-12 12:12:12 + 2023-12-12 12:12:12 详情 @@ -16,7 +16,7 @@ - 2023-12-12 12:12:12 + 2023-12-12 12:12:12 详情 @@ -48,6 +48,7 @@ height: 100vh; background-color: #F7F5F5; padding: 30rpx 0 0 0; + overflow: scroll; .content { position: relative; diff --git a/pagesC/ServiceAppointment/ServiceAppointment.vue b/pagesC/ServiceAppointment/ServiceAppointment.vue index 9f6fb65..ec704e3 100644 --- a/pagesC/ServiceAppointment/ServiceAppointment.vue +++ b/pagesC/ServiceAppointment/ServiceAppointment.vue @@ -66,6 +66,7 @@ height: 100vh; background-color: #F7F5F5; padding: 30rpx 0 0 0; + overflow: scroll; ::v-deep .u-navbar-placeholder { background-color: #F7F5F5;