From ca8e4f2c95bf9f3244bccb70910a676d83500cbc 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 17:09:55 +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/ProjectDetails/ProjectDetails.vue     |   6 +-
 pages/appointmenttime/appointmenttime.scss  |   5 -
 pages/appointmenttime/appointmenttime.vue   | 176 +++++++++-----------
 pages/homepage/homepage.vue                 |   6 +-
 pages/materialbenefits/materialbenefits.vue |  15 +-
 pages/nursestation/nursestation.scss        |   5 +-
 pages/nursestation/nursestation.vue         |  20 ++-
 7 files changed, 112 insertions(+), 121 deletions(-)

diff --git a/pages/ProjectDetails/ProjectDetails.vue b/pages/ProjectDetails/ProjectDetails.vue
index 733607e..bd2a0a2 100644
--- a/pages/ProjectDetails/ProjectDetails.vue
+++ b/pages/ProjectDetails/ProjectDetails.vue
@@ -211,8 +211,10 @@
 							e.image = baseurl + e.posterPictureUrl
 							this.lbinfo.push(e.image)
 						})
-						res.data.poserInfoList[0].video = baseurl + res.data.poserInfoList[0].posterVideoUrl
-						this.lbinfo.push(res.data.poserInfoList[0].video)
+						if (res.data.poserInfoList[0].video) {
+							res.data.poserInfoList[0].video = baseurl + res.data.poserInfoList[0].posterVideoUrl
+							this.lbinfo.push(res.data.poserInfoList[0].video)
+						}
 					} else {
 						this.lbinfo.push(this.baseurl + res.data.itemPictureUrl)
 					}
diff --git a/pages/appointmenttime/appointmenttime.scss b/pages/appointmenttime/appointmenttime.scss
index 203cdf1..e0ec932 100644
--- a/pages/appointmenttime/appointmenttime.scss
+++ b/pages/appointmenttime/appointmenttime.scss
@@ -3,11 +3,6 @@
 		padding-top: 10rpx;
 		height: 100%;
 		-webkit-overflow-scrolling: touch;
-		.scroll-Y {
-				height: 100vh;
-				overflow: scroll;
-				position: relative;
-			}
 		.mask {
 			.Agreement {
 				width: 100%;
diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue
index 4812197..46546be 100644
--- a/pages/appointmenttime/appointmenttime.vue
+++ b/pages/appointmenttime/appointmenttime.vue
@@ -1,101 +1,96 @@
 <template>
 	<view class="app">
-
-		<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 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>
 				</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 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="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 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 class="remarks">
-				服务时长:
-				<span style='padding-left: 30rpx;' class='addition'>{{orderlist.serveDurationUnit}}</span>
+		</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>
-			<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 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="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>
-
+			<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>
 		<u-toast ref="uToast" />
 		<!-- //用户协议 -->
 		<u-mask :show="maskshow" class='mask' @click='maskshow=false'>
@@ -133,10 +128,6 @@
 		},
 		data() {
 			return {
-				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
 				Soonerorlater: 'morning',
 				timecurrent: 0, //时间下标
 				openid: '',
@@ -196,11 +187,6 @@
 			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 c53e8b2..e929b59 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -173,8 +173,10 @@
 								e.image = baseurl + e.posterPictureUrl
 								this.swiperImgUrls.push(e.image)
 							})
-							res.data.poserInfoList[0].video = baseurl + res.data.poserInfoList[0].posterVideoUrl
-							this.swiperImgUrls.push(res.data.poserInfoList[0].video)
+							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)
+							}
 						}
 						this.getHeathHousing();
 					}
diff --git a/pages/materialbenefits/materialbenefits.vue b/pages/materialbenefits/materialbenefits.vue
index e2ac6f1..ba62d02 100644
--- a/pages/materialbenefits/materialbenefits.vue
+++ b/pages/materialbenefits/materialbenefits.vue
@@ -3,12 +3,8 @@
 		<view class="concent">
 			<view class="background">
 				<image src="/static/logo.png" mode=""></image>
-				<view>
-					<view class="detailed">
-						<view>
-							敬请期待
-						</view>
-					</view>
+				<view class="detailed">
+					敬请期待
 				</view>
 			</view>
 		</view>
@@ -46,6 +42,7 @@
 <style lang="scss">
 	.app {
 		padding-top: 10rpx;
+		font-size: 34rpx;
 
 		.concent {
 			width: 701rpx;
@@ -79,12 +76,8 @@
 	}
 
 	.detailed {
-		width: 657rpx;
 		padding: 0 20rpx;
 		line-height: 56rpx;
-	}
-
-	.detailed view {
-		text-indent: 2em;
+		text-align: center;
 	}
 </style>
diff --git a/pages/nursestation/nursestation.scss b/pages/nursestation/nursestation.scss
index ec9d693..53ebd1b 100644
--- a/pages/nursestation/nursestation.scss
+++ b/pages/nursestation/nursestation.scss
@@ -183,7 +183,7 @@
 					padding: 3%;
 					position: relative;
 					transition: all 0.2s linear;
-					font-size: 34rpx;
+					font-size: 36rpx;
 					&::after {
 						transition: all 0.2s linear;
 						transform: translateX(-50%) scaleX(0);
@@ -282,8 +282,9 @@
 			.title {
 				padding-top: 40rpx;
 				margin:0 0 0 30rpx;
-				font-size: 38rpx;
+				font-size: 40rpx;
 				line-height: 59rpx;
+				font-weight: 700;
 				overflow: hidden;
 				text-overflow: ellipsis;
 				white-space: nowrap;
diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue
index d5b5f98..263d034 100644
--- a/pages/nursestation/nursestation.vue
+++ b/pages/nursestation/nursestation.vue
@@ -62,7 +62,7 @@
 						{{item.labelDescription}}
 					</view>
 				</view>
-				<view class="address" v-if="list.address">
+				<view class="address" v-if="list.address" @tap="goMap">
 					<image src="../../static/locatinsmall.png" mode=""></image>
 					<view class="text">
 						{{list.address}}
@@ -227,6 +227,16 @@
 			this.distance = options.distance
 		},
 		methods: {
+			//跳转地图
+			goMap() {
+
+				uni.openLocation({
+					latitude: Number(this.list.latitude),
+					longitude: Number(this.list.longitude),
+					name: this.list.nurseStationName, //地址名称
+					address: this.list.address, //地址详情
+				})
+			},
 			swiperChange(e) {
 				let {
 					current,
@@ -261,7 +271,6 @@
 			ended() {
 				this.autoplay = true
 			},
-
 			testTabClick(item) {
 				this.tabIndex = item.id
 				if (item.id == 0) {
@@ -354,8 +363,11 @@
 								e.image = baseurl + e.posterPictureUrl
 								this.Banners.push(e.image)
 							})
-							res.data.poserInfoList[0].video = baseurl + res.data.poserInfoList[0].posterVideoUrl
-							this.Banners.push(res.data.poserInfoList[0].video)
+							if (res.data.poserInfoList[0].video) {
+								res.data.poserInfoList[0].video = baseurl + res.data.poserInfoList[0]
+									.posterVideoUrl
+								this.Banners.push(res.data.poserInfoList[0].video)
+							}
 						} else {
 							this.Banners.push(res.data.stationPictureUrl)
 							this.Banners.push(res.data.stationIntroducePcitureUrl)