From ba117abc0daf78290fd6e71d99eeb845075328f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Tue, 21 Feb 2023 15:13:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/appointmenttime/appointmenttime.vue |  4 +-
 pages/homepage/homepage.vue               | 47 ++++++++++-------------
 pages/nursestation/nursestation.scss      | 20 ++++++++--
 pages/nursestation/nursestation.vue       |  4 ++
 4 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue
index bd0cf31..7f6eb6a 100644
--- a/pages/appointmenttime/appointmenttime.vue
+++ b/pages/appointmenttime/appointmenttime.vue
@@ -33,14 +33,14 @@
 					</view>
 				</view>
 				<view class="bottomtext">
-					<view class="items" v-if="Soonerorlater=='morning'">
+					<view class="items" v-show="Soonerorlater=='morning'">
 						<view @tap='taptime(item,index)'
 							v-for="(item ,index) in orderlist.appointmentTimeList[timecurrent].morningList"
 							:class="timeindex==index?'timeitemtap':'timeitem'">
 							{{item}}
 						</view>
 					</view>
-					<view class="items" v-if="Soonerorlater=='after'">
+					<view class="items" v-show="Soonerorlater=='after'">
 						<view @tap='taptime(item,index)'
 							v-for="(item ,index) in orderlist.appointmentTimeList[timecurrent].afternoonList"
 							:class="timeindex==index?'timeitemtap':'timeitem'">
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index 7d17928..5b509d4 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -47,7 +47,6 @@
 			</view>
 		</view>
 		<u-toast ref="uToast" />
-		<u-back-top :scroll-top="scrollTop"></u-back-top>
 	</view>
 </template>
 
@@ -67,8 +66,7 @@
 				informationCategoryVOList: [], //咨询信息
 				informationCategorytotal: 0,
 				pageNum: 1,
-				pageSize: 10,
-				scrollTop: 0,
+				pageSize: 5,
 			};
 		},
 		onShow() {
@@ -136,26 +134,26 @@
 				})
 			},
 		},
-		onReachBottom() { //下滑加载
-			if (this.informationCategoryVOList.length >= this.informationCategorytotal) {} else {
-				this.pageNum++
-				getHeathHousingList(this.pageNum, this.pageSize).then(res => {
-					if (res.rows) {
-						res.rows.forEach(e => {
-							e.leadThumbnailUrl = baseurl + e.leadThumbnailUrl
-							this.informationCategoryVOList.push(e)
-						})
-					}
-				})
-			}
-		},
-		onPullDownRefresh() { //下拉刷新
-			this.pageNum = 1;
-			this.getHeathHousing();
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
+		// onReachBottom() { //下滑加载
+		// 	if (this.informationCategoryVOList.length >= this.informationCategorytotal) {} else {
+		// 		this.pageNum++
+		// 		getHeathHousingList(this.pageNum, this.pageSize).then(res => {
+		// 			if (res.rows) {
+		// 				res.rows.forEach(e => {
+		// 					e.leadThumbnailUrl = baseurl + e.leadThumbnailUrl
+		// 					this.informationCategoryVOList.push(e)
+		// 				})
+		// 			}
+		// 		})
+		// 	}
+		// },
+		// onPullDownRefresh() { //下拉刷新
+		// 	this.pageNum = 1;
+		// 	this.getHeathHousing();
+		// 	setTimeout(function() {
+		// 		uni.stopPullDownRefresh();
+		// 	}, 1000);
+		// },
 		//1.分享给朋友
 		onShareAppMessage(res) {
 			let pages = getCurrentPages();
@@ -174,9 +172,6 @@
 				path: url,
 			}
 		},
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop;
-		},
 	}
 </script>
 
diff --git a/pages/nursestation/nursestation.scss b/pages/nursestation/nursestation.scss
index b62a5af..7dbba4d 100644
--- a/pages/nursestation/nursestation.scss
+++ b/pages/nursestation/nursestation.scss
@@ -120,7 +120,7 @@
 					line-height: 52rpx;
 					font-size: 36rpx;
 					position: absolute;
-					top:55%;
+					top:60%;
 					left:35%;
 				}
 				.product {
@@ -132,14 +132,28 @@
 					text-overflow: ellipsis;
 					white-space: nowrap;
 				}
+				.day{
+					position: absolute;
+					top:15%;
+					right:0%;
+					width: 20%;
+				}
 				.huanyao {
 					position: absolute;
 					top:15%;
 					left:35%;
-					width: 60%;
+					width: 45%;
+					line-height: 50rpx;
+					height: 100rpx;
+					text-overflow: -o-ellipsis-lastline;
 					overflow: hidden;
 					text-overflow: ellipsis;
-					white-space: nowrap;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					line-clamp: 2;
+					-webkit-box-orient: vertical;
+					white-space:normal; 
+					word-break:break-all;
 				}
 				.pingfen {
 					float: right;
diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue
index 2a35133..a5c736e 100644
--- a/pages/nursestation/nursestation.vue
+++ b/pages/nursestation/nursestation.vue
@@ -75,6 +75,10 @@
 						<image :src="item.itemPictureUrl"></image>
 						<view class="huanyao">{{item.nurseItemName}}
 						</view>
+						<view class="day">
+							{{item.advanceAppointDuration=='HALF_DAY'?'(半天)':''}}
+								{{item.advanceAppointDuration=='ONE_DAY'?'(全天)':''}}
+						</view>
 						<!-- <view class="pingfen">
 						<u-rate :count="5" value="2"></u-rate>
 					</view> -->