From 296c45ad0e9307120ef6c5f88868b1a0b3d448fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Wed, 22 Feb 2023 10:24:18 +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.scss | 27 ++++++++++++++++++++--
 pages/appointmenttime/appointmenttime.vue  |  2 +-
 pages/customerservice/customerservice.vue  | 19 +++++++++++----
 pages/nursestation/nursestation.scss       | 10 ++++----
 pages/nursestation/nursestation.vue        |  2 +-
 5 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/pages/appointmenttime/appointmenttime.scss b/pages/appointmenttime/appointmenttime.scss
index f49ed06..dfeba47 100644
--- a/pages/appointmenttime/appointmenttime.scss
+++ b/pages/appointmenttime/appointmenttime.scss
@@ -172,7 +172,6 @@
 
 		.remarks {
 			width: 94%;
-			height: 382rpx;
 			margin: 10rpx auto;
 			padding: 3%;
 			font-size: 34rpx;
@@ -184,7 +183,13 @@
 
 			span {
 				display: inline-block;
-				width: 20%;
+				width: 60%;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				position: absolute;
+				top:50%;
+				transform: translateY(-50%);
 			}
 
 			input {
@@ -295,10 +300,24 @@
 			margin-top: 20rpx;
 			position: relative;
 			padding-bottom: 40rpx;
+			::v-deep .u-checkbox__label{
+				width: 100% !important;
+			}
 			.detail {
 				width: 100%;
 				line-height: 100rpx;
 				// padding: 20rpx 0 0 40rpx;
+				position: relative;
+				.itemConsumabletitle{
+					width:55%;
+					position: absolute;
+					top:50%;
+					transform: translateY(-50%);
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					display: inline-block;
+				}
 				/deep/ .u-checkbox{
 					margin: 40rpx 0  0;
 					position: relative;
@@ -330,6 +349,9 @@
 			position: relative;
 
 			.detail {
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
 				line-height: 31rpx;
 				font-size: 32rpx;
 				color: #666666;
@@ -337,6 +359,7 @@
 				position: absolute;
 				left: 10%;
 				top: 60%;
+				width: 90%;
 			}
 		}
 
diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue
index d339b59..46546be 100644
--- a/pages/appointmenttime/appointmenttime.vue
+++ b/pages/appointmenttime/appointmenttime.vue
@@ -67,7 +67,7 @@
 					<u-checkbox @change="checkboxChange(item)" v-model="item.radio"
 						v-for="(item, index) in orderlist.itemConsumableList" :key="index"
 						:name="item.consumableDetail">
-						<view style='display: inline-block;'> {{item.consumableDetail}}</view>
+						<view class='itemConsumabletitle'> {{item.consumableDetail}}</view>
 						<span>{{item.consumableCount}}{{item.consumableUnit}}/￥{{item.consumablePrice}}</span>
 					</u-checkbox>
 				</u-checkbox-group>
diff --git a/pages/customerservice/customerservice.vue b/pages/customerservice/customerservice.vue
index 9b48a32..1b984b5 100644
--- a/pages/customerservice/customerservice.vue
+++ b/pages/customerservice/customerservice.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="app">
-		<image src="../../static/kefuzx.jpg" mode=""></image>
+		<image src="../../static/kefuzx.jpg" mode="" @tap='lookImg'></image>
 	</view>
 </template>
 
@@ -8,8 +8,17 @@
 	export default {
 		data() {
 			return {
-
+				imageUrl: ['../../static/kefuzx.jpg']
 			};
+		},
+		methods: {
+			lookImg() {
+				console.log(1)
+				uni.previewImage({
+					current: 0,
+					urls: this.imageUrl
+				})
+			},
 		}
 	}
 </script>
@@ -17,11 +26,13 @@
 <style lang="scss">
 	.app {
 		width: 100%;
+		height: 100vh;
 		padding: 0;
-		background-color: #1A191E;
+		background-color: #000000;
+
 		image {
 			width: 100%;
-			height: 100%;
+			height: 1300rpx;
 		}
 	}
 </style>
diff --git a/pages/nursestation/nursestation.scss b/pages/nursestation/nursestation.scss
index b371c0b..e9a4171 100644
--- a/pages/nursestation/nursestation.scss
+++ b/pages/nursestation/nursestation.scss
@@ -66,7 +66,7 @@
 		}
 
 		.content {
-		font-size: 36rpx;
+		font-size: 34rpx;
 		padding-bottom: 10rpx;
 		// margin-top: -80rpx;
 		z-index: 999;
@@ -125,7 +125,7 @@
 					text-align: center;
 					line-height: 52rpx;
 					position: absolute;
-					top:55%;
+					top:70%;
 					right:5%;
 				}
 				.buy{
@@ -151,15 +151,15 @@
 					white-space: nowrap;
 				}
 				.day{
-					font-size: 26rpx;
+					font-size: 24rpx;
 					position: absolute;
-					top:45%;
+					top:53%;
 					left:35%;
 					width: 65%;
 				}
 				.huanyao {
 					position: absolute;
-					top:15%;
+					top:10%;
 					left:35%;
 					width: 45%;
 					line-height: 50rpx;
diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue
index 79e6f1c..112944f 100644
--- a/pages/nursestation/nursestation.vue
+++ b/pages/nursestation/nursestation.vue
@@ -133,7 +133,7 @@
 						<!-- <view class="product" style="top:38%;font-size: 24rpx;color: #999999;">
 							{{item.attributeDetailsName}}
 						</view> -->
-						<view class="buy appointment" @tap="goCommodityDetails(item)">购买</view>
+						<view class="appointment" @tap="goCommodityDetails(item)">购买</view>
 						<view class="price">￥{{item.goodsPrice==null?'0':item.goodsPrice}}</view>
 					</view>
 				</view>