From c79dc45fe71b57196e59564bd66af2b3cbd59754 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 16:32:07 +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 |   9 +-
 pages/appointmenttime/appointmenttime.vue  | 176 +++++++++++----------
 pages/homepage/homepage.vue                |   6 +-
 pages/nursestation/nursestation.scss       |   4 +-
 pages/utabs/u-tabs.vue                     |   1 +
 5 files changed, 109 insertions(+), 87 deletions(-)

diff --git a/pages/appointmenttime/appointmenttime.scss b/pages/appointmenttime/appointmenttime.scss
index 43a3109..203cdf1 100644
--- a/pages/appointmenttime/appointmenttime.scss
+++ b/pages/appointmenttime/appointmenttime.scss
@@ -2,7 +2,12 @@
 		font-size: 34rpx;
 		padding-top: 10rpx;
 		height: 100%;
-
+		-webkit-overflow-scrolling: touch;
+		.scroll-Y {
+				height: 100vh;
+				overflow: scroll;
+				position: relative;
+			}
 		.mask {
 			.Agreement {
 				width: 100%;
@@ -100,6 +105,7 @@
 
 	.timeyear{
 		.bottomtext{
+			-webkit-overflow-scrolling: touch;
 			width: 96%;
 			margin: 0 auto;
 			.items{
@@ -129,6 +135,7 @@
 			}
 		}
 		.toptext{
+			-webkit-overflow-scrolling: touch;
 			padding-top: 10rpx;
 			display: flex;
 			justify-content:space-around;
diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue
index 46546be..4812197 100644
--- a/pages/appointmenttime/appointmenttime.vue
+++ b/pages/appointmenttime/appointmenttime.vue
@@ -1,96 +1,101 @@
 <template>
 	<view class="app">
-		<view class="user">
-			<view class="item">
-				<span>姓名：</span>
-				<span class='addition'>{{personInfo.patientName}}</span>
-			</view>
-			<view class="item">
-				<span>电话：</span>
-				<span class='addition'>{{personInfo.phone}}</span>
-			</view>
-			<view class="addressitem">
-				<view class="leftaddress">地址：</view>
-				<view class='addition'>{{personInfo.address}}</view>
-			</view>
-			<view class="item" style="border: 0;">
-				<span>上门时间：</span>
-				<span class='addition'>请您选择希望护理员到达的时间</span>
-			</view>
-			<tabs :list="orderlist.appointmentTimeList" :current="timecurrent" @change="timechange">
-			</tabs>
-			<view class="timeyear">
-				<view class="toptext">
-					<view :class="Soonerorlater=='morning'?'Soonerorlaterclass':'Soonerorlater'"
-						@tap="tapSoonerorlater('morning')">
-						上午
-					</view>
-					<view class="">
-					</view>
-					<view :class="Soonerorlater=='after'?'Soonerorlaterclass':'Soonerorlater'"
-						@tap="tapSoonerorlater('after')">
-						下午
-					</view>
+
+		<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltoupper="upper"
+			@scrolltolower="lower" @scroll="scroll">
+			<view class="user">
+				<view class="item">
+					<span>姓名：</span>
+					<span class='addition'>{{personInfo.patientName}}</span>
 				</view>
-				<view class="bottomtext">
-					<view class="items" v-if="Soonerorlater=='morning'">
-						<view @tap='taptime(item,index)'
-							v-for="(item ,index) in orderlist.appointmentTimeList[timecurrent].morningList"
-							:class="timeindex==index?'timeitemtap':'timeitem'">
-							{{item}}
+				<view class="item">
+					<span>电话：</span>
+					<span class='addition'>{{personInfo.phone}}</span>
+				</view>
+				<view class="addressitem">
+					<view class="leftaddress">地址：</view>
+					<view class='addition'>{{personInfo.address}}</view>
+				</view>
+				<view class="item" style="border: 0;">
+					<span>上门时间：</span>
+					<span class='addition'>请您选择希望护理员到达的时间</span>
+				</view>
+				<tabs :list="orderlist.appointmentTimeList" :current="timecurrent" @change="timechange">
+				</tabs>
+				<view class="timeyear">
+					<view class="toptext">
+						<view :class="Soonerorlater=='morning'?'Soonerorlaterclass':'Soonerorlater'"
+							@tap="tapSoonerorlater('morning')">
+							上午
+						</view>
+						<view class="">
+						</view>
+						<view :class="Soonerorlater=='after'?'Soonerorlaterclass':'Soonerorlater'"
+							@tap="tapSoonerorlater('after')">
+							下午
 						</view>
 					</view>
-					<view class="items" v-if="Soonerorlater=='after'">
-						<view @tap='taptime(item,index)'
-							v-for="(item ,index) in orderlist.appointmentTimeList[timecurrent].afternoonList"
-							:class="timeindex==index?'timeitemtap':'timeitem'">
-							{{item}}
+					<view class="bottomtext">
+						<view class="items" v-if="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 @tap='taptime(item,index)'
+								v-for="(item ,index) in orderlist.appointmentTimeList[timecurrent].afternoonList"
+								:class="timeindex==index?'timeitemtap':'timeitem'">
+								{{item}}
+							</view>
 						</view>
 					</view>
 				</view>
 			</view>
-		</view>
-		<view class="remarks">
-			服务时长:
-			<span style='padding-left: 30rpx;' class='addition'>{{orderlist.serveDurationUnit}}</span>
-		</view>
-		<view class="Package">套餐信息：
-			<text class="money">￥{{orderlist.nurseItemPrice}}</text>
-			<text class="detail">
-				{{orderlist.nurseItemName}}
-			</text>
-		</view>
-		<view class="Consumablespackage">耗材包详情：
-			<text class="money">￥{{consumableTotalPrice}}</text>
-			<view class="detail">
-				<u-checkbox-group @change="checkboxGroupChange" wrap='true'>
-					<u-checkbox @change="checkboxChange(item)" v-model="item.radio"
-						v-for="(item, index) in orderlist.itemConsumableList" :key="index"
-						:name="item.consumableDetail">
-						<view class='itemConsumabletitle'> {{item.consumableDetail}}</view>
-						<span>{{item.consumableCount}}{{item.consumableUnit}}/￥{{item.consumablePrice}}</span>
-					</u-checkbox>
-				</u-checkbox-group>
+			<view class="remarks">
+				服务时长:
+				<span style='padding-left: 30rpx;' class='addition'>{{orderlist.serveDurationUnit}}</span>
 			</view>
-		</view>
-		<view class="remarks">
-			<span>备注：</span>
-			<input placeholder="请输入" v-model="orderlist.remark">
-		</view>
-		<view class="radio-content">
-			<view class="radio-right" @tap="changeRadio">
-				<view class="radio" :class="radio == 2 ? 'radio-default':''">
-					<view :class="radio == 2 ? 'radio-active':''"></view>
+			<view class="Package">套餐信息：
+				<text class="money">￥{{orderlist.nurseItemPrice}}</text>
+				<text class="detail">
+					{{orderlist.nurseItemName}}
+				</text>
+			</view>
+			<view class="Consumablespackage">耗材包详情：
+				<text class="money">￥{{consumableTotalPrice}}</text>
+				<view class="detail">
+					<u-checkbox-group @change="checkboxGroupChange" wrap='true'>
+						<u-checkbox @change="checkboxChange(item)" v-model="item.radio"
+							v-for="(item, index) in orderlist.itemConsumableList" :key="index"
+							:name="item.consumableDetail">
+							<view class='itemConsumabletitle'> {{item.consumableDetail}}</view>
+							<span>{{item.consumableCount}}{{item.consumableUnit}}/￥{{item.consumablePrice}}</span>
+						</u-checkbox>
+					</u-checkbox-group>
 				</view>
 			</view>
-			<view class="agreement">我已阅读并同意<text @tap='maskshow=true'
-					style="color: #000000;border-bottom: 1rpx solid #000000;">《用户协议》</text></view>
-		</view>
-		<view class="priceback">
-			<view class="prices">￥{{orderlist.totalPrice}}</view>
-			<view class="xiugai" @tap='goaddress'>修改信息</view>
-			<view class="queren" @tap='updata'>确认预约</view>
-		</view>
+			<view class="remarks">
+				<span>备注：</span>
+				<input placeholder="请输入" v-model="orderlist.remark">
+			</view>
+			<view class="radio-content">
+				<view class="radio-right" @tap="changeRadio">
+					<view class="radio" :class="radio == 2 ? 'radio-default':''">
+						<view :class="radio == 2 ? 'radio-active':''"></view>
+					</view>
+				</view>
+				<view class="agreement">我已阅读并同意<text @tap='maskshow=true'
+						style="color: #000000;border-bottom: 1rpx solid #000000;">《用户协议》</text></view>
+			</view>
+			<view class="priceback">
+				<view class="prices">￥{{orderlist.totalPrice}}</view>
+				<view class="xiugai" @tap='goaddress'>修改信息</view>
+				<view class="queren" @tap='updata'>确认预约</view>
+			</view>
+		</scroll-view>
+
 		<u-toast ref="uToast" />
 		<!-- //用户协议 -->
 		<u-mask :show="maskshow" class='mask' @click='maskshow=false'>
@@ -128,6 +133,10 @@
 		},
 		data() {
 			return {
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
 				Soonerorlater: 'morning',
 				timecurrent: 0, //时间下标
 				openid: '',
@@ -187,6 +196,11 @@
 			this.userinfo();
 		},
 		methods: {
+			upper: function(e) {},
+			lower: function(e) {},
+			scroll: function(e) {
+				this.old.scrollTop = e.detail.scrollTop
+			},
 			//切换上下午
 			tapSoonerorlater(item) {
 				this.Soonerorlater = item
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index a4f2a7e..16204ba 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -10,8 +10,6 @@
 				</image>
 			</swiper-item>
 		</swiper> -->
-
-
 		<view class="container">
 			<view>
 				<swiper :indicator-dots="true" :current="currentIndex" :circular="true" previous-margin="80rpx"
@@ -40,7 +38,7 @@
 			<view class="item" @tap="gosite">
 				<image src="../../static/hlz.png" mode=""></image>
 				<view class="title">
-					护理站
+					护理机构
 				</view>
 			</view>
 			<view class="item" @tap="gomedicine">
@@ -265,7 +263,7 @@
 <style lang="scss">
 	.app {
 		padding: 100rpx 0 0 0;
-
+		-webkit-overflow-scrolling: touch;
 		.swiper-block {
 			height: 500rpx;
 			width: 100%;
diff --git a/pages/nursestation/nursestation.scss b/pages/nursestation/nursestation.scss
index f5a6357..ec9d693 100644
--- a/pages/nursestation/nursestation.scss
+++ b/pages/nursestation/nursestation.scss
@@ -1,5 +1,6 @@
 	.app{
 		padding:10rpx 0 0 0;
+		-webkit-overflow-scrolling: touch;
 	}
 		.swiper-box {
 			width: 100%;
@@ -182,7 +183,7 @@
 					padding: 3%;
 					position: relative;
 					transition: all 0.2s linear;
-					font-size: 36rpx;
+					font-size: 34rpx;
 					&::after {
 						transition: all 0.2s linear;
 						transform: translateX(-50%) scaleX(0);
@@ -281,6 +282,7 @@
 			.title {
 				padding-top: 40rpx;
 				margin:0 0 0 30rpx;
+				font-size: 38rpx;
 				line-height: 59rpx;
 				overflow: hidden;
 				text-overflow: ellipsis;
diff --git a/pages/utabs/u-tabs.vue b/pages/utabs/u-tabs.vue
index 2940382..197e400 100644
--- a/pages/utabs/u-tabs.vue
+++ b/pages/utabs/u-tabs.vue
@@ -318,6 +318,7 @@
 
 	.u-tabs {
 		padding: 20rpx 0;
+		-webkit-overflow-scrolling: touch;
 	}
 
 	view,