From 254ffb427a2dc42f4e8215e24bdf6148f99f29ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Thu, 2 Mar 2023 21:01:37 +0800
Subject: [PATCH] up

---
 common/config.js                          |    4 +-
 components/doingOrder/doingOrder.vue      |  322 +++++
 pages/home/home.vue                       |  304 +----
 pages/list/list.vue                       |    9 +-
 pages/login/login.vue                     |    2 +-
 pages/nursingCalendar/nursingCalendar.vue | 1437 +++++++++++----------
 pages/todayNursing/todayNursing.vue       |  798 ++++++------
 7 files changed, 1466 insertions(+), 1410 deletions(-)
 create mode 100644 components/doingOrder/doingOrder.vue

diff --git a/common/config.js b/common/config.js
index cea6495..925d7b8 100644
--- a/common/config.js
+++ b/common/config.js
@@ -3,8 +3,8 @@ const mode = process.env.NODE_ENV;
 let ROOTPATH = ''; //域名
 switch (mode) {
 	case 'development':
-		//ROOTPATH = "http://sstt.ali251.langye.net"
-		ROOTPATH = "https://sstt.115.langye.net"
+		ROOTPATH = "http://sstt.ali251.langye.net"
+		//ROOTPATH = "https://sstt.115.langye.net"
 		break;
 	case 'production':
 		ROOTPATH = "https://sstt.115.langye.net"
diff --git a/components/doingOrder/doingOrder.vue b/components/doingOrder/doingOrder.vue
new file mode 100644
index 0000000..1a2c6df
--- /dev/null
+++ b/components/doingOrder/doingOrder.vue
@@ -0,0 +1,322 @@
+<template>
+	<view>
+		
+				<u-popup v-model="isShowIng" height="60%" mode="bottom" border-radius="14" closeable	>
+						<view class="nursing-list">
+							<view v-if="nursingList && nursingList.length > 0">
+								<view v-for="(item,index) in nursingList" :key="index" class="list-item">
+									<view class="top">
+										<view class="time">{{item.start_time}}</view>
+										<view class="status">
+											<view class="status-icon"
+												:class="{icon1:item.status === 0,icon2:item.status === 2,icon3:item.status === 1}">
+											</view>
+											<view v-if="item.status === 1" class="status-text">护理中</view>
+											<view v-else-if="item.status === 0" class="status-text">待护理</view>
+											<view v-else class="status-text">已护理</view>
+										</view>
+									</view>
+						
+									<view class="line"></view>
+						
+									<view class="center" @click="toDetail(item)">
+										<view class="avatar">
+											<u-image :src="item.customer.sex === '男' ? vuex_male_img : vuex_female_img" height="104"
+												width="104" shape="circle"></u-image>
+										</view>
+										<view class="user-info-pop">
+											<view class="name">{{item.customer.name}}</view>
+											<view class="tel">
+												<view>
+													<u-icon name="phone" size="28" color="#1479FF"></u-icon>
+												</view>
+												<view class="text">{{item.customer.phone || '无'}}</view>
+											</view>
+											<view class="address">
+												<view>
+													<u-icon name="map" size="28" color="#1479FF"></u-icon>
+												</view>
+												<view class="text">{{item.customer_address.address || '无'}}</view>
+											</view>
+										</view>
+										<view class="sex">
+											<view class="sex-text">
+												{{item.customer.sex  || '无'}}
+											</view>
+										</view>
+									</view>
+						
+									<view class="bottom">
+										<view class="to-there" @click="toThere(item)">
+											<view class="to-there-text">去那里</view>
+											<view class="to-there-icon">
+												<u-image src="/static/todayNursing/to-there.png" height="46" width="46"></u-image>
+											</view>
+										</view>
+									</view>
+						
+								</view>
+							</view>
+						
+							<view v-else>
+								<u-empty mode="list" text="暂无护理"></u-empty>
+							</view>
+						</view>
+					</u-popup>
+			</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"doingOrder",
+		data() {
+			return {
+				isShowIng:false,
+				nursingList:[],
+				ing:0,
+			};
+		},
+		methods:{
+			toThere(item) {
+				this.$u.throttle(() => {
+					uni.openLocation({
+						latitude: Number(item.customer.lat),
+						longitude: Number(item.customer.lng),
+						name: item.customer.address
+					})
+				})
+			},
+			//跳转详情
+			toDetail(item) {
+				uni.$u.throttle(() => {
+					uni.navigateTo({
+						url: `/pages/detailNursing/detailNursing?id=${item.id}`
+					})
+				})
+			},
+			async getStatistic() {
+				let res = await this.$u.api.statistic()
+				this.ing = res.ing
+			},
+			async getIngList() {
+				let res = await this.$u.api.nurseList({
+					page:1,
+					page_size:999,
+					status:1
+				})
+				this.nursingList = res.data
+			}
+		},
+		async created() {
+			console.log("onShow","doorder")
+			await this.getStatistic();
+			if(this.ing > 0){
+				await this.getIngList()
+				this.isShowIng = true
+			}
+		}
+	}
+</script>
+
+<style  scoped lang="scss">
+	.nursing-list {
+	
+		margin-top: 88rpx;
+	
+		.list-item {
+			width: 710rpx;
+			background: #FFFFFF;
+			filter: drop-shadow(0 0 10px rgba(219, 218, 218, 0.5));
+	
+			margin: 0 20rpx 26rpx 22rpx;
+	
+			.top {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+	
+				padding: 22rpx 0;
+	
+				.time {
+					height: 40rpx;
+					font-size: 40rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #36596A;
+					line-height: 40rpx;
+	
+					padding-left: 20rpx;
+				}
+	
+				.status {
+					display: flex;
+					align-items: center;
+	
+					.status-icon {
+	
+						margin-right: 10rpx;
+					}
+	
+					.status-text {
+						width: 84rpx;
+						height: 40rpx;
+						font-size: 28rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #36596A;
+						line-height: 40rpx;
+	
+						margin-right: 20rpx;
+					}
+				}
+			}
+	
+			.line {
+				width: 670rpx;
+				height: 2rpx;
+				border: 2rpx solid #EEEFF5;
+	
+				margin: 0 auto;
+			}
+	
+			.center {
+				display: flex;
+				justify-content: space-between;
+	
+				padding-top: 24rpx;
+	
+				.avatar {
+	
+					padding-top: 4rpx;
+					padding-left: 20rpx;
+				}
+	
+				.user-info-pop {
+					flex: 1;
+	
+					padding-left: 24rpx;
+	
+					.name {
+						width: 270rpx;
+						height: 48rpx;
+						font-size: 32rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #333333;
+					}
+	
+					.tel {
+						height: 40rpx;
+						font-size: 28rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #36596A;
+						line-height: 40rpx;
+						display: flex;
+	
+						margin-top: 18rpx;
+	
+						.text {
+	
+							margin-left: 10rpx;
+						}
+					}
+	
+					.address {
+						font-size: 28rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #36596A;
+						line-height: 40rpx;
+						display: flex;
+	
+						margin-top: 14rpx;
+	
+						.text {
+	
+							margin-left: 10rpx;
+						}
+					}
+				}
+	
+				.sex {
+					width: 40rpx;
+					height: 40rpx;
+					background: #FDECEC;
+					opacity: 0.5;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+	
+					margin-right: 20rpx;
+	
+					.sex-text {
+						width: 28rpx;
+						height: 34rpx;
+						font-size: 28rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #36596A;
+						line-height: 34rpx;
+					}
+				}
+			}
+	
+			.bottom {
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+	
+				margin-top: 16rpx;
+				padding-bottom: 26rpx;
+	
+				.distance {
+					align-items: center;
+					display: flex;
+	
+					.distance-icon {
+	
+						padding-left: 20rpx;
+					}
+	
+					.distance-text {
+						height: 34rpx;
+						font-size: 24rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #A7AFBC;
+						line-height: 34rpx;
+	
+						padding-left: 20rpx;
+					}
+				}
+	
+				.to-there {
+					display: flex;
+					align-items: center;
+	
+					margin-right: 20rpx;
+	
+					.to-there-text {
+						height: 34rpx;
+						font-size: 24rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #A7AFBC;
+						line-height: 34rpx;
+	
+						margin-right: 14rpx;
+					}
+	
+					.to-there-icon {
+	
+						margin-left: 3rpx;
+					}
+				}
+			}
+		}
+	}
+
+</style>
\ No newline at end of file
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 634a165..bb7851d 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -156,74 +156,17 @@
 			<view class="notice-content">{{detailNotice.content}}</view>
 		</u-popup>
 		
-		<u-popup v-model="isShowIng" height="60%" mode="bottom" border-radius="14" closeable	>
-				<view class="nursing-list">
-					<view v-if="nursingList && nursingList.length > 0">
-						<view v-for="(item,index) in nursingList" :key="index" class="list-item">
-							<view class="top">
-								<view class="time">{{item.start_time}}</view>
-								<view class="status">
-									<view class="status-icon"
-										:class="{icon1:item.status === 0,icon2:item.status === 2,icon3:item.status === 1}">
-									</view>
-									<view v-if="item.status === 1" class="status-text">护理中</view>
-									<view v-else-if="item.status === 0" class="status-text">待护理</view>
-									<view v-else class="status-text">已护理</view>
-								</view>
-							</view>
-				
-							<view class="line"></view>
-				
-							<view class="center" @click="toDetail(item)">
-								<view class="avatar">
-									<u-image :src="item.customer.sex === '男' ? vuex_male_img : vuex_female_img" height="104"
-										width="104" shape="circle"></u-image>
-								</view>
-								<view class="user-info-pop">
-									<view class="name">{{item.customer.name}}</view>
-									<view class="tel">
-										<view>
-											<u-icon name="phone" size="28" color="#1479FF"></u-icon>
-										</view>
-										<view class="text">{{item.customer.phone || '无'}}</view>
-									</view>
-									<view class="address">
-										<view>
-											<u-icon name="map" size="28" color="#1479FF"></u-icon>
-										</view>
-										<view class="text">{{item.customer_address.address || '无'}}</view>
-									</view>
-								</view>
-								<view class="sex">
-									<view class="sex-text">
-										{{item.customer.sex  || '无'}}
-									</view>
-								</view>
-							</view>
-				
-							<view class="bottom">
-								<view class="to-there" @click="toThere(item)">
-									<view class="to-there-text">去那里</view>
-									<view class="to-there-icon">
-										<u-image src="/static/todayNursing/to-there.png" height="46" width="46"></u-image>
-									</view>
-								</view>
-							</view>
-				
-						</view>
-					</view>
-				
-					<view v-else>
-						<u-empty mode="list" text="暂无护理"></u-empty>
-					</view>
-				</view>
-			</u-popup>
-	</view>
+		<doingOrder></doingOrder>
+	
 </template>
 
-<script>
+<script>
+	import doingOrder from '../../components/doingOrder/doingOrder.vue'
 	import moment from "@/libs/moment.min.js"
-	export default {
+	export default {
+		components: {
+			doingOrder
+		},
 		data() {
 			return {
 				marginTop: 96,
@@ -262,9 +205,7 @@
 				},
 				infoList: [],
 				isShowNotice: false,
-				detailNotice: {},
-				isShowIng:false,
-				nursingList:[],
+				detailNotice: {}
 			}
 		},
 		methods: {
@@ -304,31 +245,6 @@
 				let res = await this.$u.api.noticeList()
 				this.infoList = res.data
 			},
-			async getIngList() {
-				let res = await this.$u.api.nurseList({
-					page:1,
-					page_size:999,
-					status:1
-				})
-				this.nursingList = res.data
-			},
-			toThere(item) {
-				this.$u.throttle(() => {
-					uni.openLocation({
-						latitude: Number(item.customer.lat),
-						longitude: Number(item.customer.lng),
-						name: item.customer.address
-					})
-				})
-			},
-			//跳转详情
-			toDetail(item) {
-				uni.$u.throttle(() => {
-					uni.navigateTo({
-						url: `/pages/detailNursing/detailNursing?id=${item.id}`
-					})
-				})
-			},
 		},
 		computed: {
 			dateFormat() {
@@ -342,10 +258,7 @@
 		async onShow() {
 			await this.getStatistic()
 			await this.getRemind()
-			if(this.status.ing > 0){
-				await this.getIngList()
-				this.isShowIng = true
-			}
+			
 		},
 		created() {
 			const res = uni.getSystemInfoSync()
@@ -802,201 +715,4 @@
 		padding: 0 10rpx;
 	}
 	
-	.nursing-list {
-	
-		margin-top: 88rpx;
-	
-		.list-item {
-			width: 710rpx;
-			background: #FFFFFF;
-			filter: drop-shadow(0 0 10px rgba(219, 218, 218, 0.5));
-	
-			margin: 0 20rpx 26rpx 22rpx;
-	
-			.top {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-	
-				padding: 22rpx 0;
-	
-				.time {
-					height: 40rpx;
-					font-size: 40rpx;
-					font-family: PingFang-SC-Medium, PingFang-SC;
-					font-weight: 500;
-					color: #36596A;
-					line-height: 40rpx;
-	
-					padding-left: 20rpx;
-				}
-	
-				.status {
-					display: flex;
-					align-items: center;
-	
-					.status-icon {
-	
-						margin-right: 10rpx;
-					}
-	
-					.status-text {
-						width: 84rpx;
-						height: 40rpx;
-						font-size: 28rpx;
-						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
-						color: #36596A;
-						line-height: 40rpx;
-	
-						margin-right: 20rpx;
-					}
-				}
-			}
-	
-			.line {
-				width: 670rpx;
-				height: 2rpx;
-				border: 2rpx solid #EEEFF5;
-	
-				margin: 0 auto;
-			}
-	
-			.center {
-				display: flex;
-				justify-content: space-between;
-	
-				padding-top: 24rpx;
-	
-				.avatar {
-	
-					padding-top: 4rpx;
-					padding-left: 20rpx;
-				}
-	
-				.user-info-pop {
-					flex: 1;
-	
-					padding-left: 24rpx;
-	
-					.name {
-						width: 270rpx;
-						height: 48rpx;
-						font-size: 32rpx;
-						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
-						color: #333333;
-					}
-	
-					.tel {
-						height: 40rpx;
-						font-size: 28rpx;
-						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
-						color: #36596A;
-						line-height: 40rpx;
-						display: flex;
-	
-						margin-top: 18rpx;
-	
-						.text {
-	
-							margin-left: 10rpx;
-						}
-					}
-	
-					.address {
-						font-size: 28rpx;
-						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
-						color: #36596A;
-						line-height: 40rpx;
-						display: flex;
-	
-						margin-top: 14rpx;
-	
-						.text {
-	
-							margin-left: 10rpx;
-						}
-					}
-				}
-	
-				.sex {
-					width: 40rpx;
-					height: 40rpx;
-					background: #FDECEC;
-					opacity: 0.5;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-	
-					margin-right: 20rpx;
-	
-					.sex-text {
-						width: 28rpx;
-						height: 34rpx;
-						font-size: 28rpx;
-						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
-						color: #36596A;
-						line-height: 34rpx;
-					}
-				}
-			}
-	
-			.bottom {
-				display: flex;
-				justify-content: flex-end;
-				align-items: center;
-	
-				margin-top: 16rpx;
-				padding-bottom: 26rpx;
-	
-				.distance {
-					align-items: center;
-					display: flex;
-	
-					.distance-icon {
-	
-						padding-left: 20rpx;
-					}
-	
-					.distance-text {
-						height: 34rpx;
-						font-size: 24rpx;
-						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
-						color: #A7AFBC;
-						line-height: 34rpx;
-	
-						padding-left: 20rpx;
-					}
-				}
-	
-				.to-there {
-					display: flex;
-					align-items: center;
-	
-					margin-right: 20rpx;
-	
-					.to-there-text {
-						height: 34rpx;
-						font-size: 24rpx;
-						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
-						color: #A7AFBC;
-						line-height: 34rpx;
-	
-						margin-right: 14rpx;
-					}
-	
-					.to-there-icon {
-	
-						margin-left: 3rpx;
-					}
-				}
-			}
-		}
-	}
 </style>
diff --git a/pages/list/list.vue b/pages/list/list.vue
index 03cc528..445e701 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -102,11 +102,16 @@
 		<u-calendar v-model="isShowCalendar" max-date="2100-01-01" mode="range" @change='datePick'>
 
 		</u-calendar>
+		<doingOrder></doingOrder>
 	</view>
 </template>
 
-<script>
-	export default {
+<script>
+	import doingOrder from '../../components/doingOrder/doingOrder.vue'
+	export default {
+		components: {
+			doingOrder
+		},
 		data() {
 			return {
 				isShowCalendar: false,
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 9cb04af..7918402 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -106,7 +106,7 @@
 				});
 				setTimeout(() => {
 					uni.switchTab({
-						url: "/pages/home/home"
+						url: "/pages/todayNursing/todayNursing"
 					});
 				}, 1500)
 			},
diff --git a/pages/nursingCalendar/nursingCalendar.vue b/pages/nursingCalendar/nursingCalendar.vue
index 1e40af8..28bbeb5 100644
--- a/pages/nursingCalendar/nursingCalendar.vue
+++ b/pages/nursingCalendar/nursingCalendar.vue
@@ -1,716 +1,723 @@
-<template>
-	<view>
-		<cpn-navbar title="护理日历"></cpn-navbar>
-
-		<view>
-			<!-- 选择器 -->
-			<view class="selecter">
-				<view class="select-year" @click="isShowCell = true">
-					<view class="text">
-						{{select.year}}
-					</view>
-					<view class="arrow" :class="{arrowAni:isShowCell,arrowAni1:!isShowCell}">
-						<u-icon name="arrow-down" size="20" color="#36596A"></u-icon>
-					</view>
-				</view>
-				<view class="select-month">
-					<view class="arrow" @click="monthMin">
-						<u-icon name="arrow-left" size="20" color="#36596A"></u-icon>
-					</view>
-					<view class="text" @click="showPicker = true">
-						{{select.month}}月
-					</view>
-					<view class="arrow" @click="monthPlus">
-						<u-icon name="arrow-right" size="20" color="#36596A"></u-icon>
-					</view>
-				</view>
-			</view>
-			<!-- 选择年列表 -->
-			<view class="year-options" v-show="isShowCell">
-				<view class="mask" @click="isShowCell = false"> </view>
-				<view class="options">
-					<scroll-view scroll-y="true" style="height: 300rpx;">
-						<view class="item" v-for="(item,index) in opsionts" :key="index"
-							@click="select.year = item,isShowCell = false">
-							{{item}}
-						</view>
-					</scroll-view>
-				</view>
-			</view>
-
-			<!-- 日历表 -->
-			<view class="canlendar">
-				<view v-for="(row,index) in calendar" :key="index" class="row">
-					<view v-for="(date,index1) in row" :key="index1" @click="dateClick(date,index1)" class="item"
-						:class="{itemOver:date.type === -1||date.type === 1||date.type === 2,itemActive:date.date === select.date&&date.type === 0}">
-						{{date.date}}
-						<view class="icon icon1" v-if="dateIn(date.date) === 0&&date.type === 0"></view>
-						<view class="icon icon2" v-if="dateIn(date.date) === 2&&date.type === 0"></view>
-						<view class="icon icon3" v-if="dateIn(date.date) === 1&&date.type === 0"></view>
-					</view>
-				</view>
-			</view>
-			<!-- 日期状态提示 -->
-			<view class="status">
-				<view class="status-item">
-					<view class="icon3"></view>
-					<view>进行中</view>
-				</view>
-				<view class="status-item">
-					<view class="icon1"></view>
-					<view>待护理</view>
-				</view>
-				<view class="status-item">
-					<view class="icon2"></view>
-					<view>已完成</view>
-				</view>
-			</view>
-
-			<!-- 选中护理当日信息 -->
-			<view class="select-info">
-				<view class="selet-date">
-					{{select.year}}年{{select.month}}月{{select.date}}日
-				</view>
-				<view class="select-day">
-					{{getDay(select.year+"/"+select.month+"/"+select.date)}}
-				</view>
-			</view>
-
-			<!-- 选中当日护理人员 -->
-			<view class="select-user-list">
-				<scroll-view :scroll-y="true" style="height: 520rpx;position: relative;">
-					<view v-if="selectUserList && selectUserList.length > 0">
-						<view v-for="(item,index) in selectUserList" :key="index" class="user-item" @click="toDetail(item)">
-							<view class="left">
-								<u-image :src="item.customer.sex === '男' ? vuex_male_img : vuex_female_img" height="104"
-									width="104" shape="circle"></u-image>
-							</view>
-							<view class="center">
-								<view class="top">{{item.customer.name}}</view>
-								<view class="bottom">
-									<view class="time">
-										{{dateFormat(item.start_time,'HH:mm')}}~{{dateFormat(item.end_time,'HH:MM')}}
-									</view>
-									<view class="list-status-icon"
-										:class="{icon1:item.status === 0,icon2:item.status === 2,icon3:item.status === 1}">
-									</view>
-									<view class="list-status-text">{{formatStatus(item.status)}}</view>
-								</view>
-							</view>
-							<view class="right" >
-								<u-icon name="arrow-right" size="22"></u-icon>
-							</view>
-						</view>
-					</view>
-					<view v-else style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);">
-						<u-empty></u-empty>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
-
-		<u-picker mode="time" v-model="showPicker" :params="{
-					year: false,
-					month: true,
-					day: false,
-					hour: false,
-					minute: false,
-					second: false
-				}" :default-time="`${select.year}-${select.month}-${select.date}`" @confirm='monthPick'></u-picker>
-	</view>
-</template>
-
-<script>
-	import moment from "@/libs/moment.min.js"
-	import {
-		formatDate
-	} from 'common/util.js'
-	export default {
-		data() {
-			return {
-				showPicker: false,
-				statusDay: [{
-						date: 1,
-						status: 2
-					},
-					{
-						date: 6,
-						status: 1
-					}, {
-						date: 9,
-						status: 0
-					}, {
-						date: 14,
-						status: 0
-					}, {
-						date: 16,
-						status: 2
-					}
-				],
-				opsionts: (() => {
-					let res = []
-					for (let i = -1; i < 20; i++) {
-						res.push(new Date().getFullYear() - i)
-					}
-					return res
-				})(),
-				isShowCell: false,
-				//时间选择
-				select: {
-					year: new Date().getFullYear(),
-					month: new Date().getMonth() + 1,
-					date: new Date().getDate()
-				},
-				//当前选择日期
-				//dateIndex: new Date().getDate(),
-				calendar: '',
-				params: {
-					year: true,
-					month: true,
-					day: false,
-					hour: false,
-					minute: false,
-					second: false
-				},
-				selectUserList: [],
-
-				//搜索条件
-				selector: {
-					page_size: 999,
-					page: 1,
-					date: '',
-					lat: '',
-					lng: '',
-					sex: '',
-					status: '',
-					lng: '',
-					lat: ''
-				}
-			}
-		},
-		methods: {
-			monthPick(e) {
-				this.select.month = Number(e.month)
-			},
-			monthPlus() {
-				this.$u.throttle(() => {
-					if (this.select.month < 12) {
-						this.select.month++
-					}
-				})
-			},
-			monthMin() {
-				this.$u.throttle(() => {
-					if (this.select.month > 1) {
-						this.select.month--
-					}
-				})
-			},
-			dateClick(date, index1) {
-				if (date.type === 0) {
-					this.select.date = date.date
-				}
-			},
-			getCalendar(year, month) {
-				let res = []
-
-				//判断是否闰年
-				function isLeap(year) {
-					return (year % 100 == 0 ? (year % 400 == 0 ? 29 : 28) : (year % 4 == 0 ? 29 : 28))
-				}
-
-				//获取年的每个月天数
-				let mDays = new Map()
-				mDays.set(1, 31)
-				mDays.set(2, isLeap(year))
-				mDays.set(3, 31)
-				mDays.set(4, 30)
-				mDays.set(5, 31)
-				mDays.set(6, 30)
-				mDays.set(7, 31)
-				mDays.set(8, 31)
-				mDays.set(9, 30)
-				mDays.set(10, 31)
-				mDays.set(11, 30)
-				mDays.set(12, 31)
-
-				//获取月份的开始星期
-				let startDay =
-					new Date(`${year}/${month}/1`).getDay() != 0 ? new Date(`${year}/${month}/1`).getDay() : 7
-
-				//let arrayLength = Math.ceil((mDays.get(month) + startDay) / 7)
-				let arrayLength = 6
-
-				for (let i = 1; i <= arrayLength; i++) {
-					res.push([])
-					for (let j = 0; j < 7; j++) {
-						let index = (i - 1) * 7 + j
-						let date = index - startDay + 2
-						if (date < 1) {
-							res[i - 1].push({
-								date: (mDays.get(month - 1) ? mDays.get(month - 1) : 31) + date,
-								type: 1
-							})
-						} else if (date > mDays.get(month)) {
-							res[i - 1].push({
-								date: date - mDays.get(month),
-								type: 2
-							})
-						} else {
-							let nowDate = `${new Date().getFullYear()}/${new Date().getMonth()+1}/${new Date().getDate()}`
-							nowDate == `${this.year}/${this.month}/${date}` ?
-								res[i - 1].push({
-									date,
-									type: 0,
-									today: true
-								}) :
-								res[i - 1].push({
-									date,
-									type: 0
-								})
-						}
-					}
-				}
-				res.unshift([{
-					date: "一",
-					type: -1
-				}, {
-					date: "二",
-					type: -1
-				}, {
-					date: "三",
-					type: -1
-				}, {
-					date: "四",
-					type: -1
-				}, {
-					date: "五",
-					type: -1
-				}, {
-					date: "六",
-					type: -1
-				}, {
-					date: "日",
-					type: -1
-				}])
-				this.calendar = res
-			},
-
-
-			async getList() {
-				let res = await this.$u.api.nurseList(this.selector)
-
-				this.selectUserList = res.data
-			},
-			toDetail(item) {
-				uni.$u.throttle(() => {
-					uni.navigateTo({
-						url: `/pages/detailNursing/detailNursing?id=${item.id}`
-					})
-				})
-			},
-			getCalendarStatus() {
-				this.$u.api.nurseList({
-					start_time: `${this.select.year}-${this.select.month.toString().padStart(2,'0')}-01`,
-					end_time: `${this.select.year}-${this.select.month.toString().padStart(2,'0')}-${31} 23:59:59`,
-					page_size: 999,
-					page: 1,
-				}).then(res => {
-					this.statusDay = res.data.map(item => {
-						return {
-							date: new Date(item.date).getDate(),
-							status: item.status
-						}
-					})
-				})
-			}
-		},
-		computed: {
-			getDay() {
-				return function(date) {
-					if (!date) {
-						return " "
-					}
-					let dayList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
-					return dayList[new Date(date).getDay()] ?? " "
-				}
-			},
-			formatStatus() {
-				return function(status) {
-					switch (status) {
-						case 0:
-							return "待护理"
-							break;
-						case 1:
-							return "进行中"
-							break;
-						case 2:
-							return "已完成"
-							break;
-						default:
-							return "未知"
-					}
-				}
-			},
-			//判断日期是否有护理
-			dateIn() {
-				return function(date) {
-					let res = this.statusDay.filter(item => {
-						return item.date === date
-					})
-					return res[0] ? res[0].status : false
-				}
-			},
-			dateFormat() {
-				return function(date, fmt = "YYYY-MM-DD") {
-					if (date) {
-						return moment(date).format(fmt)
-					}
-				}
-			}
-		},
-		watch: {
-			select: {
-				handler(newVal, oldVal) {
-					this.getCalendar(this.select.year, this.select.month)
-
-					this.selector.date = `${this.select.year}-${this.select.month}-${this.select.date}`
-					this.getList()
-					this.getCalendarStatus()
-				},
-				immediate: true,
-				deep: true
-			}
-		},
-		onShow() {
-			uni.getLocation().then(res => {
-				this.selector.lat = res[1]?.latitude
-				this.selector.lng = res[1]?.longitude
-			})
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.selecter {
-		display: flex;
-		justify-content: space-between;
-
-		margin-top: 44rpx;
-
-		.select-year {
-			width: 224rpx;
-			height: 70rpx;
-			background: #FFFFFF;
-			border-radius: 10rpx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-
-			margin-left: 34rpx;
-
-			.text {
-				flex: 1;
-				height: 40rpx;
-				font-size: 32rpx;
-				font-family: PingFang-SC-Medium, PingFang-SC;
-				font-weight: 500;
-				color: #000000;
-				line-height: 40rpx;
-				text-align: center;
-			}
-
-			.arrow {
-				width: 70rpx;
-				height: 70rpx;
-				background: rgba(20, 121, 255, 0.1);
-				border-radius: 5rpx;
-				border: 2rpx solid #FFFFFF;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-
-			.arrowAni {
-				animation: rotate 500ms forwards;
-			}
-
-			.arrowAni1 {
-				animation: rotate2 500ms forwards;
-			}
-
-			@keyframes rotate {
-				0% {
-					transform: rotate(0deg);
-				}
-
-				100% {
-					transform: rotate(180deg);
-				}
-			}
-
-			@keyframes rotate2 {
-				0% {
-					transform: rotate(180deg);
-				}
-
-				100% {
-					transform: rotate(0deg);
-				}
-			}
-		}
-
-		.select-month {
-			width: 224rpx;
-			height: 70rpx;
-			background: #FFFFFF;
-			border-radius: 10rpx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-
-			margin-right: 40rpx;
-
-			.arrow {
-				width: 70rpx;
-				height: 70rpx;
-				background: rgba(20, 121, 255, 0.1);
-				border-radius: 5rpx;
-				border: 2rpx solid #FFFFFF;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-
-			.text {
-
-				height: 40rpx;
-				font-size: 32rpx;
-				font-family: PingFang-SC-Medium, PingFang-SC;
-				font-weight: 500;
-				color: #000000;
-				line-height: 40rpx;
-			}
-		}
-	}
-
-	.year-options {
-
-		.mask {
-			width: 100vw;
-			height: 100vh;
-			opacity: 1;
-			z-index: 9;
-			position: fixed;
-			top: 0;
-			left: 0;
-		}
-
-		.options {
-			background: #fff;
-			width: 224rpx;
-			height: 300rpx;
-			border-radius: 20rpx;
-			box-shadow: 2rpx 6rpx 10rpx 10rpx rgba(206, 204, 204, 0.5);
-			animation: enter 500ms forwards;
-
-			z-index: 10;
-			position: absolute;
-			top: 350rpx;
-			left: 34rpx;
-
-			.item {
-				font-size: 32rpx;
-				font-family: PingFang-SC-Medium, PingFang-SC;
-				font-weight: 500;
-				color: #333333;
-				text-align: center;
-
-				border-bottom: 2rpx solid #EEEFF5;
-				padding: 30rpx 0;
-				margin: 0 20rpx;
-			}
-		}
-
-		@keyframes enter {
-			0% {
-				opacity: 0;
-				transform: translateY(-50%);
-			}
-
-			40% {
-				opacity: 0;
-				transform: translateY(-35%);
-			}
-
-			100% {
-				opacity: 1;
-				transform: translateY(0);
-			}
-		}
-	}
-
-	.canlendar {
-		width: 710rpx;
-		background: #FFFFFF;
-		border-radius: 40rpx;
-
-		margin: 36rpx auto 0 auto;
-
-		.row {
-			display: flex;
-			justify-content: space-evenly;
-			align-items: center;
-
-			.item {
-				height: 64rpx;
-				width: 64rpx;
-				text-align: center;
-				line-height: 64rpx;
-				border-radius: 10rpx;
-
-				position: relative;
-				margin: 10rpx;
-
-				.icon {
-					transform: translateX(-50%);
-					position: absolute;
-					top: calc(50% + 22rpx);
-					left: 50%;
-				}
-			}
-
-			//非本月的日
-			.itemOver {
-				color: #B7B7B7;
-			}
-
-			//选择的日
-			.itemActive {
-				color: #fff;
-				background-color: #0F0F0F;
-			}
-		}
-	}
-
-	.status {
-		height: 40rpx;
-		font-size: 28rpx;
-		font-family: PingFang-SC-Medium, PingFang-SC;
-		font-weight: 500;
-		color: #36596A;
-		line-height: 40rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-
-		margin: 36rpx 132rpx 0 132rpx;
-
-		.status-item {
-			display: flex;
-			align-items: center;
-
-
-		}
-	}
-
-	.select-info {
-		height: 46rpx;
-		font-size: 32rpx;
-		font-family: PingFang-SC-Medium, PingFang-SC;
-		font-weight: 500;
-		color: #36596A;
-		line-height: 46rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-
-		margin-top: 36rpx;
-		padding: 0 48rpx 0 44rpx;
-
-	}
-
-	.select-user-list {
-		width: 710rpx;
-		height: 520rpx;
-		background: #FFFFFF;
-		border-radius: 10rpx;
-
-		margin: 18rpx auto;
-		padding-bottom: 18rpx;
-
-		.user-item {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			border-bottom: 2rpx solid #EEEFF5;
-
-			padding: 36rpx 0;
-			margin: 0 20rpx;
-
-			.left {}
-
-			.center {
-				flex: 1;
-
-				margin-left: 28rpx;
-
-				.top {
-					height: 46rpx;
-					font-size: 32rpx;
-					font-family: PingFang-SC-Medium, PingFang-SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 46rpx;
-				}
-
-				.bottom {
-					display: flex;
-					align-items: center;
-
-					padding-top: 18rpx;
-
-					.time {
-						background: #F9F9F9;
-						height: 40rpx;
-						font-size: 28rpx;
-						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
-						color: #36596A;
-						line-height: 40rpx;
-						text-align: center;
-						border-radius: 10rpx;
-
-						padding: 0 4rpx;
-					}
-
-					.list-status-icon {
-
-						margin-left: 16rpx;
-					}
-
-					.list-status-text {
-						height: 40rpx;
-						font-size: 28rpx;
-						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
-						color: #585858;
-						line-height: 40rpx;
-
-						margin-left: 16rpx;
-					}
-				}
-			}
-
-			.right {
-				width: 70rpx;
-				height: 70rpx;
-				background: #F9F9F9;
-				border-radius: 20rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
-		}
-	}
+<template>
+	<view>
+		<cpn-navbar title="护理日历"></cpn-navbar>
+
+		<view>
+			<!-- 选择器 -->
+			<view class="selecter">
+				<view class="select-year" @click="isShowCell = true">
+					<view class="text">
+						{{select.year}}
+					</view>
+					<view class="arrow" :class="{arrowAni:isShowCell,arrowAni1:!isShowCell}">
+						<u-icon name="arrow-down" size="20" color="#36596A"></u-icon>
+					</view>
+				</view>
+				<view class="select-month">
+					<view class="arrow" @click="monthMin">
+						<u-icon name="arrow-left" size="20" color="#36596A"></u-icon>
+					</view>
+					<view class="text" @click="showPicker = true">
+						{{select.month}}月
+					</view>
+					<view class="arrow" @click="monthPlus">
+						<u-icon name="arrow-right" size="20" color="#36596A"></u-icon>
+					</view>
+				</view>
+			</view>
+			<!-- 选择年列表 -->
+			<view class="year-options" v-show="isShowCell">
+				<view class="mask" @click="isShowCell = false"> </view>
+				<view class="options">
+					<scroll-view scroll-y="true" style="height: 300rpx;">
+						<view class="item" v-for="(item,index) in opsionts" :key="index"
+							@click="select.year = item,isShowCell = false">
+							{{item}}
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+
+			<!-- 日历表 -->
+			<view class="canlendar">
+				<view v-for="(row,index) in calendar" :key="index" class="row">
+					<view v-for="(date,index1) in row" :key="index1" @click="dateClick(date,index1)" class="item"
+						:class="{itemOver:date.type === -1||date.type === 1||date.type === 2,itemActive:date.date === select.date&&date.type === 0}">
+						{{date.date}}
+						<view class="icon icon1" v-if="dateIn(date.date) === 0&&date.type === 0"></view>
+						<view class="icon icon2" v-if="dateIn(date.date) === 2&&date.type === 0"></view>
+						<view class="icon icon3" v-if="dateIn(date.date) === 1&&date.type === 0"></view>
+					</view>
+				</view>
+			</view>
+			<!-- 日期状态提示 -->
+			<view class="status">
+				<view class="status-item">
+					<view class="icon3"></view>
+					<view>进行中</view>
+				</view>
+				<view class="status-item">
+					<view class="icon1"></view>
+					<view>待护理</view>
+				</view>
+				<view class="status-item">
+					<view class="icon2"></view>
+					<view>已完成</view>
+				</view>
+			</view>
+
+			<!-- 选中护理当日信息 -->
+			<view class="select-info">
+				<view class="selet-date">
+					{{select.year}}年{{select.month}}月{{select.date}}日
+				</view>
+				<view class="select-day">
+					{{getDay(select.year+"/"+select.month+"/"+select.date)}}
+				</view>
+			</view>
+
+			<!-- 选中当日护理人员 -->
+			<view class="select-user-list">
+				<scroll-view :scroll-y="true" style="height: 520rpx;position: relative;">
+					<view v-if="selectUserList && selectUserList.length > 0">
+						<view v-for="(item,index) in selectUserList" :key="index" class="user-item"
+							@click="toDetail(item)">
+							<view class="left">
+								<u-image :src="item.customer.sex === '男' ? vuex_male_img : vuex_female_img" height="104"
+									width="104" shape="circle"></u-image>
+							</view>
+							<view class="center">
+								<view class="top">{{item.customer.name}}</view>
+								<view class="bottom">
+									<view class="time">
+										{{dateFormat(item.start_time,'HH:mm')}}~{{dateFormat(item.end_time,'HH:MM')}}
+									</view>
+									<view class="list-status-icon"
+										:class="{icon1:item.status === 0,icon2:item.status === 2,icon3:item.status === 1}">
+									</view>
+									<view class="list-status-text">{{formatStatus(item.status)}}</view>
+								</view>
+							</view>
+							<view class="right">
+								<u-icon name="arrow-right" size="22"></u-icon>
+							</view>
+						</view>
+					</view>
+					<view v-else style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);">
+						<u-empty></u-empty>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+
+		<u-picker mode="time" v-model="showPicker" :params="{
+					year: false,
+					month: true,
+					day: false,
+					hour: false,
+					minute: false,
+					second: false
+				}" :default-time="`${select.year}-${select.month}-${select.date}`" @confirm='monthPick'></u-picker>
+		<doingOrder></doingOrder>
+	</view>
+
+</template>
+
+<script>
+	import moment from "@/libs/moment.min.js"
+	import {
+		formatDate
+	} from 'common/util.js'
+	import doingOrder from '../../components/doingOrder/doingOrder.vue'
+	export default {
+		components: {
+			doingOrder
+		},
+		data() {
+			return {
+				showPicker: false,
+				statusDay: [{
+						date: 1,
+						status: 2
+					},
+					{
+						date: 6,
+						status: 1
+					}, {
+						date: 9,
+						status: 0
+					}, {
+						date: 14,
+						status: 0
+					}, {
+						date: 16,
+						status: 2
+					}
+				],
+				opsionts: (() => {
+					let res = []
+					for (let i = -1; i < 20; i++) {
+						res.push(new Date().getFullYear() - i)
+					}
+					return res
+				})(),
+				isShowCell: false,
+				//时间选择
+				select: {
+					year: new Date().getFullYear(),
+					month: new Date().getMonth() + 1,
+					date: new Date().getDate()
+				},
+				//当前选择日期
+				//dateIndex: new Date().getDate(),
+				calendar: '',
+				params: {
+					year: true,
+					month: true,
+					day: false,
+					hour: false,
+					minute: false,
+					second: false
+				},
+				selectUserList: [],
+
+				//搜索条件
+				selector: {
+					page_size: 999,
+					page: 1,
+					date: '',
+					lat: '',
+					lng: '',
+					sex: '',
+					status: '',
+					lng: '',
+					lat: ''
+				}
+			}
+		},
+		methods: {
+			monthPick(e) {
+				this.select.month = Number(e.month)
+			},
+			monthPlus() {
+				this.$u.throttle(() => {
+					if (this.select.month < 12) {
+						this.select.month++
+					}
+				})
+			},
+			monthMin() {
+				this.$u.throttle(() => {
+					if (this.select.month > 1) {
+						this.select.month--
+					}
+				})
+			},
+			dateClick(date, index1) {
+				if (date.type === 0) {
+					this.select.date = date.date
+				}
+			},
+			getCalendar(year, month) {
+				let res = []
+
+				//判断是否闰年
+				function isLeap(year) {
+					return (year % 100 == 0 ? (year % 400 == 0 ? 29 : 28) : (year % 4 == 0 ? 29 : 28))
+				}
+
+				//获取年的每个月天数
+				let mDays = new Map()
+				mDays.set(1, 31)
+				mDays.set(2, isLeap(year))
+				mDays.set(3, 31)
+				mDays.set(4, 30)
+				mDays.set(5, 31)
+				mDays.set(6, 30)
+				mDays.set(7, 31)
+				mDays.set(8, 31)
+				mDays.set(9, 30)
+				mDays.set(10, 31)
+				mDays.set(11, 30)
+				mDays.set(12, 31)
+
+				//获取月份的开始星期
+				let startDay =
+					new Date(`${year}/${month}/1`).getDay() != 0 ? new Date(`${year}/${month}/1`).getDay() : 7
+
+				//let arrayLength = Math.ceil((mDays.get(month) + startDay) / 7)
+				let arrayLength = 6
+
+				for (let i = 1; i <= arrayLength; i++) {
+					res.push([])
+					for (let j = 0; j < 7; j++) {
+						let index = (i - 1) * 7 + j
+						let date = index - startDay + 2
+						if (date < 1) {
+							res[i - 1].push({
+								date: (mDays.get(month - 1) ? mDays.get(month - 1) : 31) + date,
+								type: 1
+							})
+						} else if (date > mDays.get(month)) {
+							res[i - 1].push({
+								date: date - mDays.get(month),
+								type: 2
+							})
+						} else {
+							let nowDate = `${new Date().getFullYear()}/${new Date().getMonth()+1}/${new Date().getDate()}`
+							nowDate == `${this.year}/${this.month}/${date}` ?
+								res[i - 1].push({
+									date,
+									type: 0,
+									today: true
+								}) :
+								res[i - 1].push({
+									date,
+									type: 0
+								})
+						}
+					}
+				}
+				res.unshift([{
+					date: "一",
+					type: -1
+				}, {
+					date: "二",
+					type: -1
+				}, {
+					date: "三",
+					type: -1
+				}, {
+					date: "四",
+					type: -1
+				}, {
+					date: "五",
+					type: -1
+				}, {
+					date: "六",
+					type: -1
+				}, {
+					date: "日",
+					type: -1
+				}])
+				this.calendar = res
+			},
+
+
+			async getList() {
+				let res = await this.$u.api.nurseList(this.selector)
+
+				this.selectUserList = res.data
+			},
+			toDetail(item) {
+				uni.$u.throttle(() => {
+					uni.navigateTo({
+						url: `/pages/detailNursing/detailNursing?id=${item.id}`
+					})
+				})
+			},
+			getCalendarStatus() {
+				this.$u.api.nurseList({
+					start_time: `${this.select.year}-${this.select.month.toString().padStart(2,'0')}-01`,
+					end_time: `${this.select.year}-${this.select.month.toString().padStart(2,'0')}-${31} 23:59:59`,
+					page_size: 999,
+					page: 1,
+				}).then(res => {
+					this.statusDay = res.data.map(item => {
+						return {
+							date: new Date(item.date).getDate(),
+							status: item.status
+						}
+					})
+				})
+			}
+		},
+		computed: {
+			getDay() {
+				return function(date) {
+					if (!date) {
+						return " "
+					}
+					let dayList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
+					return dayList[new Date(date).getDay()] ?? " "
+				}
+			},
+			formatStatus() {
+				return function(status) {
+					switch (status) {
+						case 0:
+							return "待护理"
+							break;
+						case 1:
+							return "进行中"
+							break;
+						case 2:
+							return "已完成"
+							break;
+						default:
+							return "未知"
+					}
+				}
+			},
+			//判断日期是否有护理
+			dateIn() {
+				return function(date) {
+					let res = this.statusDay.filter(item => {
+						return item.date === date
+					})
+					return res[0] ? res[0].status : false
+				}
+			},
+			dateFormat() {
+				return function(date, fmt = "YYYY-MM-DD") {
+					if (date) {
+						return moment(date).format(fmt)
+					}
+				}
+			}
+		},
+		watch: {
+			select: {
+				handler(newVal, oldVal) {
+					this.getCalendar(this.select.year, this.select.month)
+
+					this.selector.date = `${this.select.year}-${this.select.month}-${this.select.date}`
+					this.getList()
+					this.getCalendarStatus()
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+		onShow() {
+			uni.getLocation().then(res => {
+				this.selector.lat = res[1]?.latitude
+				this.selector.lng = res[1]?.longitude
+			})
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.selecter {
+		display: flex;
+		justify-content: space-between;
+
+		margin-top: 44rpx;
+
+		.select-year {
+			width: 224rpx;
+			height: 70rpx;
+			background: #FFFFFF;
+			border-radius: 10rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			margin-left: 34rpx;
+
+			.text {
+				flex: 1;
+				height: 40rpx;
+				font-size: 32rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #000000;
+				line-height: 40rpx;
+				text-align: center;
+			}
+
+			.arrow {
+				width: 70rpx;
+				height: 70rpx;
+				background: rgba(20, 121, 255, 0.1);
+				border-radius: 5rpx;
+				border: 2rpx solid #FFFFFF;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			.arrowAni {
+				animation: rotate 500ms forwards;
+			}
+
+			.arrowAni1 {
+				animation: rotate2 500ms forwards;
+			}
+
+			@keyframes rotate {
+				0% {
+					transform: rotate(0deg);
+				}
+
+				100% {
+					transform: rotate(180deg);
+				}
+			}
+
+			@keyframes rotate2 {
+				0% {
+					transform: rotate(180deg);
+				}
+
+				100% {
+					transform: rotate(0deg);
+				}
+			}
+		}
+
+		.select-month {
+			width: 224rpx;
+			height: 70rpx;
+			background: #FFFFFF;
+			border-radius: 10rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			margin-right: 40rpx;
+
+			.arrow {
+				width: 70rpx;
+				height: 70rpx;
+				background: rgba(20, 121, 255, 0.1);
+				border-radius: 5rpx;
+				border: 2rpx solid #FFFFFF;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			.text {
+
+				height: 40rpx;
+				font-size: 32rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #000000;
+				line-height: 40rpx;
+			}
+		}
+	}
+
+	.year-options {
+
+		.mask {
+			width: 100vw;
+			height: 100vh;
+			opacity: 1;
+			z-index: 9;
+			position: fixed;
+			top: 0;
+			left: 0;
+		}
+
+		.options {
+			background: #fff;
+			width: 224rpx;
+			height: 300rpx;
+			border-radius: 20rpx;
+			box-shadow: 2rpx 6rpx 10rpx 10rpx rgba(206, 204, 204, 0.5);
+			animation: enter 500ms forwards;
+
+			z-index: 10;
+			position: absolute;
+			top: 350rpx;
+			left: 34rpx;
+
+			.item {
+				font-size: 32rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+				text-align: center;
+
+				border-bottom: 2rpx solid #EEEFF5;
+				padding: 30rpx 0;
+				margin: 0 20rpx;
+			}
+		}
+
+		@keyframes enter {
+			0% {
+				opacity: 0;
+				transform: translateY(-50%);
+			}
+
+			40% {
+				opacity: 0;
+				transform: translateY(-35%);
+			}
+
+			100% {
+				opacity: 1;
+				transform: translateY(0);
+			}
+		}
+	}
+
+	.canlendar {
+		width: 710rpx;
+		background: #FFFFFF;
+		border-radius: 40rpx;
+
+		margin: 36rpx auto 0 auto;
+
+		.row {
+			display: flex;
+			justify-content: space-evenly;
+			align-items: center;
+
+			.item {
+				height: 64rpx;
+				width: 64rpx;
+				text-align: center;
+				line-height: 64rpx;
+				border-radius: 10rpx;
+
+				position: relative;
+				margin: 10rpx;
+
+				.icon {
+					transform: translateX(-50%);
+					position: absolute;
+					top: calc(50% + 22rpx);
+					left: 50%;
+				}
+			}
+
+			//非本月的日
+			.itemOver {
+				color: #B7B7B7;
+			}
+
+			//选择的日
+			.itemActive {
+				color: #fff;
+				background-color: #0F0F0F;
+			}
+		}
+	}
+
+	.status {
+		height: 40rpx;
+		font-size: 28rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #36596A;
+		line-height: 40rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		margin: 36rpx 132rpx 0 132rpx;
+
+		.status-item {
+			display: flex;
+			align-items: center;
+
+
+		}
+	}
+
+	.select-info {
+		height: 46rpx;
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #36596A;
+		line-height: 46rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		margin-top: 36rpx;
+		padding: 0 48rpx 0 44rpx;
+
+	}
+
+	.select-user-list {
+		width: 710rpx;
+		height: 520rpx;
+		background: #FFFFFF;
+		border-radius: 10rpx;
+
+		margin: 18rpx auto;
+		padding-bottom: 18rpx;
+
+		.user-item {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			border-bottom: 2rpx solid #EEEFF5;
+
+			padding: 36rpx 0;
+			margin: 0 20rpx;
+
+			.left {}
+
+			.center {
+				flex: 1;
+
+				margin-left: 28rpx;
+
+				.top {
+					height: 46rpx;
+					font-size: 32rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #333333;
+					line-height: 46rpx;
+				}
+
+				.bottom {
+					display: flex;
+					align-items: center;
+
+					padding-top: 18rpx;
+
+					.time {
+						background: #F9F9F9;
+						height: 40rpx;
+						font-size: 28rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #36596A;
+						line-height: 40rpx;
+						text-align: center;
+						border-radius: 10rpx;
+
+						padding: 0 4rpx;
+					}
+
+					.list-status-icon {
+
+						margin-left: 16rpx;
+					}
+
+					.list-status-text {
+						height: 40rpx;
+						font-size: 28rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #585858;
+						line-height: 40rpx;
+
+						margin-left: 16rpx;
+					}
+				}
+			}
+
+			.right {
+				width: 70rpx;
+				height: 70rpx;
+				background: #F9F9F9;
+				border-radius: 20rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	}
 </style>
diff --git a/pages/todayNursing/todayNursing.vue b/pages/todayNursing/todayNursing.vue
index 0a6124c..65e9da2 100644
--- a/pages/todayNursing/todayNursing.vue
+++ b/pages/todayNursing/todayNursing.vue
@@ -1,397 +1,403 @@
-<template>
-	<view>
-		<cpn-navbar title="今日护理"></cpn-navbar>
-
-		<view class="content">
-			<view class="map">
-				<view class="map-text">护理地图</view>
-				<view class="map-icon" @click="toMap">
-					<u-image src="/static/todayNursing/map.png" height="84" width="84" shape="circle"></u-image>
-				</view>
-			</view>
-
-			<view class="nursing-list">
-				<scroll-view scroll-y="true" style="height: 1130rpx;" :refresher-enabled="true"
-					:refresher-triggered="refreshStatus" @refresherrefresh="getToday"
-					@refresherrestore="refreshStatus = 'restore'">
-					<view v-if="nursingList && nursingList.length > 0">
-
-						<view v-for="(item,index) in nursingList" :key="item.id" class="list-item"
-							@click="toDetail(item)">
-							<view class="top">
-								<view class="time">{{timeFormat(item.start_time)}}~{{timeFormat(item.end_time,"HH:mm")}}
-								</view>
-								<view class="status">
-									<view class="status-icon"
-										:class="{icon1:item.status === 0,icon2:item.status === 2,icon3:item.status === 1}">
-									</view>
-									<view v-if="item.status === 1" class="status-text">护理中</view>
-									<view v-else-if="item.status === 0" class="status-text">待护理</view>
-									<view v-else class="status-text">已护理</view>
-								</view>
-							</view>
-
-							<view class="line"></view>
-
-							<view class="center">
-								<view class="avatar">
-									<u-image :src="item.customer.sex === '男' ? vuex_male_img : vuex_female_img"
-										height="104" width="104" shape="circle"></u-image>
-								</view>
-								<view class="user-info">
-									<view class="name">{{item.customer.name}}</view>
-									<view class="tel">
-										<view>
-											<u-icon name="phone" size="28" color="#1479FF"></u-icon>
-										</view>
-										<view class="text">{{item.customer.phone|| '无'}}</view>
-									</view>
-									<view class="address">
-										<view>
-											<u-icon name="map" size="28" color="#1479FF"></u-icon>
-										</view>
-										<view class="text">{{item.customer_address.address || '无'}}</view>
-									</view>
-								</view>
-								<view class="sex">
-									<view class="sex-text">
-										{{ item.customer.sex || '无' }}
-									</view>
-								</view>
-							</view>
-
-							<view class="bottom">
-								<view class="distance">
-									<view class="distance-icon">
-										<u-image src="/static/todayNursing/distance.png" height="42" width="42">
-										</u-image>
-									</view>
-									<view class="distance-text">{{item.distance}}公里</view>
-								</view>
-								<view class="to-there" @click.stop="toThere(item)">
-									<view class="to-there-text">去那里</view>
-									<view class="to-there-icon">
-										<u-image src="/static/todayNursing/to-there.png" height="46" width="46">
-										</u-image>
-									</view>
-								</view>
-							</view>
-						</view>
-
-					</view>
-
-					<view v-else class="nursing-list-nodata">
-						<u-empty mode="list" text="暂无护理">
-						</u-empty>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import moment from "@/libs/moment.min.js"
-	export default {
-		data() {
-			return {
-				refreshStatus: false,
-				select: {
-					page: 1,
-					page_size: 999,
-					date: `${new Date().getFullYear()}-${new Date().getMonth()+1}-${new Date().getDate()}`,
-					lat: '',
-					lng: ''
-				},
-
-				nursingList: []
-			}
-		},
-		methods: {
-			//跳转护理地图
-			toMap() {
-				uni.$u.throttle(() => {
-					uni.navigateTo({
-						url: "/pages/map/map"
-					})
-				})
-			},
-			//跳转详情
-			toDetail(item) {
-				uni.$u.throttle(() => {
-					uni.navigateTo({
-						url: `/pages/detailNursing/detailNursing?id=${item.id}`
-					})
-				})
-			},
-
-			async getToday() {
-				this.refreshStatus = true
-				let res = await this.$u.api.nurseList(this.select)
-				console.log(res);
-				this.nursingList = res.data
-				this.refreshStatus = false
-			},
-
-
-			toThere(item) {
-				this.$u.throttle(() => {
-					uni.openLocation({
-						latitude: Number(item.customer.lat),
-						longitude: Number(item.customer.lng),
-						name: item.customer.address
-					})
-				})
-			}
-		},
-		computed: {
-			timeFormat() {
-				return function(time, fmt = 'YYYY-MM-DD HH:mm') {
-					if (!time) {
-						return
-					}
-					return moment(time).format(fmt)
-				}
-			}
-		},
-		onShow() {
-			uni.getLocation().then(res => {
-				this.select.lat = res[1]?.latitude
-				this.select.lng = res[1]?.longitude
-
-				this.getToday()
-			})
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.map {
-		display: flex;
-		align-items: center;
-
-		margin-top: 20rpx;
-		margin-left: 470rpx;
-
-		.map-text {
-			width: 128rpx;
-			height: 42rpx;
-			font-size: 32rpx;
-			font-family: PingFang-SC-Medium, PingFang-SC;
-			font-weight: 500;
-			color: #36596A;
-			line-height: 42rpx;
-
-		}
-
-		.map-icon {
-
-			margin-left: 24rpx;
-		}
-	}
-
-	.nursing-list {
-
-		margin-top: 16rpx;
-
-		.list-item {
-			width: 710rpx;
-			background: #FFFFFF;
-			box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(219, 218, 218, 0.5);
-
-			margin: 0 20rpx 26rpx 22rpx;
-
-			.top {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-
-				padding: 22rpx 0;
-
-				.time {
-					height: 40rpx;
-					font-size: 28rpx;
-					font-family: PingFang-SC-Medium, PingFang-SC;
-					font-weight: 500;
-					color: #36596A;
-					line-height: 40rpx;
-
-					padding-left: 20rpx;
-				}
-
-				.status {
-					display: flex;
-					align-items: center;
-
-					.status-icon {
-
-						margin-right: 10rpx;
-					}
-
-					.status-text {
-						width: 84rpx;
-						height: 40rpx;
-						font-size: 28rpx;
-						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
-						color: #36596A;
-						line-height: 40rpx;
-
-						margin-right: 20rpx;
-					}
-				}
-			}
-
-			.line {
-				width: 670rpx;
-				height: 2rpx;
-				border: 2rpx solid #EEEFF5;
-
-				margin: 0 auto;
-			}
-
-			.center {
-				display: flex;
-				justify-content: space-between;
-
-				padding-top: 24rpx;
-
-				.avatar {
-
-					padding-top: 4rpx;
-					padding-left: 20rpx;
-				}
-
-				.user-info {
-					flex: 1;
-					padding-left: 24rpx;
-
-					.name {
-						width: 270rpx;
-						height: 48rpx;
-						font-size: 32rpx;
-						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
-						color: #333333;
-					}
-
-					.tel {
-						height: 40rpx;
-						font-size: 28rpx;
-						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
-						color: #36596A;
-						line-height: 40rpx;
-						display: flex;
-
-						margin-top: 18rpx;
-
-						.text {
-
-							margin-left: 10rpx;
-						}
-					}
-
-					.address {
-						font-size: 28rpx;
-						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
-						color: #36596A;
-						line-height: 40rpx;
-						display: flex;
-
-						margin-top: 14rpx;
-
-						.text {
-
-							margin-left: 10rpx;
-						}
-					}
-				}
-
-				.sex {
-					width: 40rpx;
-					height: 40rpx;
-					background: #FDECEC;
-					opacity: 0.5;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-
-					margin-right: 20rpx;
-
-					.sex-text {
-						width: 28rpx;
-						height: 34rpx;
-						font-size: 28rpx;
-						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
-						color: #36596A;
-						line-height: 34rpx;
-					}
-				}
-			}
-
-			.bottom {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-
-				margin-top: 16rpx;
-				padding-bottom: 26rpx;
-
-				.distance {
-					align-items: center;
-					display: flex;
-
-					.distance-icon {
-
-						padding-left: 20rpx;
-					}
-
-					.distance-text {
-						height: 34rpx;
-						font-size: 24rpx;
-						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
-						color: #A7AFBC;
-						line-height: 34rpx;
-
-						padding-left: 20rpx;
-					}
-				}
-
-				.to-there {
-					display: flex;
-					align-items: center;
-
-					margin-right: 20rpx;
-
-					.to-there-text {
-						height: 34rpx;
-						font-size: 24rpx;
-						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
-						color: #A7AFBC;
-						line-height: 34rpx;
-
-						margin-right: 14rpx;
-					}
-
-					.to-there-icon {
-
-						margin-left: 3rpx;
-					}
-				}
-			}
-		}
-
-
-		&-nodata {
-			transform: translate(-50%, -50%);
-			position: fixed;
-			top: 50%;
-			left: 50%;
-		}
-	}
+<template>
+	<view>
+		<cpn-navbar title="今日护理"></cpn-navbar>
+
+		<view class="content">
+			<view class="map">
+				<view class="map-text">护理地图</view>
+				<view class="map-icon" @click="toMap">
+					<u-image src="/static/todayNursing/map.png" height="84" width="84" shape="circle"></u-image>
+				</view>
+			</view>
+
+			<view class="nursing-list">
+				<scroll-view scroll-y="true" style="height: 1130rpx;" :refresher-enabled="true"
+					:refresher-triggered="refreshStatus" @refresherrefresh="getToday"
+					@refresherrestore="refreshStatus = 'restore'">
+					<view v-if="nursingList && nursingList.length > 0">
+
+						<view v-for="(item,index) in nursingList" :key="item.id" class="list-item"
+							@click="toDetail(item)">
+							<view class="top">
+								<view class="time">{{timeFormat(item.start_time)}}~{{timeFormat(item.end_time,"HH:mm")}}
+								</view>
+								<view class="status">
+									<view class="status-icon"
+										:class="{icon1:item.status === 0,icon2:item.status === 2,icon3:item.status === 1}">
+									</view>
+									<view v-if="item.status === 1" class="status-text">护理中</view>
+									<view v-else-if="item.status === 0" class="status-text">待护理</view>
+									<view v-else class="status-text">已护理</view>
+								</view>
+							</view>
+
+							<view class="line"></view>
+
+							<view class="center">
+								<view class="avatar">
+									<u-image :src="item.customer.sex === '男' ? vuex_male_img : vuex_female_img"
+										height="104" width="104" shape="circle"></u-image>
+								</view>
+								<view class="user-info">
+									<view class="name">{{item.customer.name}}</view>
+									<view class="tel">
+										<view>
+											<u-icon name="phone" size="28" color="#1479FF"></u-icon>
+										</view>
+										<view class="text">{{item.customer.phone|| '无'}}</view>
+									</view>
+									<view class="address">
+										<view>
+											<u-icon name="map" size="28" color="#1479FF"></u-icon>
+										</view>
+										<view class="text">{{item.customer_address.address || '无'}}</view>
+									</view>
+								</view>
+								<view class="sex">
+									<view class="sex-text">
+										{{ item.customer.sex || '无' }}
+									</view>
+								</view>
+							</view>
+
+							<view class="bottom">
+								<view class="distance">
+									<view class="distance-icon">
+										<u-image src="/static/todayNursing/distance.png" height="42" width="42">
+										</u-image>
+									</view>
+									<view class="distance-text">{{item.distance}}公里</view>
+								</view>
+								<view class="to-there" @click.stop="toThere(item)">
+									<view class="to-there-text">去那里</view>
+									<view class="to-there-icon">
+										<u-image src="/static/todayNursing/to-there.png" height="46" width="46">
+										</u-image>
+									</view>
+								</view>
+							</view>
+						</view>
+
+					</view>
+
+					<view v-else class="nursing-list-nodata">
+						<u-empty mode="list" text="暂无护理">
+						</u-empty>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+
+		<doingOrder></doingOrder>
+	</view>
+</template>
+
+<script>
+	import moment from "@/libs/moment.min.js"
+	import doingOrder from '../../components/doingOrder/doingOrder.vue'
+	export default {
+		components: {
+			doingOrder
+		},
+		data() {
+			return {
+				refreshStatus: false,
+				select: {
+					page: 1,
+					page_size: 999,
+					date: `${new Date().getFullYear()}-${new Date().getMonth()+1}-${new Date().getDate()}`,
+					lat: '',
+					lng: ''
+				},
+
+				nursingList: []
+			}
+		},
+		methods: {
+			//跳转护理地图
+			toMap() {
+				uni.$u.throttle(() => {
+					uni.navigateTo({
+						url: "/pages/map/map"
+					})
+				})
+			},
+			//跳转详情
+			toDetail(item) {
+				uni.$u.throttle(() => {
+					uni.navigateTo({
+						url: `/pages/detailNursing/detailNursing?id=${item.id}`
+					})
+				})
+			},
+
+			async getToday() {
+				this.refreshStatus = true
+				let res = await this.$u.api.nurseList(this.select)
+				console.log(res);
+				this.nursingList = res.data
+				this.refreshStatus = false
+			},
+
+
+			toThere(item) {
+				this.$u.throttle(() => {
+					uni.openLocation({
+						latitude: Number(item.customer.lat),
+						longitude: Number(item.customer.lng),
+						name: item.customer.address
+					})
+				})
+			}
+		},
+		computed: {
+			timeFormat() {
+				return function(time, fmt = 'YYYY-MM-DD HH:mm') {
+					if (!time) {
+						return
+					}
+					return moment(time).format(fmt)
+				}
+			}
+		},
+		onShow() {
+			uni.getLocation().then(res => {
+				this.select.lat = res[1]?.latitude
+				this.select.lng = res[1]?.longitude
+
+				this.getToday()
+			})
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.map {
+		display: flex;
+		align-items: center;
+
+		margin-top: 20rpx;
+		margin-left: 470rpx;
+
+		.map-text {
+			width: 128rpx;
+			height: 42rpx;
+			font-size: 32rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #36596A;
+			line-height: 42rpx;
+
+		}
+
+		.map-icon {
+
+			margin-left: 24rpx;
+		}
+	}
+
+	.nursing-list {
+
+		margin-top: 16rpx;
+
+		.list-item {
+			width: 710rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(219, 218, 218, 0.5);
+
+			margin: 0 20rpx 26rpx 22rpx;
+
+			.top {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				padding: 22rpx 0;
+
+				.time {
+					height: 40rpx;
+					font-size: 28rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #36596A;
+					line-height: 40rpx;
+
+					padding-left: 20rpx;
+				}
+
+				.status {
+					display: flex;
+					align-items: center;
+
+					.status-icon {
+
+						margin-right: 10rpx;
+					}
+
+					.status-text {
+						width: 84rpx;
+						height: 40rpx;
+						font-size: 28rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #36596A;
+						line-height: 40rpx;
+
+						margin-right: 20rpx;
+					}
+				}
+			}
+
+			.line {
+				width: 670rpx;
+				height: 2rpx;
+				border: 2rpx solid #EEEFF5;
+
+				margin: 0 auto;
+			}
+
+			.center {
+				display: flex;
+				justify-content: space-between;
+
+				padding-top: 24rpx;
+
+				.avatar {
+
+					padding-top: 4rpx;
+					padding-left: 20rpx;
+				}
+
+				.user-info {
+					flex: 1;
+					padding-left: 24rpx;
+
+					.name {
+						width: 270rpx;
+						height: 48rpx;
+						font-size: 32rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #333333;
+					}
+
+					.tel {
+						height: 40rpx;
+						font-size: 28rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #36596A;
+						line-height: 40rpx;
+						display: flex;
+
+						margin-top: 18rpx;
+
+						.text {
+
+							margin-left: 10rpx;
+						}
+					}
+
+					.address {
+						font-size: 28rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #36596A;
+						line-height: 40rpx;
+						display: flex;
+
+						margin-top: 14rpx;
+
+						.text {
+
+							margin-left: 10rpx;
+						}
+					}
+				}
+
+				.sex {
+					width: 40rpx;
+					height: 40rpx;
+					background: #FDECEC;
+					opacity: 0.5;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+
+					margin-right: 20rpx;
+
+					.sex-text {
+						width: 28rpx;
+						height: 34rpx;
+						font-size: 28rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #36596A;
+						line-height: 34rpx;
+					}
+				}
+			}
+
+			.bottom {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				margin-top: 16rpx;
+				padding-bottom: 26rpx;
+
+				.distance {
+					align-items: center;
+					display: flex;
+
+					.distance-icon {
+
+						padding-left: 20rpx;
+					}
+
+					.distance-text {
+						height: 34rpx;
+						font-size: 24rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #A7AFBC;
+						line-height: 34rpx;
+
+						padding-left: 20rpx;
+					}
+				}
+
+				.to-there {
+					display: flex;
+					align-items: center;
+
+					margin-right: 20rpx;
+
+					.to-there-text {
+						height: 34rpx;
+						font-size: 24rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #A7AFBC;
+						line-height: 34rpx;
+
+						margin-right: 14rpx;
+					}
+
+					.to-there-icon {
+
+						margin-left: 3rpx;
+					}
+				}
+			}
+		}
+
+
+		&-nodata {
+			transform: translate(-50%, -50%);
+			position: fixed;
+			top: 50%;
+			left: 50%;
+		}
+	}
 </style>