From 8671584387c45406803fe4d9a554df3db466578e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 24 Feb 2023 09:38:52 +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/Healthitem/Healthitem.vue           | 30 ++++++++++++++++--
 pages/Healthknowledge/Healthknowledge.vue | 13 +++-----
 pages/ProjectDetails/ProjectDetails.scss  |  1 -
 pages/classification/classification.vue   |  1 +
 pages/homepage/homepage.vue               | 37 ++++++++++++-----------
 pages/nursestation/nursestation.scss      | 12 +++++++-
 pages/nursestation/nursestation.vue       |  7 +++--
 7 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/pages/Healthitem/Healthitem.vue b/pages/Healthitem/Healthitem.vue
index 1a4da59..f8264e2 100644
--- a/pages/Healthitem/Healthitem.vue
+++ b/pages/Healthitem/Healthitem.vue
@@ -7,7 +7,6 @@
 		</view>
 	</view>
 </template>
-
 <script>
 	export default {
 		data() {
@@ -19,13 +18,38 @@
 			this.item = JSON.parse(decodeURIComponent(options.item))
 			this.item.informationContent = this.item.informationContent.replace(/\<img/gi,
 				"<br/> <img class='richPic'")
+			this.item.informationContent = this.item.informationContent.replace(/\<p/gi,
+				"<p class='ptext'")
+			// this.item.informationContent = this.item.informationContent.replace(/\<span/,
+			// 	"<span class='ql-size-small'")
+			// atch = match.replace(/class="ql-size-large"/gi, 'max-width:100%;')
+			// console.log(this.item.informationContent)
 		},
-		onReady() { //更改导航栏文字
-		},
+		onReady() {}, //更改导航栏文字
 	}
 </script>
 
 <style lang="scss">
+	/deep/ .ptext {
+		margin-top: 20rpx;
+	}
+
+	/deep/ .ptext:nth-child(1) {
+		text-indent: 2em;
+	}
+
+	/deep/ .ql-size-small {
+		font-size: 20rpx;
+	}
+
+	/deep/ .ql-size-large {
+		font-size: 36rpx;
+	}
+
+	/deep/ .ql-size-huge {
+		font-size: 46rpx;
+	}
+
 	.title {
 		padding-left: 3%;
 		font-size: 38rpx;
diff --git a/pages/Healthknowledge/Healthknowledge.vue b/pages/Healthknowledge/Healthknowledge.vue
index 69ad69b..a8ada8c 100644
--- a/pages/Healthknowledge/Healthknowledge.vue
+++ b/pages/Healthknowledge/Healthknowledge.vue
@@ -119,7 +119,7 @@
 		.Healthknowledge {
 			width: 94%;
 			margin: 20rpx auto;
-			padding: 0 50rpx 50rpx;
+			padding: 0 30rpx 50rpx;
 			background-color: #fff;
 			position: relative;
 			line-height: 46rpx;
@@ -130,7 +130,7 @@
 
 				.item {
 					width: 100%;
-					height: 200rpx;
+					height: 230rpx;
 					position: relative;
 					border-bottom: 2rpx solid #CDC9C9;
 
@@ -139,8 +139,8 @@
 						right: 0;
 						top: 50%;
 						transform: translateY(-50%);
-						width: 253rpx;
-						height: 164rpx;
+						width: 200rpx;
+						height: 180rpx;
 						border-radius: 10rpx;
 					}
 
@@ -156,11 +156,8 @@
 						position: absolute;
 						top: 20rpx;
 						left: 0;
-						width: 50%;
+						width: 60%;
 						font-size: 30rpx;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
 					}
 				}
 			}
diff --git a/pages/ProjectDetails/ProjectDetails.scss b/pages/ProjectDetails/ProjectDetails.scss
index ea51639..c81df3b 100644
--- a/pages/ProjectDetails/ProjectDetails.scss
+++ b/pages/ProjectDetails/ProjectDetails.scss
@@ -1,7 +1,6 @@
 	.app {
 		height: 100%;
 		padding: 0 0 0 0;
-		padding-top: 10rpx;
 		font-size: 34rpx;
 		position: relative;
 		.swiper-box {
diff --git a/pages/classification/classification.vue b/pages/classification/classification.vue
index 149a619..aef8d7e 100644
--- a/pages/classification/classification.vue
+++ b/pages/classification/classification.vue
@@ -335,6 +335,7 @@
 					flex-wrap: wrap;
 					justify-content: space-evenly;
 					background-color: #ffffff;
+					align-content: flex-start;
 
 					.item {
 						width: 45%;
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index e929b59..8632aef 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -1,8 +1,6 @@
 <template>
 	<view class="app">
 		<!-- <u-swiper :list="swiperImgUrls" effect3d='true' height='400' interval='5000' duration='2000'></u-swiper> -->
-
-
 		<!-- <swiper class="swiper-block" :indicator-dots="true" :autoplay="true" :interval="3000" :duration="1000"
 			:circular='true' previous-margin='90rpx' next-margin='90rpx' current='0' @change="swiperChange">
 			<swiper-item class="swiper-item" v-for="(item,index) in swiperImgUrls">
@@ -12,8 +10,8 @@
 		</swiper> -->
 		<view class="container">
 			<view>
-				<swiper :indicator-dots="true" :current="currentIndex" :circular="true" previous-margin="80rpx"
-					next-margin="80rpx" :autoplay="autoplay" interval="3000" duration="1000" show-center-play-btn="true"
+				<swiper :indicator-dots="true" :current="currentIndex" :circular="true" previous-margin="55rpx"
+					next-margin="55rpx" :autoplay="autoplay" interval="3000" duration="1000" show-center-play-btn="true"
 					class="swiper-block" circular='true' @change="swiperChange">
 					<swiper-item v-for="(item ,index) in swiperImgUrls" :key="index" class="swiper-item">
 						<view v-show="!splits(item)" wx-if="{item}">
@@ -32,8 +30,6 @@
 				</swiper>
 			</view>
 		</view>
-
-
 		<view class="items">
 			<view class="item" @tap="gosite">
 				<image src="../../static/hlz.png" mode=""></image>
@@ -173,8 +169,9 @@
 								e.image = baseurl + e.posterPictureUrl
 								this.swiperImgUrls.push(e.image)
 							})
-							if(res.data.poserInfoList[0].video){
-								res.data.poserInfoList[0].video = baseurl + res.data.poserInfoList[0].posterVideoUrl
+							if (res.data.poserInfoList[0].video) {
+								res.data.poserInfoList[0].video = baseurl + res.data.poserInfoList[0]
+									.posterVideoUrl
 								this.swiperImgUrls.push(res.data.poserInfoList[0].video)
 							}
 						}
@@ -264,8 +261,14 @@
 </script>
 <style lang="scss">
 	.app {
-		padding: 100rpx 0 0 0;
+		padding: 0 0 0 0;
 		-webkit-overflow-scrolling: touch;
+		
+		.container {
+			padding-top: 100rpx;
+			background-color: #fff
+		}
+
 		.swiper-block {
 			height: 500rpx;
 			width: 100%;
@@ -280,16 +283,16 @@
 		}
 
 		.slide-image {
-			height: 300rpx;
-			width: 520rpx;
+			height: 270rpx;
+			width: 580rpx;
 			border-radius: 9rpx;
 			box-shadow: 0px 0px 30rpx rgba(0, 0, 0, 0.2);
-			margin: 0rpx 30rpx;
+			margin: 0 0 0 30rpx;
 			z-index: 1;
 		}
 
 		.active {
-			transform: scale(1.2);
+			transform: scale(1.10);
 			transition: all 0.2s ease-in 0s;
 			z-index: 20;
 		}
@@ -367,11 +370,11 @@
 						position: absolute;
 						top: 20rpx;
 						left: 0;
-						width: 50%;
+						width: 65%;
 						font-size: 30rpx;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
+						// overflow: hidden;
+						// text-overflow: ellipsis;
+						// white-space: nowrap;
 					}
 				}
 			}
diff --git a/pages/nursestation/nursestation.scss b/pages/nursestation/nursestation.scss
index 29451ad..01ab04a 100644
--- a/pages/nursestation/nursestation.scss
+++ b/pages/nursestation/nursestation.scss
@@ -1,5 +1,5 @@
 	.app{
-		padding:10rpx 0 0 0;
+		padding: 0;
 		-webkit-overflow-scrolling: touch;
 	}
 		.swiper-box {
@@ -116,6 +116,15 @@
 				// 	top:35%;
 				// 	left:35%;
 				// }
+				.advanceAppointDuration{ 
+					position: absolute;
+					top:10%;
+					right:10rpx;
+					width: 20%;
+					text-align: right;
+					font-size: 32rpx;
+					color: #666;
+					}
 				.appointment {
 					font-size: 30rpx;
 					width: 120rpx;
@@ -153,6 +162,7 @@
 					top:53%;
 					left:35%;
 					width: 65%;
+					color: #666; 
 				}
 				.huanyao {
 					position: absolute;
diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue
index d31af51..2fe460b 100644
--- a/pages/nursestation/nursestation.vue
+++ b/pages/nursestation/nursestation.vue
@@ -108,9 +108,12 @@
 						<image :src="item.itemPictureUrl"></image>
 						<view class="huanyao">{{item.nurseItemName}}
 						</view>
+						<span class="advanceAppointDuration">
+							{{item.advanceAppointDuration=='HALF_DAY'?'（半天）':''}}
+							{{item.advanceAppointDuration=='ONE_DAY'?'（一天）':''}}
+						</span>
 						<view class="day">
-							{{item.advanceAppointDuration=='HALF_DAY'?'提前预约时长:半天':''}}
-							{{item.advanceAppointDuration=='ONE_DAY'?'提前预约时长:一天':''}}
+							服务时长：{{item.serveDurationUnit}}
 						</view>
 						<!-- <view class="pingfen">
 						<u-rate :count="5" value="2"></u-rate>