From 2763155c2eb09c3b29cd826c9d9decb4b062c4ee Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 3 Apr 2023 10:44:12 +0800
Subject: [PATCH] 2023-4-3

---
 components/cpn-navbar.vue           |  2 +-
 pages/list/list.vue                 | 22 +++++++++++++++++++++-
 pages/todayNursing/todayNursing.vue | 21 +++++++++++++--------
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/components/cpn-navbar.vue b/components/cpn-navbar.vue
index db5296c..3ce66a5 100644
--- a/components/cpn-navbar.vue
+++ b/components/cpn-navbar.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar :height="height" :is-back="isBack" back-icon-color="#fff" :back-icon-name="backIconName"
+		<u-navbar :height="height" :border-bottom="false" :is-back="isBack" back-icon-color="#fff" :back-icon-name="backIconName"
 			:back-text="backText" :back-text-style="backTextStyle" :title="title" :title-color="titleColor"
 			:background="background"></u-navbar>
 	</view>
diff --git a/pages/list/list.vue b/pages/list/list.vue
index ad28d16..53afc6b 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -3,6 +3,9 @@
 		<cpn-navbar title="护理列表"></cpn-navbar>
 
 		<view>
+			<view>
+				<u-button :custom-style="{'margin':'24rpx 24rpx 0 24rpx'}" type="warning" @click="refresh">刷新</u-button>
+			</view>
 			<!-- 搜索 -->
 			<view class="search">
 				<view class="input-content">
@@ -177,6 +180,24 @@
 			}
 		},
 		methods: {
+			refresh(){
+				this.select = {
+					page_size: 10,
+					page: 1,
+					sex: '',
+					status: '',
+					lat: '',
+					lng: '',
+					start_time: this.$moment(new Date()).startOf('month').format('YYYY-MM-DD'),
+					end_time: this.$moment(new Date()).endOf('month').format('YYYY-MM-DD'),
+					keyword: '',
+					sort_name:'start_time',
+					sort_type:'asc'
+				}
+				this.nursingList = []
+				this.getList()
+			},
+			
 			calendarShow(e) {
 				if (e === 2) {
 					this.isShowCalendar = true
@@ -191,7 +212,6 @@
 				this.select.start_time = `${e.startDate}`
 				this.select.end_time = `${e.endDate}`
 				this.nursingList = []
-				console.log(this.select);
 				this.getList()
 			},
 
diff --git a/pages/todayNursing/todayNursing.vue b/pages/todayNursing/todayNursing.vue
index 65e9da2..15cc8c0 100644
--- a/pages/todayNursing/todayNursing.vue
+++ b/pages/todayNursing/todayNursing.vue
@@ -1,13 +1,18 @@
 <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>
+		<cpn-navbar :isRefreshBtn="true" title="今日护理"></cpn-navbar>
+
+		<view class="content">
+			<view>
+				<view style="float: left;margin-left: 20rpx;">
+					<u-button :custom-style="{'width':'200rpx;'}" shape="circle" type="warning" @click="getToday">刷新</u-button>
+				</view>
+				<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>
 
 			<view class="nursing-list">