From 21636aeaa95fae4044da2606958bf97ccb295174 Mon Sep 17 00:00:00 2001
From: "271556543@qq.com" <271556543@qq.com>
Date: Fri, 21 Oct 2022 14:44:47 +0800
Subject: [PATCH] 2022.10.21

---
 pages/home/home.vue                 | 12 +++++++++---
 pages/list/list.vue                 | 17 ++++++++++++-----
 pages/todayNursing/todayNursing.vue | 13 +++++++++++--
 store/index.js                      |  3 ++-
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index cdd545e..beaa66a 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -77,7 +77,7 @@
 			</view>
 
 			<view class="data-statistics">
-				<view class="statistics-item">
+				<view class="statistics-item" @click="toList(1)">
 					<view class="statistics-title">
 						<view class="icon3"></view>
 						<view class="text">
@@ -89,7 +89,7 @@
 						<view class="unit">位</view>
 					</view>
 				</view>
-				<view class="statistics-item">
+				<view class="statistics-item" @click="toList('0')">
 					<view class="statistics-title">
 						<view class="icon1"></view>
 						<view class="text">
@@ -101,7 +101,7 @@
 						<view class="unit">位</view>
 					</view>
 				</view>
-				<view class="statistics-item">
+				<view class="statistics-item" @click="toList(2)">
 					<view class="statistics-title">
 						<view class="icon2"></view>
 						<view class="text">
@@ -203,6 +203,12 @@
 			}
 		},
 		methods: {
+			toList(index) {
+				this.$u.vuex('vuex_list_status', index)
+				uni.switchTab({
+					url: '/pages/list/list'
+				})
+			},
 			swiperChange(e) {
 				this.swiperIndex = e.detail.current
 			},
diff --git a/pages/list/list.vue b/pages/list/list.vue
index a71c45e..a6f1575 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -252,18 +252,25 @@
 				}
 			},
 		},
-		mounted() {
+		onReachBottom() {
+			this.select.page++
+			this.status = 'loading';
+			this.getList()
+		},
+		onShow() {
+			this.select.page = 1
+			this.nursingList = []
+			this.select.status = this.vuex_list_status
 			uni.getLocation().then(res => {
 				this.select.lat = res[1]?.latitude
 				this.select.lng = res[1]?.longitude
 
 				this.getList()
 			})
+			console.log(this.vuex_list_status);
 		},
-		onReachBottom() {
-			this.select.page++
-			this.status = 'loading';
-			this.getList()
+		onHide() {
+			this.$u.vuex('vuex_list_status', '')
 		}
 	}
 </script>
diff --git a/pages/todayNursing/todayNursing.vue b/pages/todayNursing/todayNursing.vue
index d23dc8b..c300b8d 100644
--- a/pages/todayNursing/todayNursing.vue
+++ b/pages/todayNursing/todayNursing.vue
@@ -19,7 +19,8 @@
 						<view v-for="(item,index) in nursingList" :key="item.id" class="list-item"
 							@click="toDetail(item)">
 							<view class="top">
-								<view class="time">{{item.start_time}}</view>
+								<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}">
@@ -90,6 +91,7 @@
 </template>
 
 <script>
+	import moment from "@/libs/moment.min.js"
 	export default {
 		data() {
 			return {
@@ -143,7 +145,14 @@
 			}
 		},
 		computed: {
-
+			timeFormat() {
+				return function(time, fmt = 'YYYY-MM-DD HH:mm') {
+					if (!time) {
+						return
+					}
+					return moment(time).format(fmt)
+				}
+			}
 		},
 		onShow() {
 			uni.getLocation().then(res => {
diff --git a/store/index.js b/store/index.js
index 5610967..5f25506 100644
--- a/store/index.js
+++ b/store/index.js
@@ -36,7 +36,8 @@ const store = new Vuex.Store({
 		vuex_token: lifeData.vuex_token || '',
 		vuex_version: '1.0',
 		vuex_male_img: '/static/male.png',
-		vuex_female_img: '/static/female.png'
+		vuex_female_img: '/static/female.png',
+		vuex_list_status: '',
 	},
 	mutations: {
 		$uStore(state, payload) {