From 5ad740eb8809f51f9dccc50e0f75d26bac69d0fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 11 Nov 2022 17:23:23 +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

---
 App.vue                                       |  2 +-
 api/ServiceDetails/ServiceDetails.js          | 23 +----
 api/disease/index.js                          |  4 +-
 pages/Applforrefund/Applforrefund.vue         |  6 +-
 .../Nursingstationserviceorder.vue            |  2 +-
 pages/Personal/Personal.vue                   |  2 -
 pages/ServiceDetails/ServiceDetails.vue       | 88 +++++++------------
 pages/cancelorder/cancelorder.vue             | 23 ++---
 pages/disease/disease.vue                     | 48 ++++++----
 pages/homepage/homepage.vue                   |  1 -
 pages/information/information.scss            | 25 ++++--
 pages/information/information.vue             | 27 +++---
 pages/modify/modify.scss                      |  2 +-
 pages/modify/modify.vue                       | 25 +++---
 pages/modifyAddress/modifyAddress.vue         |  2 -
 pages/site/site.scss                          |  7 ++
 pages/site/site.vue                           |  3 +
 pages/startup/startup.vue                     |  3 +
 pages/user/user.vue                           | 39 +++++---
 19 files changed, 168 insertions(+), 164 deletions(-)

diff --git a/App.vue b/App.vue
index 27c0e0b..3d0e7aa 100644
--- a/App.vue
+++ b/App.vue
@@ -37,7 +37,7 @@
 		height: 100%;
 		// position: relative;
 		color: #000000;
-		padding: 30rpx 0 200rpx 0;
+		padding: 30rpx 0 0 0;
 
 		.cards {
 			width: 94%;
diff --git a/api/ServiceDetails/ServiceDetails.js b/api/ServiceDetails/ServiceDetails.js
index e4ec850..48d817e 100644
--- a/api/ServiceDetails/ServiceDetails.js
+++ b/api/ServiceDetails/ServiceDetails.js
@@ -1,28 +1,9 @@
 import request from "../request.js"
 
-export function getOrderPatientInfo(orderNo) {
-	return request({
-		url: `/nurseApp/login/getOrderPatientInfo?orderNo=${orderNo}`,
-		method: 'GET'
-	})
-}
-export function getAppStationItemInfo(stationId,stationItemId,stationItemPriceId) {
-	return request({
-		url: `/nurseApp/login/getAppStationItemInfo?stationId=${stationId}&stationItemId=${stationItemId}&stationItemPriceId=${stationItemPriceId}`,
-		method: 'GET'
-	})
-}
 
-export function introductionList(nurseStationId) {
+export function getAppointmentDetailsInfo(orderNo) {
 	return request({
-		url: `/nurseApplet/nearbyNursingStation/introductionList?nurseStationId=${nurseStationId}`,
+		url: `/nurseApplet/nursingOrder/getAppointmentDetailsInfo?orderNo=${orderNo}`,
 		method: 'GET'
 	})
 }
-
-export function cancellationOrder(appointmentOrderId) {
-	return request({
-		url: `/nurseApp/login/cancellationOrder?appointmentOrderId=${appointmentOrderId}`,
-		method: 'post'
-	})
-}
\ No newline at end of file
diff --git a/api/disease/index.js b/api/disease/index.js
index ed3c3ac..07b444b 100644
--- a/api/disease/index.js
+++ b/api/disease/index.js
@@ -1,8 +1,8 @@
 import request from "../request.js"
 
-export function getDiseaseInfo() {
+export function getDiseaseInfo(patientId) {
 	return request({
-		url: `/nurseApplet/login/getDiseaseInfo`,
+		url: `/nurseApplet/login/getDiseaseInfo?patientId=${patientId}`,
 		method: 'GET'
 	})
 }
diff --git a/pages/Applforrefund/Applforrefund.vue b/pages/Applforrefund/Applforrefund.vue
index f158ba2..3ba5a95 100644
--- a/pages/Applforrefund/Applforrefund.vue
+++ b/pages/Applforrefund/Applforrefund.vue
@@ -54,6 +54,7 @@
 				order: {}, //订单
 				reasonlist: [], //退款原因list
 				dictname: '', //页面退款原因字段
+				timer:null,
 			}
 		},
 		methods: {
@@ -74,7 +75,10 @@
 								type: 'success',
 								duration: '1500'
 							})
-							setTimeout(e => {
+							if (this.timer) {
+								clearTimeout(this.timer)
+							}
+							this.timer = setTimeout(e => {
 								uni.navigateBack({
 									delta: 3
 								});
diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
index 48e67cb..2855fbd 100644
--- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
+++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
@@ -77,7 +77,7 @@
 			},
 			gofinished(item) {
 				uni.navigateTo({
-					url: `/pages/ServiceDetails/ServiceDetails?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}&orderNo=${item.orderNo}&orderStatus=${item.orderStatus}`
+					url: `/pages/ServiceDetails/ServiceDetails?orderNo=${item.orderNo}`
 				})
 			}
 		},
diff --git a/pages/Personal/Personal.vue b/pages/Personal/Personal.vue
index 1525926..1582dfe 100644
--- a/pages/Personal/Personal.vue
+++ b/pages/Personal/Personal.vue
@@ -54,11 +54,9 @@
 	.app {
 
 		.cards {
-			height: 82vh;
 			padding: 22px 0 20px 0;
 
 			.item {
-				height: 295rpx;
 
 				.title {
 					width: 80%;
diff --git a/pages/ServiceDetails/ServiceDetails.vue b/pages/ServiceDetails/ServiceDetails.vue
index 5f48029..8ea30f5 100644
--- a/pages/ServiceDetails/ServiceDetails.vue
+++ b/pages/ServiceDetails/ServiceDetails.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="app">
-		<view class="OrderStatus" v-if="orderStatus=='REFUNDED'||orderStatus=='CANCEL'">
+		<view class="OrderStatus" v-if="list.orderStatus=='REFUNDED'||list.orderStatus=='CANCEL'">
 			订单已关闭
 		</view>
 		<view class="content">
@@ -9,13 +9,13 @@
 			</view>
 			<view class="details">
 				<view class="detailslist">
-					<image :src="baseurl+nursestationlist.stationPictureUrl" mode=""></image>
+					<image :src="baseurl+list.stationPictureUrl" mode=""></image>
 					<view class="model">
 						<view class="top">
-							<view>{{nursestationlist.nurseStationName}}</view>
+							<view>{{list.nurseStationName}}</view>
 						</view>
 						<view class="bottom">
-							<view>{{nursestationlist.address}}</view>
+							<view>{{list.address}}</view>
 						</view>
 						<view class="callme" @tap="gophone()">
 							<u-icon class='icon' name="phone-fill" color="#ffffff" size="30"></u-icon>
@@ -29,38 +29,38 @@
 			<view class="name">
 				服务项目
 			</view>
-			<view class="drug">·{{orderlist.nurseItemName}} </view>
+			<view class="drug">·{{list.nurseItemName}} </view>
 		</view>
 		<view class="content">服务信息
-			<view class="contacts">·联系人：{{userinfo.patientName}}</view>
-			<view class="contacts">·电话:{{userinfo.phone}}</view>
-			<view class="contacts">·地址：{{userinfo.serviceAddress}}</view>
-			<view class="contacts">·时间：{{userinfo.serviceDate}}</view>
+			<view class="contacts">·联系人：{{list.patientName}}</view>
+			<view class="contacts">·电话:{{list.patientPhone}}</view>
+			<view class="contacts">·地址：{{list.serviceAddress}}</view>
+			<view class="contacts">·时间：{{list.serviceDate}}  {{list.serviceStartTime}}-{{list.serviceEndTime}}</view>
 		</view>
 		<view class="Package">套餐信息：
-			<span>￥{{orderlist.nurseItemPrice}}</span>
+			<span>￥{{list.nurseItemPrice}}</span>
 			<view class="detail">
-				·{{orderlist.nurseItemName}}
+				·{{list.nurseItemName}}
 			</view>
 		</view>
-		<view class="Consumablespackage" v-if='orderlist.itemConsumableList'>耗材包详情：
-			<span>￥{{orderlist.consumableTotalPrice}}</span>
-			<view class="detail" v-for='(item,index) in orderlist.itemConsumableList' :key="index">
-				·{{item.consumableDetail}}
+		<view class="Consumablespackage" v-if='list.itemConsumableList'>耗材包详情：
+			<span>￥{{list.consumableTotalPrice}}</span>
+			<view class="detail" v-for='(item,index) in list.itemConsumableList' :key="index">
+				·{{item.orderConsumableName}}
 			</view>
 		</view>
 		<view class="remarks">
 			<view>备注：</view>
-			<input placeholder="请输入" v-model='userinfo.remark'>
+			<input placeholder="请输入" v-model='list.remark'>
 		</view>
 		<view class="evaluate">
 			<view class="price">
-				￥{{orderlist.totalPrice}}
+				￥{{list.totalPrice}}
 			</view>
 			<view class="cancelorder" @tap="cancelorderment()"
-				v-if="orderStatus=='PAY'||orderStatus=='WAIT_DISPATCH'||orderStatus=='NOT_FINISH'">取消订单</view>
+				v-if="list.orderStatus=='PAY'||list.orderStatus=='WAIT_DISPATCH'||list.orderStatus=='NOT_FINISH'">取消订单</view>
 			<!-- <view class="cancelorder " style="background: #4C7BC9;">评价</view> -->
-			<view class="cancelorder" @tap='buy' style="background-color: darkorange;" v-if="orderStatus=='WAIT_PAY'">
+			<view class="cancelorder" @tap='buy' style="background-color: darkorange;" v-if="list.orderStatus=='WAIT_PAY'">
 				去支付
 			</view>
 		</view>
@@ -70,47 +70,38 @@
 <script>
 	import baseurl from '@/api/baseurl.js'
 	import {
-		getOrderPatientInfo,
-		getAppStationItemInfo,
-		introductionList,
-		cancellationOrder
+		getAppointmentDetailsInfo
 	} from '@/api/ServiceDetails/ServiceDetails.js'
 	export default {
 		data() {
 			return {
 				baseurl: '',
-				userinfo: [], //被护理人
-				orderlist: [], //获取耗材包详情
-				nursestationlist: [], // 护理站信息列表
-				stationId: '',
-				stationItemId: '',
-				stationItemPriceId: '',
+				list: {},
 				orderNo: '',
-				orderStatus: '',
 			}
 		},
 		onLoad(options) {
-			this.stationId = options.stationId
-			this.stationItemId = options.stationItemId
-			this.stationItemPriceId = options.stationItemPriceId
-			this.orderStatus = options.orderStatus
 			this.orderNo = options.orderNo
 			this.baseurl = baseurl
-			this.getinfo()
 			this.getlist()
-			this.getPatientInfo()
 		},
 		onShow() {
 
 		},
 		methods: {
+			getlist() {
+				getAppointmentDetailsInfo(this.orderNo).then(res => {
+					this.list = res.data
+					console.log(this.list)
+				})
+			},
 			//支付
 			buy() {
 				let obj = {
 					patientId: this.patientId,
-					orderNo: this.item.orderNo,
+					orderNo: this.orderNo,
 					orderChannel: "WECHAT_APPLET",
-					paymentPrice: this.item.totalPrice,
+					paymentPrice: this.totalPrice,
 					payType: "WECHAT_PAY",
 					buySource: "NURSE_STATION",
 				}
@@ -140,28 +131,9 @@
 					}
 				});
 			},
-			//被护理人信息
-			getinfo() {
-				getOrderPatientInfo(this.orderNo).then(res => {
-					this.userinfo = res.data;
-				})
-			},
-			// 护理站信息列表
-			getlist() {
-				introductionList(this.stationId).then(res => {
-					this.nursestationlist = res.data;
-					console.log(this.nursestationlist)
-				})
-			},
-			//获取耗材包详情
-			getPatientInfo() {
-				getAppStationItemInfo(this.stationId, this.stationItemId, this.stationItemPriceId).then(res => {
-					this.orderlist = res.data
-				})
-			},
 			cancelorderment() {
 				uni.navigateTo({
-					url: `/pages/cancelorder/cancelorder?nurseItemPrice=${this.orderlist.nurseItemPrice}&appointmentOrderId=${this.userinfo.appointmentOrderId}`
+					url: `/pages/cancelorder/cancelorder?totalPrice=${this.list.totalPrice}&orderId=${this.list.appointmentOrderId}`
 				})
 			},
 		}
diff --git a/pages/cancelorder/cancelorder.vue b/pages/cancelorder/cancelorder.vue
index 259dcdf..7f65ac7 100644
--- a/pages/cancelorder/cancelorder.vue
+++ b/pages/cancelorder/cancelorder.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="app">
 		<view class="content">退款金额
-			<span>￥{{nurseItemPrice}}</span>
+			<span>￥{{totalPrice}}</span>
 		</view>
 		<view class="reason">
 			<view class="ability">退款原因</view>
@@ -21,19 +21,19 @@
 	export default {
 		data() {
 			return {
-				nurseItemPrice: null,
-				appointmentOrderId: null,
+				timer:null,
+				totalPrice: null,
+				orderId: null,
 				cancelAppointmentReason: '',
 			}
 		},
 		onLoad(options) {
-			console.log(options)
-			this.appointmentOrderId = options.appointmentOrderId
-			this.nurseItemPrice = options.nurseItemPrice
+			this.orderId = options.orderId
+			this.totalPrice = options.totalPrice
 		},
 		methods: {
 			gocancel() {
-				cancellationOrder(this.appointmentOrderId, this.cancelAppointmentReason).then(res => {
+				cancellationOrder(this.orderId, this.cancelAppointmentReason).then(res => {
 					if (res.code == 500) {
 						this.$refs.uToast.show({
 							title: res.msg,
@@ -44,10 +44,13 @@
 							title: '取消成功',
 							type: 'success'
 						})
-						setTimeout(e => {
+						if (this.timer) {
+							clearTimeout(this.timer)
+						}
+						this.timer = setTimeout(e => {
 							uni.navigateBack({
-								delta: 2
-							});
+								delta: 1
+							})
 						}, 1500)
 					}
 				})
diff --git a/pages/disease/disease.vue b/pages/disease/disease.vue
index e273ec8..7bb27e3 100644
--- a/pages/disease/disease.vue
+++ b/pages/disease/disease.vue
@@ -2,13 +2,13 @@
 	<view class="app">
 		<view class="items">
 			<view class="item"
-				:style="disease.find(e => e.id == item.id)?'background-color: #4C7BC9;color: #ffffff;':''"
+				:style="disease.find(e => e.diseaseName == item.diseaseName)?'background-color: #4C7BC9;color: #ffffff;':''"
 				v-for='(item,index) in diseaselist' :key="index" @tap='choicedisease(item)'>
 				{{item.diseaseName}}
 			</view>
 			<view class="other">
 				<span>其他:</span>
-				<u-input type="text" placeholder='请填写' />
+				<u-input type="text" placeholder='请填写' v-model="diseaseother.diseaseName" />
 			</view>
 			<view class="btn" @tap='goinformation'>
 				提交
@@ -26,32 +26,43 @@
 			return {
 				diseaselist: [], //疾病列表
 				disease: [],
+				diseaseother: {
+					diseaseName: '',
+				},
 			};
 		},
 		methods: {
 			//选择疾病
 			choicedisease(item) {
-				if (this.disease.findIndex(e => e.id == item.id) == -1) {
+				if (this.disease.findIndex(e => e.diseaseName == item.diseaseName) == -1) {
 					this.disease.push(item)
 				} else {
-					this.disease = this.disease.filter(e => e.id != item.id)
-				}
-				if (this.disease.length > 1) {
-					this.disease = this.disease.filter(e => e.id != 9999)
+					this.disease = this.disease.filter(e => e.diseaseName != item.diseaseName)
 				}
+				// if (this.disease.length > 1) {
+				// 	this.disease = this.disease.filter(e => e.id != 9999)
+				// }
 			},
 			//获取疾病列表
 			diseaseinfo() {
-				getDiseaseInfo().then(res => {
-					this.diseaselist = res.data;
-					// this.diseaselist.unshift({
-					// 	id: 9999,
-					// 	diseaseName: '无'
-					// })
-				})
+				try {
+					const value = uni.getStorageSync('patientId');
+					if (value) {
+						getDiseaseInfo(value).then(res => {
+							this.diseaselist = res.data;
+							// this.diseaselist.unshift({
+							// 	id: 9999,
+							// 	diseaseName: '无'
+							// })
+						})
+					}
+				} catch (e) {}
 			},
 			//跳转回信息完善页面
 			goinformation() {
+				if (this.diseaseother.diseaseName != '' || this.diseaseother.diseaseName) {
+					this.disease.push(this.diseaseother)
+				}
 				uni.$emit('disease', {
 					disease: JSON.stringify(this.disease)
 				})
@@ -60,15 +71,16 @@
 				});
 			}
 		},
-		onLoad(options) { //开局方法和传参接受
+		onShow() { //开局方法
 			this.diseaseinfo()
-			//传参相等
+		},
+		onLoad(options) { //传参接受
 			this.disease = JSON.parse(options.diseaseInfoList)
-			console.log(JSON.parse(options.diseaseInfoList))
+			console.log(this.disease)
 		},
 	}
 </script>
 
 <style lang="scss">
- @import './disease.scss';
+	@import './disease.scss';
 </style>
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index 93ca38d..d5b8c94 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -72,7 +72,6 @@
 <style lang="scss">
 	.app {
 		.cards {
-			height: 82vh;
 			padding: 22px 0 20px 0;
 			.shopping {
 				background: #F58540;
diff --git a/pages/information/information.scss b/pages/information/information.scss
index daee498..cbfaa20 100644
--- a/pages/information/information.scss
+++ b/pages/information/information.scss
@@ -66,36 +66,43 @@
 				height: 120rpx;
 				line-height: 120rpx;
 				border-bottom: 1rpx solid #D8D4D4;
-				display: flex;
-
+				position: relative;
 				view {
+					position: absolute;
+					left:25%;
+					top:50%;
+					width: 75%;
+					transform: translateY(-50%);
+					display: inline-block;
 					height: 120rpx;
-					font-size: 30rpx;
 					line-height: 120rpx;
 				}
-
+				
 				span {
 					display: inline-block;
 					line-height: 120rpx;
 					height: 120rpx;
 					width: 25%;
-					font-size: 30rpx;
 				}
-
+				
 				::v-deep .u-input__input {
 					height: 120rpx;
 					font-size: 30rpx;
 				}
-
+				
 				::v-deep .uni-input-wrapper {
+					display: inline-block;
 					height: 120rpx;
 					line-height: 120rpx;
 				}
-
+				
 				::v-deep .u-input {
-					width: 70%;
 					height: 120rpx;
 					line-height: 120rpx;
+					position: absolute;
+					left:25%;
+					top:50%;
+					transform: translateY(-50%);
 				}
 			}
 
diff --git a/pages/information/information.vue b/pages/information/information.vue
index 5a79a57..40fdb01 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -5,15 +5,15 @@
 		<view class="userinfo info">
 			<view class="item">
 				<span>姓名:</span>
-				<u-input v-model="query.patientName" type="text" placeholder='' maxlength='5' />
+				<u-input :clearable='false' v-model="query.patientName" type="text" placeholder='' maxlength='5' />
 			</view>
 			<view class="item">
 				<span>电话:</span>
-				<u-input v-model="query.phone" maxlength='11' type="text" placeholder='' />
+				<u-input :clearable='false' v-model="query.phone" maxlength='11' type="text" placeholder='' />
 			</view>
 			<view class="item">
 				<span>身份证号:</span>
-				<u-input v-model="query.cardNo" type="text" placeholder='' maxlength='18' />
+				<u-input :clearable='false' v-model="query.cardNo" type="text" placeholder='' maxlength='18' />
 			</view>
 			<view class="item" @tap='areashow=true'>
 				<span>所属区域:</span>
@@ -21,11 +21,12 @@
 			</view>
 			<view class="item">
 				<span>详细地址:</span>
-				<u-input v-model="query.address" maxlength='40' type="text" placeholder='小区、单元、门牌号' />
+				<u-input :clearable='false' v-model="query.address" maxlength='40' type="text"
+					placeholder='小区、单元、门牌号' />
 			</view>
 			<view class="item" @tap='getAddress()'>
 				<span>所在位置:</span>
-				<view style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{chooseLocation}}</view>
+				<view style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{chooseLocation}}11</view>
 			</view>
 		</view>
 		<u-select v-model="areashow" mode="mutil-column-auto" label-name='areaName' value-name='areaCode'
@@ -63,6 +64,7 @@
 	export default {
 		data() {
 			return {
+				timer:null,
 				arealist: [], //区街道list
 				areashow: false, //经纬度开关
 				getNurseTypelist: [], //护理类型数组
@@ -84,27 +86,25 @@
 		methods: {
 			//提交信息
 			informationinfo() {
-				this.query.diseaseInfoList.forEach(e => {
-					e.diseaseId = e.id
-				})
 				information(this.query).then(res => {
 					if (res.code == 200) {
 						this.$refs.uToast.show({
 							title: '完善信息成功',
 							type: 'success',
-							url: '',
 							duration: '1500'
 						})
-						setTimeout(() => {
+						if (this.timer) {
+							clearTimeout(this.timer)
+						}
+						this.timer = setTimeout(e => {
 							uni.navigateBack({
-								delta: 1, //返回层数，2则上上页
+								delta: 1
 							})
-						}, 1500);
+						}, 1500)
 					} else if (res.code == 500) {
 						this.$refs.uToast.show({
 							title: res.msg,
 							type: 'error',
-							url: ''
 						})
 					}
 				})
@@ -178,7 +178,6 @@
 			} catch (e) {
 				// error
 			}
-
 			// uni.getStorage({
 			// 	key: 'patientId',
 			// 	success: function(res) {
diff --git a/pages/modify/modify.scss b/pages/modify/modify.scss
index bbdf422..cbd1212 100644
--- a/pages/modify/modify.scss
+++ b/pages/modify/modify.scss
@@ -1,7 +1,7 @@
 	.app {
+		padding-bottom: 50rpx;
 		background-color: #F4F5F7;
 		width: 100%;
-		height: 100%;
 		color: #000000;
 		.finish{
 			width: 25%;
diff --git a/pages/modify/modify.vue b/pages/modify/modify.vue
index 7053145..8c962b0 100644
--- a/pages/modify/modify.vue
+++ b/pages/modify/modify.vue
@@ -8,15 +8,15 @@
 			</view>
 			<view class="item">
 				<span>姓名:</span>
-				<u-input v-model="appPersonallist.patientName" placeholder="请输入" type="text" maxlength='5' />
+				<u-input :clearable='false' v-model="appPersonallist.patientName" placeholder="请输入" type="text" maxlength='5' />
 			</view>
 			<view class="item">
 				<span>电话:</span>
-				<u-input v-model="appPersonallist.phone" placeholder="请输入" maxlength='11' type="text" />
+				<u-input :clearable='false' v-model="appPersonallist.phone" placeholder="请输入" maxlength='11' type="text" />
 			</view>
 			<view class="item">
 				<span>身份证号:</span>
-				<u-input v-model="appPersonallist.cardNo" placeholder="请输入" type="text" maxlength='18' />
+				<u-input :clearable='false' v-model="appPersonallist.cardNo" placeholder="请输入" type="text" maxlength='18' />
 			</view>
 			<view class="item" @tap='areashow=true'>
 				<span>所属区域:</span>
@@ -24,7 +24,7 @@
 			</view>
 			<view class="item">
 				<span>详细地址:</span>
-				<u-input v-model="appPersonallist.address" type="text" placeholder='小区、单元、门牌号' />
+				<u-input :clearable='false' v-model="appPersonallist.address" type="text" placeholder='小区、单元、门牌号' />
 			</view>
 			<view class="item" @tap='getAddress()'>
 				<span>所在位置:</span>
@@ -57,6 +57,7 @@
 	export default {
 		data() {
 			return {
+				timer:null,
 				baseurl: '',
 				address: '',
 				arealist: [],
@@ -120,7 +121,10 @@
 										type: 'success',
 										duration: '1500'
 									})
-									setTimeout(e => {
+									if (that.timer) {
+										clearTimeout(that.timer)
+									}
+									that.timer = setTimeout(e => {
 										uni.navigateBack({
 											delta: 1
 										})
@@ -144,7 +148,10 @@
 								type: 'success',
 								duration: '1500'
 							})
-							setTimeout(e => {
+							if (that.timer) {
+								clearTimeout(that.timer)
+							}
+							that.timer = setTimeout(e => {
 								uni.navigateBack({
 									delta: 1
 								})
@@ -221,12 +228,8 @@
 		onShow() {
 			let that = this
 			uni.$on('disease', function(data) {
-				console.log(data)
 				that.patientDiseaseInfoList = JSON.parse(data.disease)
-				that.patientDiseaseInfoList.forEach(e => {
-					e.diseaseId = e.id
-				})
-				// console.log(that.patientDiseaseInfoList)
+				console.log(that.patientDiseaseInfoList)
 			})
 		}
 	}
diff --git a/pages/modifyAddress/modifyAddress.vue b/pages/modifyAddress/modifyAddress.vue
index 372ce1f..a8bb1e4 100644
--- a/pages/modifyAddress/modifyAddress.vue
+++ b/pages/modifyAddress/modifyAddress.vue
@@ -219,7 +219,6 @@
 								uni.showToast({
 									title: '删除成功',
 									duration: 1500,
-
 								});
 								setTimeout(e => {
 									that.goodsList()
@@ -227,7 +226,6 @@
 								that.delshow = false;
 							})
 						} else if (res.cancel) {
-							console.log('用户点击取消');
 						}
 					}
 				});
diff --git a/pages/site/site.scss b/pages/site/site.scss
index 804dfde..23ef9f0 100644
--- a/pages/site/site.scss
+++ b/pages/site/site.scss
@@ -35,6 +35,13 @@
 				position: absolute;
 				top: 15%;
 				left: 35%;
+					text-overflow: -o-ellipsis-lastline;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					line-clamp: 2;
+					-webkit-box-orient: vertical;
 			}
 
 			.distance {
diff --git a/pages/site/site.vue b/pages/site/site.vue
index 4aa3ca8..59f98f8 100644
--- a/pages/site/site.vue
+++ b/pages/site/site.vue
@@ -154,6 +154,9 @@
 			this.pageNum = 1;
 			nearbyList(this.pageSize, this.pageNum, this.longitude, this.latitude, this.nurseTypeCode, this.iptVal)
 				.then(res => {
+					res.rows.forEach(e => {
+						e.stationPictureUrl = baseurl + e.stationPictureUrl
+					})
 					this.nursestationlist = res.rows
 				})
 			setTimeout(function() {
diff --git a/pages/startup/startup.vue b/pages/startup/startup.vue
index 9ee8c30..631ffcd 100644
--- a/pages/startup/startup.vue
+++ b/pages/startup/startup.vue
@@ -61,6 +61,9 @@
 </script>
 
 <style lang="scss">
+	.app{
+		height: 100vh;
+	}
 	image {
 		width: 50%;
 		height: 200rpx;
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 8a0399e..eff485a 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -92,6 +92,7 @@
 			</view>
 			<image src="../../static/jiantou.png" mode=""></image>
 		</view> -->
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
@@ -111,21 +112,35 @@
 			this.baseurl = baseurl
 			this.myInfo()
 		},
-		onLoad(options) {
-			//获取传值
-		},
+		onLoad(options) {}, //获取传值
 		methods: {
 			//退出
 			remove() {
-				try {
-					uni.removeStorageSync('patientId');
-
-					uni.reLaunch({
-						url: '/pages/login/login'
-					})
-				} catch (e) {
-					// error
-				}
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '确认要退出此账号吗',
+					success: function(res) {
+						if (res.confirm) {
+							try {
+								uni.removeStorageSync('patientId');
+								const value = uni.getStorageSync('patientId');
+								if (value) {} else {
+									this.$refs.uToast.show({
+										title: '退出账号成功',
+										type: 'success',
+										duration: '1000'
+									})
+									setTimeout(e => {
+										uni.reLaunch({
+											url: '/pages/login/login'
+										})
+									}, 1000)
+								}
+							} catch (e) {}
+						} else if (res.cancel) {}
+					}
+				});
 			},
 			//获取个人信息
 			myInfo() {