From 5e7b6de8a3d6882866fc623ea010f6f9d9cd8134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Fri, 14 Oct 2022 11:58:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=8C=E6=8A=A4=E7=90=86=E7=AB=99=E7=AE=80=E4=BB=8B=EF=BC=8C?=
 =?UTF-8?q?=E9=99=84=E8=BF=91=E6=8A=A4=E7=90=86=E7=AB=99=EF=BC=8C=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                        |  32 ++-
 pages/appointment/appointment.vue |  82 +++++++
 pages/detail/detail.vue           | 223 +++++++++++-------
 pages/site/site.vue               | 368 ++++++++++++++----------------
 4 files changed, 425 insertions(+), 280 deletions(-)
 create mode 100644 pages/appointment/appointment.vue

diff --git a/pages.json b/pages.json
index 2c76f6d..33234c6 100644
--- a/pages.json
+++ b/pages.json
@@ -23,6 +23,22 @@
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff" //背景颜色
 			}
+		},{
+		    "path" : "pages/appointment/appointment",
+		    "style" :
+		    {
+		        "navigationBarTitleText": "选择时间",
+		        "enablePullDownRefresh": false
+		    }
+
+		},
+		{
+			"path": "pages/detail/detail",
+			"style": {
+				"navigationBarTitleText": "护理站简介",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff" //背景颜色
+			}
 		}, {
 			"path": "pages/homepage/homepage",
 			"style": {
@@ -39,12 +55,14 @@
 			}
 		},
 		{
-			"path": "pages/detail/detail",
-			"style": {
-				"navigationBarTitleText": "护理站简介",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff" //背景颜色
-			}
+		    "path" : "pages/appointmenttime/appointmenttime",
+		    "style" :
+		    {
+		        "navigationBarTitleText": "预约时间",
+		        "enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#ffffff" //背景颜色
+		    }
+
 		},
 		{
 			"path": "pages/homepage/homepage",
@@ -88,7 +106,7 @@
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		}
-	],
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "",
diff --git a/pages/appointment/appointment.vue b/pages/appointment/appointment.vue
new file mode 100644
index 0000000..b040ba7
--- /dev/null
+++ b/pages/appointment/appointment.vue
@@ -0,0 +1,82 @@
+<template>
+	<!-- 	<view> -->
+	<view class="background">
+		<text class="appointment">选择想要预约的时间</text>
+		<view class="nowtime">
+			<view class="time">
+				9月10号
+			</view>
+			<view class="time">
+				9月11号
+			</view>
+			<view class="time">
+				9月12号
+			</view>
+			<view class="time">
+				9月13号
+			</view>
+		</view>
+
+	</view>
+	<!-- </view> -->
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	.nowtime {
+		display: flex;
+		/* flex-direction: row; */
+		flex-wrap: wrap;
+		justify-content: space-around;
+	}
+
+	.background {
+		width: 702rpx;
+		height: 773rpx;
+		font-size: ;
+		background: #FFFFFF;
+		box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03);
+		border-radius: 20px;
+		margin: 0 auto;
+		margin-top: 5%;
+	}
+
+	.appointment {
+		text-align: center;
+		width: 320rpx;
+		height: 34rpx;
+		font-size: 36rpx;
+		/* font-family: Adobe Heiti Std; */
+		font-weight: normal;
+		color: #000000;
+		line-height: 50px;
+
+		margin-left: 30%;
+
+	}
+
+	.time {
+		margin-top: 20rpx;
+		width: 290rpx;
+		height: 290rpx;
+		line-height: 290rpx;
+		text-align: center;
+		background: #4C7BC9;
+		border-radius: 25rpx;
+		margin-left: 5%;
+		color: white;
+		font-size: 50rpx;
+	}
+</style>
diff --git a/pages/detail/detail.vue b/pages/detail/detail.vue
index 1ce2a61..7c79501 100644
--- a/pages/detail/detail.vue
+++ b/pages/detail/detail.vue
@@ -1,111 +1,170 @@
 <template>
-	
+
 	<view class="CON">
 		<view class="concent">
 			<view class="background">
 				<view class="picture">
-						<image src="/static/detailed.png" mode=""></image>
-						<view>
-							<view class="detailed">
-								<view>护理站是以维护社区人群健康、满足社区 人群基本医疗护理需求为宗旨，以护士为核心 的各类护理人员组成的团队，在一定社区范围 内，为长期卧床老人、患者、残疾人、临终患 者和其他需要护理服务者提供基础护理、专科 护理、临终护理、消毒隔离技术指导、营养指导、社区康复指导、健康宣教和其他护理服务 的医疗机构。</view>
+					<image src="/static/detailed.png" mode=""></image>
+					<view>
+						<view class="detailed">
+							<view>护理站是以维护社区人群健康、满足社区 人群基本医疗护理需求为宗旨，以护士为核心 的各类护理人员组成的团队，在一定社区范围 内，为长期卧床老人、患者、残疾人、临终患
+								者和其他需要护理服务者提供基础护理、专科 护理、临终护理、消毒隔离技术指导、营养指导、社区康复指导、健康宣教和其他护理服务 的医疗机构。</view>
 							<view>护理站以遵医嘱的上门护理服务为主，包括生活护理和医疗护理，详情如下：</view>
-							</view>
-							</view>
-								</view>
-							</view>
 						</view>
-						<view class="concenta"></view>
+					</view>
 				</view>
-	
-	
-		
-	
+			</view>
+		</view>
+		<view class="concenta">
+			<text class="life">生活护理 </text>
+			<view class="lifeserve">
+				<image src="/static/lifeserve.png" mode=""></image>
+			</view>
+
+		</view>
+		<view  class="concentb">
+			<text class="life">医疗护理 </text>
+			<view class="lifeserve">
+				<image src="/static/yiliaohuli.png" mode=""></image>
+			</view>
+
+		</view>
+	</view>
+
+
+
+
+
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
-				
+
 			}
 		},
 		methods: {
-			
+
 		}
 	}
 </script>
 
 <style lang="scss">
-	.CON{
+	.CON {
 		// position: relative;
 		width: 100%;
 		height: 100%;
-	    // min-height: 100vh;
-		background-color:: #F4F5F7 ;
+		// min-height: 100vh;
+		background-color:#F4F5F7;
 		padding-bottom: 20rpx;
 	}
-.concent{
-	// position: absolute;
-	
-	width: 701rpx;
-	height: 811rpx;
-	background: #4C7BC9;
-	box-shadow: 0px 9px 31px 9px rgba(0,0,0,0.03);
-	border-radius: 20rpx;
-	margin-top: 5%;
-	// left: 50%;
-	// transform: translateX(-50%);
-	margin: 0 auto;
-	margin-bottom: 20px;
-}
-.concenta{
-	margin: 0 auto;
-	margin-bottom: 20px;
-	// position: absolute;
-	width: 701rpx;
-	height: 811rpx;
-	background: #E1AE3C;
-	// margin-top: 118%;
-	// margin-left: 2.55%;
-	border-radius: 25rpx;
-	// margin-bottom: 30rpx;
-}
-.background{
-	position: relative;
-	// display: flex;
-	width: 657rpx;
-	height: 727rpx;
-	background: #FFFFFF;
-	border-radius: 25rpx;
-	background-color: white;
-	margin: 0 auto;
-	top: 50%;
-	transform: translateY(-50%);
-	
 
-	// text-align:center;
-	
-	
-	
-}
-.detailed{
-	// font-size: 29rpx;
-	width: 657rpx;
-	height: 727rpx;
-	padding: 0 42rpx;
-	line-height: 56rpx;
-}
-.detailed view{
-	// height: 100%;
-	text-indent: 2em;
-}
-.picture image{
-	width: 178rpx;
-	height: 84rpx;
-	background: #FFFFFF;
-	border-radius: 25px;
-	// float: right;
-	margin-left:68%;
-	margin-top: 5%;
-}
+	.life {
+		// margin: 0 auto;
+		width: 162rpx;
+		height: 40rpx;
+		font-size: 42rpx;
+		margin-left: 35%;
+		color: #ffffff;
+
+
+
+	}
+
+	.concent {
+		// position: absolute;
+
+		width: 701rpx;
+		height: 811rpx;
+		background: #4C7BC9;
+		box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03);
+		border-radius: 20rpx;
+		margin-top: 5%;
+		// left: 50%;
+		// transform: translateX(-50%);
+		margin: 0 auto;
+		margin-bottom: 20px;
+	}
+
+	.lifeserve image {
+		width: 639rpx;
+		height: 739rpx;
+		margin-left: 5%;
+
+		padding-bottom: 20rpx;
+		// height: rpx;
+		// background: #E1AE3C;
+		// box-shadow: 0px 9px 31px 9px rgba(0,0,0,0.03);
+		// border-radius: 20px;
+	}
+
+	.concenta {
+
+		margin: 0 auto;
+		margin-bottom: 20px;
+		// position: absolute;
+		width: 701rpx;
+		height: 811rpx;
+		background: #E1AE3C;
+		// margin-top: 118%;
+		// margin-left: 2.55%;
+		border-radius: 25rpx;
+		// margin-bottom: 30rpx;
+	}
+	.concentb{
+		margin: 0 auto;
+		margin-bottom: 20px;
+		// position: absolute;
+		width: 701rpx;
+		height: 811rpx;
+		background: #00C176;
+		// margin-top: 118%;
+		// margin-left: 2.55%;
+		border-radius: 25rpx;
+		// margin-bottom: 30rpx;
+	}
+
+
+	.background {
+		position: relative;
+		// display: flex;
+		width: 657rpx;
+		height: 727rpx;
+		background: #FFFFFF;
+		border-radius: 25rpx;
+		background-color: white;
+		margin: 0 auto;
+		top: 50%;
+		transform: translateY(-50%);
+
+
+		// text-align:center;
+
+
+
+	}
+
+	.detailed {
+		// font-size: 29rpx;
+		width: 657rpx;
+		height: 727rpx;
+		padding: 0 42rpx;
+		line-height: 56rpx;
+	}
+
+	.detailed view {
+		// height: 100%;
+		text-indent: 2em;
+	}
+
+	.picture image {
+		width: 178rpx;
+		height: 84rpx;
+		background: #FFFFFF;
+		border-radius: 25px;
+		// float: right;
+		margin-left: 68%;
+		margin-top: 5%;
+	}
 </style>
diff --git a/pages/site/site.vue b/pages/site/site.vue
index dbe7fc2..7555766 100644
--- a/pages/site/site.vue
+++ b/pages/site/site.vue
@@ -1,11 +1,12 @@
 <template>
 	<view class="concent">
-		<view class="nursstation" @tap='detailed()'>
-			<text class="what" >什么是护理站？</text>
-			<u-icon class="icon" name="arrow-right"></u-icon>
-		</view>
-		<view class="page-body" style="margin-top: -80rpx;">
-			<view class="page-section page-section-gap" >
+		<view class="page-body" style="margin-top: -80rpx;position: relative;">
+			<view class="nursetation" @tap='detailed()'>
+				<text class="what" >什么是护理站？</text>
+				<u-icon class="icon" name="arrow-right"></u-icon>
+				<!-- <image src="../../static/jiantou.png" mode=""></image> -->
+			</view>
+			<view class="map" >
 				<map style="width:100%; height:40vh;" scale="17" :latitude="latitude" :longitude="longitude"
 					:markers="markers"></map>
 			</view>
@@ -15,42 +16,17 @@
 			<text class="nurse">济南护万家护理有限公司</text>
 			<text class="distance">距离您800米</text>
 			<view class="background">
-			
+
 					<view class="picture">
 							<image src="/static/logo.png" mode=""></image>
 					</view>
-				
+
 					<text class="qyttext">泉医通</text>
 					<text class="lianmeng">济卫护理联盟NO.1</text>
-			
+
 
 			</view>
-			<view class="click">点击了解</view>
-
-			<!-- <view class="items"> -->
-			<!-- 	<view class="item" v-for="(item,index) in nearbylist" :key="index" @tap='godetails(item)'>
-					<image :src="baseurl+item.stationPictureUrl" mode=""></image>
-					<view class="texts">
-						<view class="text">
-							{{item.nurseStationName}}
-						</view>
-						<view class="" v-if="item.nurseStationLabelList!=null">
-							<view class="pepole" v-if="item.nurseStationLabelList.length!=0">
-								<text v-for="(uitem,uindex)  in item.nurseStationLabelList" :key="uindex">
-									{{uitem.labelDescription}}{{' '}}
-								</text>
-							</view>
-						</view> -->
-
-			<!-- <view class="address">
-							{{item.address}}
-						</view>
-						<view class="project">
-							{{item.nurseStationDescription}}
-						</view> -->
-			<!-- 	</view>
-					<image class="rightimg" src="../../static/jt.png" mode=""></image>
-				</view> -->
+			<view class="click" @tap='nurse()'>点击了解</view>
 		</view>
 		<view class="masks" style="">
 			<view class="mask">
@@ -71,115 +47,126 @@
 	</view>
 </template>
 <script>
-	import {
-		getPatientInfo
-	} from '@/api/details/index.js';
-	import {
-		list,
-		nearbyList
-	} from '@/api/site/index.js';
-	import baseurl from '@/api/baseurl.js'
+	// import {
+	// 	getPatientInfo
+	// } from '@/api/details/index.js';
+	// import {
+	// 	list,
+	// 	nearbyList
+	// } from '@/api/site/index.js';
+	// import baseurl from '@/api/baseurl.js'
 	export default {
 		data() {
 			return {
-				iptVal: '',
-				value: '',
-				type: 'text',
-				border: true,
-				nearbylist: [],
-				nurseTypeCode: '',
-				openid: '',
-				baseurl: '',
-				id: 0, // 使用 marker点击事件 需要填写id
-				title: 'map',
-				latitude: 36.661634,
-				longitude: 117.025323,
-				title: 'map',
-				markers: [],
-				pageNum: 1,
-				pageSize: 10,
+				// iptVal: '',
+				// value: '',
+				// type: 'text',
+				// border: true,
+				// nearbylist: [],
+				// nurseTypeCode: '',
+				// openid: '',
+				// baseurl: '',
+				// id: 0, // 使用 marker点击事件 需要填写id
+				// title: 'map',
+				// latitude: 36.661634,
+				// longitude: 117.025323,
+				// title: 'map',
+				// markers: [],
+				// pageNum: 1,
+				// pageSize: 10,
 				mask: false,
 			}
 		},
-		onReachBottom() {
-			this.pageNum++;
-			if (this.nurseTypeCode != undefined) {
-				nearbyList(this.pageSize, this.pageNum, this.longitude, this.latitude, this.nurseTypeCode, this.iptVal)
-					.then(res => {
-						if (res.total == this.nearbylist.length) {
+		// onReachBottom() {
+		// 	this.pageNum++;
+		// 	if (this.nurseTypeCode != undefined) {
+		// 		nearbyList(this.pageSize, this.pageNum, this.longitude, this.latitude, this.nurseTypeCode, this.iptVal)
+		// 			.then(res => {
+		// 				if (res.total == this.nearbylist.length) {
 
-						} else {
-							res.rows.forEach(e => {
-								this.nearbylist.push(e)
-							})
-						}
-					})
-			} else {
-				uni.request({
-					url: baseurl +
-						`/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${this.pageSize}&pageNum=${this.pageNum}&homeLongitude=${this.longitude}&homeLatitude=${this.latitude}&nurseStationName=${this.iptVal}`, //仅为示例，并非真实接口地址。
-					success: (res) => {
-						if (res.data.total == this.nearbylist.length) {} else {
-							res.data.rows.forEach(e => {
-								this.nearbylist.push(e)
-							})
-						}
-						console.log(this.nearbylist)
-					}
-				});
-			}
-		},
+		// 				} else {
+		// 					res.rows.forEach(e => {
+		// 						this.nearbylist.push(e)
+		// 					})
+		// 				}
+		// 			})
+		// 	} else {
+		// 		uni.request({
+		// 			url: baseurl +
+		// 				`/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${this.pageSize}&pageNum=${this.pageNum}&homeLongitude=${this.longitude}&homeLatitude=${this.latitude}&nurseStationName=${this.iptVal}`, //仅为示例，并非真实接口地址。
+		// 			success: (res) => {
+		// 				if (res.data.total == this.nearbylist.length) {} else {
+		// 					res.data.rows.forEach(e => {
+		// 						this.nearbylist.push(e)
+		// 					})
+		// 				}
+		// 				console.log(this.nearbylist)
+		// 			}
+		// 		});
+		// 	}
+		// },
 
 
-		watch: {
-			iptVal() {
-				this.requestinfo()
-			},
-		},
+		// watch: {
+		// 	iptVal() {
+		// 		this.requestinfo()
+		// 	},
+		// },
 		onShow() {},
-		onLoad(options) {
-			console.log(options)
-			console.log(baseurl)
-			this.baseurl = baseurl;
-			this.nurseTypeCode = options.nurseTypeCode
-			var that = this
-			uni.getStorage({
-				key: 'openid',
-				success(res) {
-					console.log(res)
-					that.openid = res.data
-					getPatientInfo(that.openid).then(res => {
-						// console.log(res)
-						if (res.code == 200) {
-							that.latitude = res.data.homeLatitude
-							that.longitude = res.data.homeLongitude
-							console.log(that.latitude, that.longitude)
-							if (!that.latitude) {
-								that.latitude = 36.661634
-							}
-							if (!that.longitude) {
-								that.longitude = 117.025323
-							}
-							that.markers.push({
-								id: 3,
-								latitude: res.data.homeLatitude,
-								longitude: res.data.homeLongitude,
-								width: 20,
-								height: 25,
-								iconPath: "../../static/location.png"
-							})
-						}
-					})
-				}
-			})
-			that.requestinfo()
-		},
+		// onLoad(options) {
+		// 	console.log(options)
+		// 	console.log(baseurl)
+		// 	this.baseurl = baseurl;
+		// 	this.nurseTypeCode = options.nurseTypeCode
+		// 	var that = this
+		// 	uni.getStorage({
+		// 		key: 'openid',
+		// 		success(res) {
+		// 			console.log(res)
+		// 			that.openid = res.data
+		// 			getPatientInfo(that.openid).then(res => {
+		// 				// console.log(res)
+		// 				if (res.code == 200) {
+		// 					that.latitude = res.data.homeLatitude
+		// 					that.longitude = res.data.homeLongitude
+		// 					console.log(that.latitude, that.longitude)
+		// 					if (!that.latitude) {
+		// 						that.latitude = 36.661634
+		// 					}
+		// 					if (!that.longitude) {
+		// 						that.longitude = 117.025323
+		// 					}
+		// 					that.markers.push({
+		// 						id: 3,
+		// 						latitude: res.data.homeLatitude,
+		// 						longitude: res.data.homeLongitude,
+		// 						width: 20,
+		// 						height: 25,
+		// 						iconPath: "../../static/location.png"
+		// 					})
+		// 				}
+		// 			})
+		// 		}
+		// 	})
+		// 	that.requestinfo()
+		// },
 		methods: {
 			detailed(){
 					uni.navigateTo({
 						url: `/pages/detail/detail`
 					})
 				},
+				nurse(){
+					uni.navigateTo({
+						url: `/pages/nursestation/nursestation/`
+					})
+				},
+				cancel() {
+					this.mask = false
+					uni.reLaunch({
+						url: `/pages/site/site`
+					})
+				},
 			},
 			// getsite() {
 			// 	let data={};
@@ -188,41 +175,42 @@
 			// 		url: `/pages/homePage/homePage`
 			// 	})
 			// },
-			cancel() {
-				this.mask = false
-				uni.reLaunch({
-					url: `/pages/site/site`
-				})
-			},
-			requestinfo() {
-				if (this.nurseTypeCode != undefined) {
-					nearbyList(this.pageSize, this.pageNum, this.longitude, this.latitude, this.nurseTypeCode, this.iptVal)
-						.then(res => {
-							this.nearbylist = res.rows
-							console.log(this.nearbylist)
-						})
-				} else {
-					uni.request({
-						url: baseurl +
-							`/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${this.pageSize}&pageNum=${this.pageNum}&homeLongitude=${this.longitude}&homeLatitude=${this.latitude}&nurseStationName=${this.iptVal}`, //仅为示例，并非真实接口地址。
-						success: (res) => {
-							console.log(res)
-							this.nearbylist = res.data.rows
-							console.log(this.nearbylist)
-						}
-					});
-				}
-			},
-			godetails(item) {
-				uni.navigateTo({
-					url: `/pages/details/details?id=${item.nurseStationId}`
-				})
-			},
+
+
+			// requestinfo() {
+			// 	if (this.nurseTypeCode != undefined) {
+			// 		nearbyList(this.pageSize, this.pageNum, this.longitude, this.latitude, this.nurseTypeCode, this.iptVal)
+			// 			.then(res => {
+			// 				this.nearbylist = res.rows
+			// 				console.log(this.nearbylist)
+			// 			})
+			// 	} else {
+			// 		uni.request({
+			// 			url: baseurl +
+			// 				`/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${this.pageSize}&pageNum=${this.pageNum}&homeLongitude=${this.longitude}&homeLatitude=${this.latitude}&nurseStationName=${this.iptVal}`, //仅为示例，并非真实接口地址。
+			// 			success: (res) => {
+			// 				console.log(res)
+			// 				this.nearbylist = res.data.rows
+			// 				console.log(this.nearbylist)
+			// 			}
+			// 		});
+			// 	}
+			// },
+			// godetails(item) {
+			// 	uni.navigateTo({
+			// 		url: `/pages/details/details?id=${item.nurseStationId}`
+			// 	})
+			// },
 		}
-	
+
 </script>
 
 <style lang="scss">
+	.map{
+		width: 750rpx;
+		height: 544rpx;
+		background-color: red;
+	}
 	.picture2 image {
 		// position: absolute;
 		display: block;
@@ -323,6 +311,7 @@
 	}
 
 	.lists {
+		display: block;
 		position: relative;
 		margin: 0 auto;
 		background-color: #ffffff;
@@ -330,6 +319,7 @@
 		height: 227.8rpx;
 		margin-top: -10%;
 		border-radius: 10rpx;
+		// z-index: 99999;
 	}
 
 	.background {
@@ -371,7 +361,7 @@
 	.lianmeng {
 		display: block;
 		margin-left: 5%;
-		font-size: 9px;
+		font-size: 5px;
 		// font-family: Adobe Heiti Std;
 		// font-weight: normal;
 		color: #FFFFFF;
@@ -408,16 +398,16 @@
 		width: 80%;
 		line-height: 60rpx;
 		position: absolute;
-
-		margin-left: 55%;
-		// margin-top: 5%;
+// float: right;
+		margin-left: 85%;
+		margin-top: -9%;
 	}
 
 	.distance {
 		position: absolute;
 		float: right;
 		margin-top: 12%;
-		font-size: 27rpx;
+		font-size: 14rpx;
 		margin-left: 40%;
 		font-family: Adobe Heiti Std;
 		font-weight: normal;
@@ -425,12 +415,18 @@
 
 
 	}
-
-	.nursstation {
-		position: fixed;
-
+.nursestation image{
+	position: relative;
+	width: 16rpx;
+	height: 24rpx;
+}
+	.nursetation {
+		position:relative;
+		// display: block;
 		// margin:0 auto;
-		top: 0;
+		top: 50px;
+		left: 0px;
+		float: left;
 		// background-color: white;
 		border: 1px solid #f0f0f0;
 		width: 80%;
@@ -438,36 +434,26 @@
 		margin: 10rpx 0 10rpx 50%;
 		transform: translateX(-50%);
 		border-radius: 20rpx;
-		background-color: #ffffff;
-		z-index: 999;
-
-
-		// .input {
-		// 	margin: 0 auto;
-		// 	position: absolute;
-		// 	height: 50rpx;
-		// 	top: 5%;
-		// 	left: 12%;
-		// }
-
-		// .icon {
-		// 	background: url(@/static/sousuo.png) no-repeat;
-		// 	width: 40rpx;
-		// 	height: 40rpx;
-		// 	background-size: cover;
-		// 	position: absolute;
-		// 	top: 18%;
-		// 	left: 3%;
-		// }
+		background-color: red;
+		z-index: 100;
 
 	}
 
 	.what {
+		display: block;
+	// 	margin: 0 auto;
+		position: absolute;
+		height: 50rpx;
+		top: 5%;
+		left: 12%;
+		// background-color: #4486e8;
+		position: relative;
 		height: 60rpx;
 		width: 80%;
 		line-height: 60rpx;
 		margin-left: 5%;
-		// text-align: left padding: 20%;
+
+
 
 	}
 </style>

From c9b2a440af4923b1b973cffdf55dbe924d1fede0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Fri, 14 Oct 2022 19:48:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/appointmenttime/appointmenttime.vue | 228 ++++++++++++++++
 pages/site/site.vue                       | 305 +++++++++++-----------
 2 files changed, 375 insertions(+), 158 deletions(-)
 create mode 100644 pages/appointmenttime/appointmenttime.vue

diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue
new file mode 100644
index 0000000..f732a61
--- /dev/null
+++ b/pages/appointmenttime/appointmenttime.vue
@@ -0,0 +1,228 @@
+<template>
+	<view class="content">
+		<view class="message">请填写下面的信息</view>
+		<view class="xinxi">
+			<view class="user">
+				<view class="item" @tap='maskshow=true'>姓名：
+					<text class="name">李某某</text>
+				</view>
+				<view class="item" @tap='maskshow=true'>电话：
+					<text class="name">18565988855</text>
+				</view>
+				<view class="item" @tap='maskshow=true'>地址：
+					<text class="name">111</text>
+				</view>
+				<view class="item" @tap='timeshow2=true'>时间：
+					<text class="name">9月1日</text>
+				</view>
+			</view>
+		</view>
+		<view class="taocan">套餐信息：
+			<text class="price">￥60</text>
+			<view>
+				<text class="qiguan">
+					·气管切开
+				</text>
+			</view>
+		</view>
+		<view class="haocaibao">耗材包详情：
+			<text class="price2">￥60</text>
+			<view class="">
+				<text class="qiguan">
+					·一次性换药包X1，一次性注射器X1
+				</text>
+			</view>
+		</view>
+		<view class="beizhu">备注：</view>
+		<view class="xiugai">修改信息</view>
+		<view class="queren">确认预约</view>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				maskshow: false,
+				timeshow2: false,
+			}
+		},
+		methods: {
+
+		}
+	}
+</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;
+			}
+		}
+	}
+
+	.content {
+		/* width: 100%; */
+		min-height: 100vh;
+		background-color: #F4F5F7;
+		padding: 3%;
+	}
+
+	.message {
+		width: 701rpx;
+		height: 96rpx;
+		background: white;
+		/* box-shadow: 0px 9px 31px 9px rgba(0,0,0,0.03); */
+		border-radius: 20rpx;
+		margin: 0 auto;
+		text-align: center;
+		line-height: 96rpx;
+		/* margin-top: 5rpx; */
+		font-size: 36rpx;
+	}
+
+	.xinxi {
+		width: 701rpx;
+		height: 421rpx;
+		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; */
+		font-size: 36rpx;
+
+		color: #666666;
+
+
+	}
+
+	.title {
+		width: 90%;
+		margin: 0 auto;
+		font-size: 28rpx;
+		padding-top: 20rpx;
+		line-height: 34rpx;
+		color: #000000;
+		position: relative;
+	}
+
+	.taocan {
+		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;
+		line-height: 65rpx;
+		width: 702rpx;
+		height: 188rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin-top: 3%;
+	}
+
+	.beizhu {
+		font-size: 35rpx;
+		line-height: 65rpx;
+		width: 701rpx;
+		height: 96rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin-top: 3%;
+	}
+
+	.xiugai {
+		width: 205rpx;
+		height: 71rpx;
+		background: #E1AE3C;
+		border-radius: 26rpx;
+		margin-left: 35%;
+		margin-top: 10%;
+		line-height: 71rpx;
+		text-align: center;
+		color: #ffffff;
+	}
+
+	.queren {
+		width: 227rpx;
+		height: 71rpx;
+		background: #4C7BC9;
+		border-radius: 26rpx;
+		float: right;
+		margin-top: -10%;
+		line-height: 71rpx;
+		text-align: center;
+		color: #ffffff;
+		/* margin-top: 3%; */
+		/* margin-left: 60%; */
+		/* margin-top: 10%; */
+	}
+
+	.price {
+		/* float: right; */
+
+		font-size: 32rpx;
+		color: #D43953;
+		margin-left: 60%;
+		/* line-height: 77px; */
+	}
+
+	.price2 {
+	
+		font-size: 32rpx;
+		color: #D43953;
+		margin-left: 56%;
+		
+	}
+
+
+	.qiguan {
+		width: 301rpx;
+		height: 31rpx;
+		line-height: 31rpx;
+		font-size: 33rpx;
+		/* font-family: Adobe Heiti Std; */
+		/* font-weight: normal; */
+		color: #666666;
+		/* text-align: center; */
+		line-height: 31rpx;
+		margin-left: 20%;
+	}
+</style>
diff --git a/pages/site/site.vue b/pages/site/site.vue
index 7555766..38cc9c4 100644
--- a/pages/site/site.vue
+++ b/pages/site/site.vue
@@ -1,39 +1,44 @@
 <template>
 	<view class="concent">
-		<view class="page-body" style="margin-top: -80rpx;position: relative;">
+		<view class="page-body" style="margin-top: -80rpx;">
 			<view class="nursetation" @tap='detailed()'>
-				<text class="what" >什么是护理站？</text>
+				<text class="what">什么是护理站？</text>
 				<u-icon class="icon" name="arrow-right"></u-icon>
 				<!-- <image src="../../static/jiantou.png" mode=""></image> -->
 			</view>
-			<view class="map" >
-				<map style="width:100%; height:40vh;" scale="17" :latitude="latitude" :longitude="longitude"
-					:markers="markers"></map>
+			<view class="map">
+				<!-- <map style="width:100%; height:40vh;" scale="17" :latitude="latitude" :longitude="longitude"
+					:markers="markers"></map> -->
 			</view>
 		</view>
+		<view class="conNew">
+			<view class="addressContent">
+				<view class="lists" v-for="(item,index) in nearbylist" :key="index">
+					<text class="nurse">{{item.nurseStationName}}</text>
+					<text class="distance">距离您800米</text>
+					<view class="background">
 
-		<view class="lists">
-			<text class="nurse">济南护万家护理有限公司</text>
-			<text class="distance">距离您800米</text>
-			<view class="background">
-
-					<view class="picture">
+						<view class="picture">
 							<image src="/static/logo.png" mode=""></image>
+						</view>
+
+						<text class="qyttext">泉医通</text>
+						<text class="lianmeng">济卫护理联盟NO.1</text>
+
+
 					</view>
-
-					<text class="qyttext">泉医通</text>
-					<text class="lianmeng">济卫护理联盟NO.1</text>
-
-
+					<view class="click" @tap='godetails()'>
+						点击了解
+					</view>
+				</view>
 			</view>
-			<view class="click" @tap='nurse()'>点击了解</view>
 		</view>
-		<view class="masks" style="">
+
+		<view class="masks" style="" v-if="mask">
 			<view class="mask">
 				<view class="picture2">
 					<image src="../../static/locatinsmall.png"></image>
 				</view>
-
 				<view class="title">
 					请打开系统定位
 				</view>
@@ -47,34 +52,20 @@
 	</view>
 </template>
 <script>
-	// import {
-	// 	getPatientInfo
-	// } from '@/api/details/index.js';
-	// import {
-	// 	list,
-	// 	nearbyList
-	// } from '@/api/site/index.js';
-	// import baseurl from '@/api/baseurl.js'
+	import {
+		nearbyList
+	} from '@/api/site/index.js';
+	import baseurl from '@/api/baseurl.js'
 	export default {
 		data() {
 			return {
-				// iptVal: '',
-				// value: '',
-				// type: 'text',
-				// border: true,
-				// nearbylist: [],
-				// nurseTypeCode: '',
-				// openid: '',
-				// baseurl: '',
-				// id: 0, // 使用 marker点击事件 需要填写id
-				// title: 'map',
-				// latitude: 36.661634,
-				// longitude: 117.025323,
-				// title: 'map',
-				// markers: [],
-				// pageNum: 1,
-				// pageSize: 10,
-				mask: false,
+				nearbylist: [],
+				mask: true,
+				pageNum: 1,
+				pageSize: 10,
+				latitude: 36.661634,
+				longitude: 117.025323,
+
 			}
 		},
 		// onReachBottom() {
@@ -105,112 +96,98 @@
 		// 		});
 		// 	}
 		// },
-
-
-		// watch: {
-		// 	iptVal() {
-		// 		this.requestinfo()
-		// 	},
-		// },
-		onShow() {},
-		// onLoad(options) {
-		// 	console.log(options)
-		// 	console.log(baseurl)
-		// 	this.baseurl = baseurl;
-		// 	this.nurseTypeCode = options.nurseTypeCode
-		// 	var that = this
-		// 	uni.getStorage({
-		// 		key: 'openid',
-		// 		success(res) {
-		// 			console.log(res)
-		// 			that.openid = res.data
-		// 			getPatientInfo(that.openid).then(res => {
-		// 				// console.log(res)
-		// 				if (res.code == 200) {
-		// 					that.latitude = res.data.homeLatitude
-		// 					that.longitude = res.data.homeLongitude
-		// 					console.log(that.latitude, that.longitude)
-		// 					if (!that.latitude) {
-		// 						that.latitude = 36.661634
-		// 					}
-		// 					if (!that.longitude) {
-		// 						that.longitude = 117.025323
-		// 					}
-		// 					that.markers.push({
-		// 						id: 3,
-		// 						latitude: res.data.homeLatitude,
-		// 						longitude: res.data.homeLongitude,
-		// 						width: 20,
-		// 						height: 25,
-		// 						iconPath: "../../static/location.png"
-		// 					})
-		// 				}
-		// 			})
-		// 		}
-		// 	})
-		// 	that.requestinfo()
-		// },
-		methods: {
-			detailed(){
-					uni.navigateTo({
-						url: `/pages/detail/detail`
-					})
-				},
-				nurse(){
-					uni.navigateTo({
-						url: `/pages/nursestation/nursestation/`
-					})
-				},
-				cancel() {
-					this.mask = false
-					uni.reLaunch({
-						url: `/pages/site/site`
-					})
-				},
+		watch: {
+			iptVal() {
+				// this.requestinfo()
 			},
-			// getsite() {
-			// 	let data={};
-			// 	data.surl = '/pages/site/site'
+		},
+		onShow() {},
+		onLoad() {
+			var that = this
+			this.requestinfo()
+		},
+		methods: {
+
+			requestinfo() {
+				if (this.nurseTypeCode != undefined) {
+					nearbyList()
+						.then(res => {
+							this.nearbylist = res.rows
+							console.log(this.nearbylist)
+						})
+				} else {
+					uni.request({
+						url: baseurl +
+							`/nurseApplet/nearbyNursingStation/nearbyList`, //仅为示例，并非真实接口地址。
+						success: (res) => {
+							console.log(res)
+							this.nearbylist = res.data.rows
+							console.log(this.nearbylist)
+						}
+					});
+				}
+			},
+			godetails() {
+				// console.log("111");
+				uni.navigateTo({
+					url: `/pages/nursestation/nursestation`
+				})
+			},
+			detailed() {
+				uni.navigateTo({
+					url: `/pages/detail/detail`
+				})
+			},
+			// nurse() {
 			// 	uni.navigateTo({
-			// 		url: `/pages/homePage/homePage`
+			// 		url: `/pages/nursestation/nursestation`
 			// 	})
 			// },
-
-
-			// requestinfo() {
-			// 	if (this.nurseTypeCode != undefined) {
-			// 		nearbyList(this.pageSize, this.pageNum, this.longitude, this.latitude, this.nurseTypeCode, this.iptVal)
-			// 			.then(res => {
-			// 				this.nearbylist = res.rows
-			// 				console.log(this.nearbylist)
-			// 			})
-			// 	} else {
-			// 		uni.request({
-			// 			url: baseurl +
-			// 				`/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${this.pageSize}&pageNum=${this.pageNum}&homeLongitude=${this.longitude}&homeLatitude=${this.latitude}&nurseStationName=${this.iptVal}`, //仅为示例，并非真实接口地址。
-			// 			success: (res) => {
-			// 				console.log(res)
-			// 				this.nearbylist = res.data.rows
-			// 				console.log(this.nearbylist)
-			// 			}
-			// 		});
-			// 	}
-			// },
-			// godetails(item) {
-			// 	uni.navigateTo({
-			// 		url: `/pages/details/details?id=${item.nurseStationId}`
-			// 	})
-			// },
-		}
-
+			cancel() {
+				this.mask = false
+				// uni.reLaunch({
+				// 	url: `/pages/site/site`
+				// })
+			},
+		},
+	}
 </script>
 
 <style lang="scss">
-	.map{
+	.concent {
+		width: 100%;
+		height: 1000px;
+		background-color: #F4F5F7;
+		// box-sizing: border-box;
+		position: relative;
+	}
+	.conNew{
+		width: 100%;
+		height: 1000000px;
+		background-color: #F4F5F7;
+		// box-sizing: border-box;
+		position: relative;
+		// box-sizing: border-box;
+		// padding: 24px;
+	}
+
+	.addressContent {
+		position: absolute;
+		top: -91px;
+		// margin: 0 auto;
+		width: 100%;
+		// height: 100%;
+		// background: #F4F5F7;
+		// box-sizing: border-box;
+		padding: 24px;
+	}
+
+	.map {
 		width: 750rpx;
 		height: 544rpx;
 		background-color: red;
 	}
+
 	.picture2 image {
 		// position: absolute;
 		display: block;
@@ -311,15 +288,18 @@
 	}
 
 	.lists {
-		display: block;
-		position: relative;
-		margin: 0 auto;
+		// bottom: 5%;
+		// display: block;
+		// position: absolute;
+		// top: -191px;
+		// margin: 0 auto;
 		background-color: #ffffff;
-		width: 698.8rpx;
+		// width: 698.8rpx;
+		width: 100%;
 		height: 227.8rpx;
-		margin-top: -10%;
-		border-radius: 10rpx;
-		// z-index: 99999;
+		margin-bottom: 3%;
+		border-radius: 20rpx;
+		z-index: 99999;
 	}
 
 	.background {
@@ -361,7 +341,7 @@
 	.lianmeng {
 		display: block;
 		margin-left: 5%;
-		font-size: 5px;
+		font-size: 14rpx;
 		// font-family: Adobe Heiti Std;
 		// font-weight: normal;
 		color: #FFFFFF;
@@ -372,19 +352,26 @@
 		color: #ffffff;
 		float: right;
 		width: 167.3rpx;
-		height: 58.5rpx;
-		line-height: 58.5rpx;
+		height: 34px;
+		line-height: 34px;
+		// height: 58.5rpx;
+		// line-height: 58.5rpx;
 		// margin: 0 auto;
 		text-align: center;
 		background-color: #4C7BC9;
 		margin-top: 20%;
 		margin-right: 5%;
-		border-radius: 30rpx;
+		border-radius: 17px;
 		// margin-top: 6%;
 		// margin-left: 40%;
 		// border-radius: 10rpx;
 	}
 
+	.wenzi {
+		color: #ffffff;
+		text-align: center;
+	}
+
 	.nurse {
 		position: absolute;
 		float: right;
@@ -398,7 +385,7 @@
 		width: 80%;
 		line-height: 60rpx;
 		position: absolute;
-// float: right;
+		// float: right;
 		margin-left: 85%;
 		margin-top: -9%;
 	}
@@ -415,13 +402,15 @@
 
 
 	}
-.nursestation image{
-	position: relative;
-	width: 16rpx;
-	height: 24rpx;
-}
+
+	.nursestation image {
+		position: relative;
+		width: 16rpx;
+		height: 24rpx;
+	}
+
 	.nursetation {
-		position:relative;
+		position: relative;
 		// display: block;
 		// margin:0 auto;
 		top: 50px;
@@ -441,7 +430,7 @@
 
 	.what {
 		display: block;
-	// 	margin: 0 auto;
+		// 	margin: 0 auto;
 		position: absolute;
 		height: 50rpx;
 		top: 5%;