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] =?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 @@
 					家医签约
 				</view>
 			</view>
-			<view class="home">
+			<view class="home" @tap="goHealthrecords">
 				<image src="/static/pageC/health.png" mode=""></image>
 				<view class="name">
 					健康档案
 				</view>
 			</view>
-			<view class="home"  @tap="goappoint">
+			<view class="home" @tap="goappoint">
 				<image src="/static/pageC/serveappoint.png" mode=""></image>
 				<view class="name">
 					服务预约
@@ -56,7 +56,7 @@
 				</view>
 				<view class="sign">
 					<image src="/static/pageC/healthmyself.png" mode=""></image>
-					<image src="/static/pageC/records.png" mode=""></image>
+					<image @tap="gorecords" src="/static/pageC/records.png" mode=""></image>
 				</view>
 			</view>
 		</view>
@@ -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 @@
 
 <style lang="scss">
 	@import "./homepage.scss";
-</style>
\ No newline at end of file
+</style>
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 @@
 				详情
 			</view>
 		</view>
+		<view class="content">
+			<view class="big">眼底筛查
+
+			</view>
+			<view class="servename">
+				2023-12-12   12:12:12
+			</view>
+			<view class="appoint" @tap="goapponint">
+				详情
+			</view>
+		</view>
+
+
 	</view>
 </template>
 
@@ -32,7 +45,7 @@
 
 <style lang="scss">
 	.app {
-		height: 100vh;
+		height: 100%;
 		background-color: #F7F5F5;
 		padding: 30rpx 0 0 0;
 
@@ -78,4 +91,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>
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 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>
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 @@
 				提交
 			</view>
 		</view>
-
 	</view>
 </template>
 
@@ -44,6 +43,7 @@
 			.submit {
 				width: 496rpx;
 				height: 61rpx;
+			
 				background: #26A888;
 				border-radius: 5rpx;
 				line-height: 61rpx;