From 4de3f64ecfaa640537e888eefb28ee57d7a51d38 Mon Sep 17 00:00:00 2001
From: kuaileWu <1432334894@qq.com>
Date: Wed, 8 Jan 2025 14:56:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=B0=E6=9F=A5=E6=A0=B7=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                             | 67 +++++++++++++++++++++++++------------
 components/preBookList.vue          | 39 ++++++++++++++-------
 pages/book_detail/book_detail.vue   | 28 ++++++++--------
 pages/index/index.vue               |  6 ++--
 pages/prebook/prebook.vue           |  1 +
 pages/prebook_list/prebook_list.vue | 11 +++---
 pages/visitors/visitors.vue         |  8 +++--
 7 files changed, 104 insertions(+), 56 deletions(-)

diff --git a/App.vue b/App.vue
index 63f625f..5019ebe 100644
--- a/App.vue
+++ b/App.vue
@@ -72,8 +72,8 @@
 		padding: 0;
 		background: #F8F6F9;
 		-webkit-text-size-adjust: 100%;
-		font-family: PingFangSC-Regular,sans-serif;
-		font-weight: 400;
+		font-family: "PingFang SC","Helvetica Neue", Helvetica, Arial, sans-serif;;
+		font-weight: normal;
 		height: 100%;
 	}
 	.fl {
@@ -136,31 +136,22 @@
 		font-size:50rpx;
 		line-height: 50rpx;
 	}
-	.PfScRegular{
-		font-family: PingFangSC-Regular, sans-serif !important;
-		font-weight: 400 !important;
-	}
-	.PfScUltralight{
-		font-family: PingFangSC-Ultralight, sans-serif !important;
-	}
-	.PfScLight{
-		font-family: PingFangSC-Light, sans-serif !important;
-	}
-	.PfScThin{
-		font-family: PingFangSC-Thin, sans-serif !important;
-	}
 	.PfScMedium{
-		font-family: PingFangSC-Medium, sans-serif !important;
-		font-weight: 500 !important;
+		font-weight: 600;
 	}
 	.PfScSemibold{
-		font-family: PingFangSC-Semibold, sans-serif !important;
-		font-weight: 600 !important;
+		font-weight: 700;
 	}
-	.PfScHeavy{
-		font-family: PingFangSC-Heavy, sans-serif !important;
-		font-weight: 800 !important;
+
+	@supports (-webkit-touch-callout: none) {
+		.PfScMedium{
+			font-weight: 500;
+		}
+		.PfScSemibold{
+			font-family: PingFangSC-Semibold;
+		}
 	}
+
 	.over{
 		overflow: hidden;
 		text-overflow: ellipsis;
@@ -235,4 +226,36 @@
 		line-height: 40rpx !important;
 		height: 40rpx !important;
 	}
+	
+	.pages-visitors-visitors /deep/ .uni-actionsheet__cell{
+		color:#31333B !important;
+		font-size: 34rpx;
+		line-height: 112rpx;
+		height: 112rpx;
+		padding: 0rpx 6rpx;
+	}
+	.pages-visitors-visitors /deep/ uni-actionsheet .uni-actionsheet {
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: #F6F6F6;
+		border-radius: 20rpx 20rpx 0 0;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	.pages-visitors-visitors /deep/ .uni-actionsheet__menu{
+		border-radius: 20rpx 20rpx 0 0;
+	}
+	
+	.pages-visitors-visitors /deep/ uni-actionsheet .uni-actionsheet__cell:before {
+	    border-top: 2rpx solid #EEEEEE;
+	    color: #EEEEEE;
+	}
+	.pages-visitors-visitors /deep/ uni-actionsheet .uni-actionsheet__action{
+		    margin-top: 24rpx;
+				margin-bottom: 10rpx;
+	}
+	
+	
+	
 </style>
diff --git a/components/preBookList.vue b/components/preBookList.vue
index 8b767d1..034e329 100644
--- a/components/preBookList.vue
+++ b/components/preBookList.vue
@@ -1,6 +1,6 @@
 <template>
   	<view class="prebook-list-com">
-		<view class="list btPadding" v-if="dataList.length>0">
+		<view :class="'list btPadding'+(topnopadding?' topnopadding':'')" v-if="dataList.length>0">
 			<view :class="'item '+item" v-for="(item, key) in dataList" @click="toBookDetail(item)">
 				<view class="left">
 					<view class="title PfScMedium"><text v-if="item.name">{{item.name}}</text><text v-else>无</text></view>
@@ -22,12 +22,16 @@
 export default {
   name: "preBookList",
   props: {
-	dataList:{
-		type: Array,
-		default: function(){
-			return []
+		dataList:{
+			type: Array,
+			default: function(){
+				return []
+			}
+		},
+		topnopadding:{
+			type:Boolean,
+			default:false
 		}
-	}
   },
   data() {
     return {
@@ -58,6 +62,11 @@ export default {
 	overflow: hidden;
 	background: #FFFFFF;
 	.list{
+		&.topnopadding{
+			.item:first-of-type{
+				padding: 0 13rpx 35rpx 13rpx;
+			}
+		}
 		width: 100%;
 		height: auto;
 		background: #FFFFFF;
@@ -108,20 +117,26 @@ export default {
 				flex-shrink: 1;
 				text-align: right;
 				word-break: break-all;
+				height: 42rpx;
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
 				.status{
 					display: flex;
 					justify-content: flex-end;
 					view{
 						display: flex;
 						border-radius: 6rpx;
-						font-size: 22rpx;
-						height: 32rpx;
-						line-height: 32rpx;
+						font-size: 26rpx;
+						line-height: 40rpx;
 						padding:  0 10rpx;
 						box-sizing: border-box;
 						min-width: 90rpx;
 						display: block;
 						text-align: center;
+						height: 40rpx;
+						min-width: 128rpx;
+						box-sizing: border-box;
 					}
 					
 					&.status_wait{
@@ -134,15 +149,15 @@ export default {
 					&.status_out_num{
 						view{
 							background: #FFFAF7;
-							border: 1rpx solid #FE6710;
 							color: #FE6710;
+							border: 1px solid #FE6710;
 						}
 					}
 					&.status_down{
 						view{
 							background: #FCFCFC;
-							border: 1rpx solid #AEB0B8;
-							color: #B6B8BF;
+							border: 1px solid #999999;
+							color: #999999;
 						}
 					}
 					&.status_expire,&.status_cancle{
diff --git a/pages/book_detail/book_detail.vue b/pages/book_detail/book_detail.vue
index 078fb79..389bc53 100644
--- a/pages/book_detail/book_detail.vue
+++ b/pages/book_detail/book_detail.vue
@@ -116,7 +116,6 @@
 				// 		this.$pop.modelShow('预约信息为空')
 				// 		return
 				// 	}
-				
 					bookInfo = data
 					this.bookInfo = bookInfo
 					this.status = this.statusStyleList[bookInfo.status]
@@ -166,47 +165,48 @@
 					.status_text{
 						display: flex;
 						border-radius: 6rpx;
-						font-size: 22rpx;
-						height: 32rpx;
-						line-height: 32rpx;
+						font-size: 26rpx;
+						height: 40rpx;
+						line-height: 40rpx;
 						padding:  0 10rpx;
 						box-sizing: border-box;
 						min-width: 90rpx;
 						display: block;
 						text-align: center;
+						min-width: 128rpx;
 					}
 					&.status_wait{
 						.status_text{
-							background: #EEFFF6;
-							// border: 1rpx solid #5BD07A;
-							color: #4FC381;
+							background: #F8FFF7;
+							border: 1rpx solid #5BD07A;
+							color: #58CA7F;
 						}
 					}
 					&.status_out_num{
 						.status_text{
-							background: #FFF2EE;
-							// border: 1rpx solid #FE6710;
+							background: #FFFAF7;
 							color: #FE6710;
+							border: 1px solid #FE6710;
 						}
 					}
 					&.status_down{
 						.status_text{
 							background: #FCFCFC;
-							// border: 1rpx solid #AEB0B8;
-							color: #B6B8BF;
+							border: 1px solid #999999;
+							color: #999999;
 						}
 					}
 					&.status_expire,&.status_cancle{
 						.status_text{
 							background: #FCFCFC;
-							// border: 1rpx solid #AEB0B8;
+							border: 1rpx solid #AEB0B8;
 							color: #B6B8BF;
 						}
 					}
 					&.status_ing{
 						.status_text{
-							// border: 1rpx solid #5FA1CB;
-							background: #EEF8FF;
+							border: 1rpx solid #5FA1CB;
+							background: #F7FCFF;
 							color: #5FA1CB;
 						}
 					}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d203894..f9f1c56 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -73,7 +73,7 @@
 				</view>
 			</view>
 		</view>
-		<pre-book-list class="preg-books" :dataList="recentAppoint"></pre-book-list>
+		<pre-book-list class="preg-books" :dataList="recentAppoint" :topnopadding="true"></pre-book-list>
 
 		<tabbar current="1" leftButtonText="预约"></tabbar>
 	</view>
@@ -223,6 +223,7 @@
 					this.pageShow = true;
 					let visitFlag = true;
 					this.doctorInfo = data;
+					console.log(data)
 					if(this.doctorInfo.doctor_info &&  this.doctorInfo.doctor_info.depart_name && this.doctorInfo.doctor_info.depart_name.length>0){
 						this.doctor_dept = this.doctorInfo.doctor_info.depart_name;
 					}
@@ -332,7 +333,7 @@
 							width: auto;
 							padding: 0 15rpx;
 							min-width: 125rpx;
-							margin-top: 14rpx;
+							margin-top: 5rpx;
 							line-height: 42rpx;
 							text-align: center;
 							font-size: 28rpx;
@@ -428,6 +429,7 @@
 					.right{
 						width: 200rpx;
 						height: 100%;
+						color: #666666;
 						img{
 							width: 52rpx;
 							height: 52rpx;
diff --git a/pages/prebook/prebook.vue b/pages/prebook/prebook.vue
index 297b73e..59b63a3 100644
--- a/pages/prebook/prebook.vue
+++ b/pages/prebook/prebook.vue
@@ -200,6 +200,7 @@
 
 				if(uids.length <= 0){
 					this.$pop.modelShow('请选择预约就诊人')
+					console.log(88888);
 					return
 				}
 
diff --git a/pages/prebook_list/prebook_list.vue b/pages/prebook_list/prebook_list.vue
index 80f2dae..aefe447 100644
--- a/pages/prebook_list/prebook_list.vue
+++ b/pages/prebook_list/prebook_list.vue
@@ -100,10 +100,13 @@
 				border-radius: 30rpx;
 				box-sizing: border-box;
 				font-size: 24rpx;
-				color: #616266;
-				&.active{
-					border: 1rpx solid #5BD07A;
-					color: #58CA7F;
+				color: #616266;
+				min-width: 136rpx;
+				text-align: center;
+				&.active{
+					border: 1rpx solid #5BD07A;
+					color: #58CA7F;
+					background: #F8FFF7;
 				}
 			}
 		}
diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue
index 9e78dcd..99416a0 100644
--- a/pages/visitors/visitors.vue
+++ b/pages/visitors/visitors.vue
@@ -377,16 +377,20 @@
 							min-height: 40rpx;
 							line-height: 40rpx;
 							font-size: 28rpx;
-							color: #949699;
+							color: #666;
 							letter-spacing: 2rpx;
 							max-width: 250rpx;
 							align-items: flex-end;
 						}
 						.depart{
 							margin-left: 10rpx;
+							color: #666;
+							min-height: 40rpx;
+							line-height: 40rpx;
 						}
 						.status2{
-							height: 38rpx;
+							min-height: 40rpx;
+							line-height: 40rpx;
 							background: #FFE9E9;
 							line-height: 38rpx;
 							padding: 0 7rpx;