From 6c0d25e640fbaef60fccb37ddac0d60931a65e83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Mon, 17 Oct 2022 18:35:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E7=90=86=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/site/index.js                         |   2 +-
 pages.json                                |  48 +++++----
 pages/appointment/appointment.vue         |  18 +++-
 pages/appointmenttime/appointmenttime.vue | 117 ++++++++++++----------
 pages/site/site.vue                       |   6 +-
 5 files changed, 111 insertions(+), 80 deletions(-)

diff --git a/api/site/index.js b/api/site/index.js
index b2376a0..e60c559 100644
--- a/api/site/index.js
+++ b/api/site/index.js
@@ -8,7 +8,7 @@ import request from "../request.js"
 // 	})
 // }
 
-export function nearbyList(pageSize,pageNum,longitude, latitude, nurseStationType, nurseStationName) {
+export function nearbyList(pageSize,pageNum,longitude, latitude, nurseStationType, ) {
 	return request({
 		url: `/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${pageSize}&pageNum=${pageNum}&homeLongitude=${longitude}&homeLatitude=${latitude}&nurseStationType=${nurseStationType}&nurseStationName=${nurseStationName}`,
 		method: 'GET'
diff --git a/pages.json b/pages.json
index 33234c6..5fe6532 100644
--- a/pages.json
+++ b/pages.json
@@ -4,6 +4,34 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+		    "path" : "pages/nursestation/nursestation",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "济南护万家护理有限公司",
+		        "enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+		    }
+		    
+		},
+		{
+			"path": "pages/site/site",
+			"style": {
+				"navigationBarTitleText": "附近护理站",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff" //背景颜色
+			}
+		},
+		
+		{
+		    "path" : "pages/appointmenttime/appointmenttime",
+		    "style" :
+		    {
+		        "navigationBarTitleText": "预约时间",
+		        "enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#ffffff" //背景颜色
+		    }
+		
+		},{
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "",
@@ -17,13 +45,6 @@
 				"navigationStyle": "custom"
 			}
 		}, {
-			"path": "pages/site/site",
-			"style": {
-				"navigationBarTitleText": "附近护理站",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff" //背景颜色
-			}
-		},{
 		    "path" : "pages/appointment/appointment",
 		    "style" :
 		    {
@@ -54,16 +75,7 @@
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		},
-		{
-		    "path" : "pages/appointmenttime/appointmenttime",
-		    "style" :
-		    {
-		        "navigationBarTitleText": "预约时间",
-		        "enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#ffffff" //背景颜色
-		    }
-
-		},
+	
 		{
 			"path": "pages/homepage/homepage",
 			"style": {
@@ -106,6 +118,8 @@
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		}
+       
+        
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/pages/appointment/appointment.vue b/pages/appointment/appointment.vue
index b040ba7..c4ad9aa 100644
--- a/pages/appointment/appointment.vue
+++ b/pages/appointment/appointment.vue
@@ -3,16 +3,16 @@
 	<view class="background">
 		<text class="appointment">选择想要预约的时间</text>
 		<view class="nowtime">
-			<view class="time">
+			<view class="time" @tap='appointment()' hover-class="click-hover">
 				9月10号
 			</view>
-			<view class="time">
+			<view class="time" @tap='appointment()' hover-class="click-hover">
 				9月11号
 			</view>
-			<view class="time">
+			<view class="time" @tap='appointment()' hover-class="click-hover">
 				9月12号
 			</view>
-			<view class="time">
+			<view class="time" @tap='appointment()' hover-class="click-hover">
 				9月13号
 			</view>
 		</view>
@@ -29,12 +29,20 @@
 			}
 		},
 		methods: {
-
+			appointment() {
+				uni.navigateTo({
+					url: `/pages/appointmenttime/appointmenttime`
+				})
+			},
 		}
 	}
 </script>
 
 <style>
+	.click-hover{
+	background-color:red;
+	
+	}
 	.nowtime {
 		display: flex;
 		/* flex-direction: row; */
diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue
index f732a61..823bdd5 100644
--- a/pages/appointmenttime/appointmenttime.vue
+++ b/pages/appointmenttime/appointmenttime.vue
@@ -3,17 +3,24 @@
 		<view class="message">请填写下面的信息</view>
 		<view class="xinxi">
 			<view class="user">
-				<view class="item" @tap='maskshow=true'>姓名：
-					<text class="name">李某某</text>
+				<view class="item">
+					<span class="texts">姓名：</span>
+					<!-- <text>某某某</text> -->
+					<!-- <input type="text"> -->
+					<u-input  />
 				</view>
-				<view class="item" @tap='maskshow=true'>电话：
-					<text class="name">18565988855</text>
+				<view class="item">
+					<span class="texts">电话：</span>
+					<!-- <text>18888888888</text> -->
+					<u-input  />
 				</view>
-				<view class="item" @tap='maskshow=true'>地址：
-					<text class="name">111</text>
+				<view class="item">
+					<span class="texts">时间：</span>
+					<u-input  />
 				</view>
-				<view class="item" @tap='timeshow2=true'>时间：
-					<text class="name">9月1日</text>
+				<view class="item1">
+					<span class="texts">地址：</span>
+				<u-input  />
 				</view>
 			</view>
 		</view>
@@ -33,7 +40,10 @@
 				</text>
 			</view>
 		</view>
-		<view class="beizhu">备注：</view>
+		<view class="beizhu">
+			<span>备注：</span>
+				<input placeholder="">
+		</view>
 		<view class="xiugai">修改信息</view>
 		<view class="queren">确认预约</view>
 	</view>
@@ -53,40 +63,44 @@
 </script>
 
 <style>
-	.user {
-		/* background-color: #fff; */
-		/* margin-bottom: 16rpx; */
-
-		.item {
-			height: 100rpx;
-			width: 90%;
-			margin: 0 auto;
-			line-height: 100rpx;
-			border-bottom: 1rpx solid #f0f1f6;
-			display: flex;
-			justify-content: space-between;
-			font-size: 24rpx;
-			letter-spacing: 1rpx;
-
-			text:nth-child(1) {
-				color: #000000;
-			}
-
-			text:nth-child(2) {
-				color: #333333;
-			}
-		}
+	.text {
+		color: #000000;
+		margin-left: 1%;
+		line-height: 100rpx;
+	
+	}
+	.texts {
+		margin-left: 5%;
 	}
 
+	.item {
+		width: 97%;
+		height: 93rpx;
+		/* line-height: 93rpx; */
+		border-bottom: 1rpx solid #D8D4D4;
+		margin-left: 10rpx;
+		display: flex;
+		align-items: center;
+		font-size: 36rpx;
+	}
+	.item1 {
+		width: 97%;
+		height: 93rpx;
+		/* line-height: 93rpx; */
+		margin-left: 10rpx;
+		display: flex;
+		align-items: center;
+		font-size: 36rpx;
+	}
 	.content {
 		/* width: 100%; */
-		min-height: 100vh;
+		min-height: 110vh;
 		background-color: #F4F5F7;
 		padding: 3%;
 	}
 
 	.message {
-		width: 701rpx;
+		width: 99%;
 		height: 96rpx;
 		background: white;
 		/* box-shadow: 0px 9px 31px 9px rgba(0,0,0,0.03); */
@@ -99,24 +113,13 @@
 	}
 
 	.xinxi {
-		width: 701rpx;
-		height: 421rpx;
+		width: 99%;
+		height: 400rpx;
 		background: #FFFFFF;
 		/* box-shadow: 0px 9px 31px 9px rgba(0,0,0,0.03); */
 		border-radius: 20rpx;
 		margin-top: 3%;
 	}
-
-	.item {
-		width: 100%;
-		height: 100rpx;
-		font-size: 36rpx;
-		display: flex;
-		justify-content: space-around;
-		line-height: 70rpx;
-		border-bottom: 1rpx solid #D8D4D4;
-	}
-
 	.name {
 		width: 70%;
 		/* height: 33rpx; */
@@ -138,18 +141,21 @@
 	}
 
 	.taocan {
+		padding: 3%;
+		line-height: 12rpx;
 		font-size: 35rpx;
 		line-height: 70rpx;
 		width: 702rpx;
 		height: 243rpx;
 		background: #FFFFFF;
-		box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03);
 		border-radius: 20rpx;
 		margin-top: 3%;
 	}
 
 	.haocaibao {
-		font-size: 33rpx;
+		padding: 3%;
+		line-height: 12rpx;
+		font-size: 35rpx;
 		line-height: 65rpx;
 		width: 702rpx;
 		height: 188rpx;
@@ -159,6 +165,8 @@
 	}
 
 	.beizhu {
+		padding: 3%;
+		line-height: 12rpx;
 		font-size: 35rpx;
 		line-height: 65rpx;
 		width: 701rpx;
@@ -166,6 +174,9 @@
 		background: #FFFFFF;
 		border-radius: 20rpx;
 		margin-top: 3%;
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
 	}
 
 	.xiugai {
@@ -190,9 +201,7 @@
 		line-height: 71rpx;
 		text-align: center;
 		color: #ffffff;
-		/* margin-top: 3%; */
-		/* margin-left: 60%; */
-		/* margin-top: 10%; */
+
 	}
 
 	.price {
@@ -205,11 +214,11 @@
 	}
 
 	.price2 {
-	
+
 		font-size: 32rpx;
 		color: #D43953;
 		margin-left: 56%;
-		
+
 	}
 
 
diff --git a/pages/site/site.vue b/pages/site/site.vue
index 38cc9c4..d33771b 100644
--- a/pages/site/site.vue
+++ b/pages/site/site.vue
@@ -308,7 +308,7 @@
 		height: 180rpx;
 		background-color: #4C7BC9;
 		margin-top: 4%;
-		margin-left: 10%;
+		margin-left: 7%;
 		border-radius: 30rpx;
 	}
 
@@ -377,7 +377,7 @@
 		float: right;
 		margin-top: 5%;
 		font-size: 30rpx;
-		margin-left: 40%;
+		margin-left: 35%;
 	}
 
 	.icon {
@@ -395,7 +395,7 @@
 		float: right;
 		margin-top: 12%;
 		font-size: 14rpx;
-		margin-left: 40%;
+		margin-left: 35%;
 		font-family: Adobe Heiti Std;
 		font-weight: normal;
 		color: #666666;