From a5ef4e8e7f8020843d45242626d29ab31b976308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Thu, 9 Mar 2023 16:07:29 +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/Aftersalesdetails/Aftersalesdetails.vue |  12 +-
 pages/CommodityDetails/CommodityDetails.vue   | 296 ++++++++----------
 pages/CommodityOrder/CommodityOrder.vue       |  44 ++-
 .../Informationconfirmation.vue               |   3 +-
 .../Nursingstationserviceorder.vue            |  52 ++-
 pages/ProjectDetails/ProjectDetails.vue       |  64 ++--
 pages/ServiceDetails/ServiceDetails.vue       |  14 +-
 pages/appointmenttime/appointmenttime.vue     |  30 +-
 pages/classification/classification.vue       |  22 +-
 pages/confirmOrder/confirmOrder.vue           |  10 +-
 pages/disease/disease.vue                     |  14 +-
 pages/goodsorderRate/goodsorderRate.vue       |  20 +-
 pages/information/information.vue             |  66 ++--
 pages/integral/integral.vue                   |  12 +-
 pages/medicine/medicine.scss                  |  45 +++
 pages/medicine/medicine.vue                   |  59 +++-
 pages/menttimeorder/menttimeorder.vue         |  20 +-
 pages/modify/modify.vue                       |   1 -
 pages/modifyAddress/modifyAddress.vue         |  54 ++--
 pages/nursestation/nursestation.vue           |  63 ++--
 pages/orderDetails/orderDetails.vue           |  14 +-
 pages/payorderDetails/payorderDetails.vue     |  20 +-
 22 files changed, 458 insertions(+), 477 deletions(-)

diff --git a/pages/Aftersalesdetails/Aftersalesdetails.vue b/pages/Aftersalesdetails/Aftersalesdetails.vue
index 4edc27a..fbb2c53 100644
--- a/pages/Aftersalesdetails/Aftersalesdetails.vue
+++ b/pages/Aftersalesdetails/Aftersalesdetails.vue
@@ -67,13 +67,11 @@
 			this.goodsOrderId = options.goodsOrderId
 			this.baseurl = baseurl
 			let that = this
-			try {
-				const value = uni.getStorageSync('patientId');
-				if (value) {
-					that.patientId = value
-					that.goodsOrderinfo();
-				}
-			} catch (e) {}
+			const value = uni.getStorageSync('patientId');
+			if (value) {
+				that.patientId = value
+				that.goodsOrderinfo();
+			}
 		}
 	}
 </script>
diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue
index 2befc57..a21fbc6 100644
--- a/pages/CommodityDetails/CommodityDetails.vue
+++ b/pages/CommodityDetails/CommodityDetails.vue
@@ -277,7 +277,6 @@
 	export default {
 		data() {
 			return {
-				timer: null,
 				goodsInfoId: null, //商品id
 				baseurl: '', //url
 				image: null, //总图片
@@ -406,166 +405,150 @@
 			//立即购买跳转确认订单页面
 			tapbuy() {
 				var that = this
-				try {
-					const value = uni.getStorageSync('openid');
-					const value2 = uni.getStorageSync('patientId');
-					if (value && value2) {
-						that.updata.patientId = value2
-						AppIdentification(value2).then(res => {
-							if (res.code == 200) {
-								if (res.data.loginFlag) {
-									if (this.goodshow == true) {
-										if (this.updata.goodsAttributeName == '') {
-											that.$refs.uToast.show({
-												title: '未选择商品',
-												type: 'error'
-											})
-										} else if (this.updata.goodsStock == 0) {
-											that.$refs.uToast.show({
-												title: '库存数量不足,无法购买',
-												type: 'error'
-											})
-										} else {
-											this.updata.goodsPrice = Number(this.updata.goodsPrice)
-											this.buyshow = false
-											this.updata.totalPrice = Number((this.updata.goodsPrice *
-												this.updata.goodsCount).toFixed(
-												2))
-											this.updata.originalTotalPrice = this.updata.totalPrice
-											if (this.couponId) {
-												this.updata.couponId = this.couponId
-												this.updata.couponTitle = this.coupon.couponTitle
-												this.updata.discountPrice = Number(this.coupon.couponPrice)
-												this.updata.couponConsumePrice = Number(this.coupon
-													.couponConsumePrice)
-												this.updata.totalPrice = Number((this.updata.originalTotalPrice -
-													this.updata.discountPrice).toFixed(2))
-											}
-											if (this.updata.totalPrice > 0) {
-												addStationGoodsOrder(this.updata).then(res => {
-													if (res.code == 500) {
-														that.$refs.uToast.show({
-															title: res.msg,
-															type: 'error'
-														})
-													} else {
-														let id = res.data.id
-														let paydata = res.data
-														paydata.openid = value
-														paydata.payType = "WECHAT_PAY"
-														paydata.paymentPrice = res.data.totalPrice
-														appletGoodsOrderPay(paydata).then(response => {
-															if (response.code == 200) {
-																uni.requestPayment({
-																	timeStamp: response
-																		.data.timeStamp,
-																	nonceStr: response.data
-																		.nonceStr,
-																	package: response.data
-																		.prepayId,
-																	signType: response.data
-																		.signType,
-																	paySign: response.data
-																		.paySign,
-																	success: function(
-																		res) {
-																		that.goodsDetailsinfo(
-																			that
-																			.goodsInfoId,
-																			that
-																			.updata
-																			.patientId
-																		)
-																		that.$refs
-																			.uToast
-																			.show({
-																				title: '支付成功',
-																				type: 'success',
-																				duration: 1000,
-																				url: '/pages/paysuccess/paysuccess'
-																			})
-																	},
-																	fail: function(err) {
-																		that.goodsDetailsinfo(
-																			that
-																			.goodsInfoId,
-																			that
-																			.updata
-																			.patientId
-																		)
-																		that.$refs
-																			.uToast
-																			.show({
-																				title: '取消支付',
-																				type: 'error',
-																				duration: 1000,
-																				url: `/pages/payorderDetails/payorderDetails?goodsOrderId=${id}`
-																			})
-																		// uni.navigateTo({
-																		// 	url: `/pages/payorderDetails/payorderDetails?goodsOrderId=${id}`
-																		// })
-																	}
-																});
-															} else {
-																that.$refs.uToast.show({
-																	title: response.msg,
-																	type: 'error',
-																	duration: 1000
-																})
-															}
-														})
-													}
-												})
-											} else {
-												that.$refs.uToast.show({
-													title: '订单金额为0,无法下单',
-													type: 'error'
-												})
-											}
-										}
-									} else {
+				const value = uni.getStorageSync('openid');
+				const value2 = uni.getStorageSync('patientId');
+				if (value && value2) {
+					that.updata.patientId = value2
+					AppIdentification(value2).then(res => {
+						if (res.code == 200) {
+							if (res.data.loginFlag) {
+								if (this.goodshow == true) {
+									if (this.updata.goodsAttributeName == '') {
 										that.$refs.uToast.show({
 											title: '未选择商品',
 											type: 'error'
 										})
-										// that.buyshow = false
-										// uni.navigateTo({
-										// 	url: `/pages/confirmOrder/confirmOrder?updata=${JSON.stringify(that.updata)}`
-										// })
+									} else if (this.updata.goodsStock == 0) {
+										that.$refs.uToast.show({
+											title: '库存数量不足,无法购买',
+											type: 'error'
+										})
+									} else {
+										this.updata.goodsPrice = Number(this.updata.goodsPrice)
+										this.buyshow = false
+										this.updata.totalPrice = Number((this.updata.goodsPrice *
+											this.updata.goodsCount).toFixed(
+											2))
+										this.updata.originalTotalPrice = this.updata.totalPrice
+										if (this.couponId) {
+											this.updata.couponId = this.couponId
+											this.updata.couponTitle = this.coupon.couponTitle
+											this.updata.discountPrice = Number(this.coupon.couponPrice)
+											this.updata.couponConsumePrice = Number(this.coupon
+												.couponConsumePrice)
+											this.updata.totalPrice = Number((this.updata.originalTotalPrice -
+												this.updata.discountPrice).toFixed(2))
+										}
+										if (this.updata.totalPrice > 0) {
+											addStationGoodsOrder(this.updata).then(res => {
+												if (res.code == 500) {
+													that.$refs.uToast.show({
+														title: res.msg,
+														type: 'error'
+													})
+												} else {
+													let id = res.data.id
+													let paydata = res.data
+													paydata.openid = value
+													paydata.payType = "WECHAT_PAY"
+													paydata.paymentPrice = res.data.totalPrice
+													appletGoodsOrderPay(paydata).then(response => {
+														if (response.code == 200) {
+															uni.requestPayment({
+																timeStamp: response
+																	.data.timeStamp,
+																nonceStr: response.data
+																	.nonceStr,
+																package: response.data
+																	.prepayId,
+																signType: response.data
+																	.signType,
+																paySign: response.data
+																	.paySign,
+																success: function(
+																	res) {
+																	that.goodsDetailsinfo(
+																		that
+																		.goodsInfoId,
+																		that
+																		.updata
+																		.patientId
+																	)
+																	that.$refs
+																		.uToast
+																		.show({
+																			title: '支付成功',
+																			type: 'success',
+																			duration: 1000,
+																			url: '/pages/paysuccess/paysuccess'
+																		})
+																},
+																fail: function(err) {
+																	that.goodsDetailsinfo(
+																		that
+																		.goodsInfoId,
+																		that
+																		.updata
+																		.patientId
+																	)
+																	that.$refs
+																		.uToast
+																		.show({
+																			title: '取消支付',
+																			type: 'error',
+																			duration: 1000,
+																			url: `/pages/payorderDetails/payorderDetails?goodsOrderId=${id}`
+																		})
+																	// uni.navigateTo({
+																	// 	url: `/pages/payorderDetails/payorderDetails?goodsOrderId=${id}`
+																	// })
+																}
+															});
+														} else {
+															that.$refs.uToast.show({
+																title: response.msg,
+																type: 'error',
+																duration: 1000
+															})
+														}
+													})
+												}
+											})
+										} else {
+											that.$refs.uToast.show({
+												title: '订单金额为0,无法下单',
+												type: 'error'
+											})
+										}
 									}
 								} else {
-									this.usershow = true
-								}
-							} else if (res.code == 9999) {} else {
-								that.$refs.uToast.show({
-									title: res.msg,
-									type: 'error'
-								})
-								if (that.timer) {
-									clearTimeout(that.timer)
-								}
-								that.timer = setTimeout(e => {
-									uni.navigateTo({
-										url: '/pages/login/login'
+									that.$refs.uToast.show({
+										title: '未选择商品',
+										type: 'error'
 									})
-								}, 1500)
+									// that.buyshow = false
+									// uni.navigateTo({
+									// 	url: `/pages/confirmOrder/confirmOrder?updata=${JSON.stringify(that.updata)}`
+									// })
+								}
+							} else {
+								this.usershow = true
 							}
-						})
-					} else {
-						that.$refs.uToast.show({
-							title: '未登录,请先登录',
-							type: 'error'
-						})
-						if (that.timer) {
-							clearTimeout(that.timer)
-						}
-						that.timer = setTimeout(e => {
-							uni.navigateTo({
+						} else if (res.code == 9999) {} else {
+							that.$refs.uToast.show({
+								title: res.msg,
+								type: 'error',
 								url: '/pages/login/login'
 							})
-						}, 1500)
-					}
-				} catch (e) {}
+						}
+					})
+				} else {
+					that.$refs.uToast.show({
+						title: '未登录,请先登录',
+						type: 'error',
+						url: '/pages/login/login'
+					})
+				}
 			},
 			//选择商品
 			isActivegoods(item) {
@@ -736,16 +719,9 @@
 					} else {
 						this.$refs.uToast.show({
 							title: '未登录,请先登录',
-							type: 'error'
+							type: 'error',
+							url: '/pages/login/login'
 						})
-						if (this.timer) {
-							clearTimeout(this.timer)
-						}
-						this.timer = setTimeout(e => {
-							uni.navigateTo({
-								url: '/pages/login/login'
-							})
-						}, 1500)
 					}
 				}
 			},
diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue
index c56dd29..dd8a183 100644
--- a/pages/CommodityOrder/CommodityOrder.vue
+++ b/pages/CommodityOrder/CommodityOrder.vue
@@ -272,32 +272,30 @@
 		},
 		onLoad(options) { //开局调用
 			let that = this
-			try {
-				const value = uni.getStorageSync('patientId');
-				const value2 = uni.getStorageSync('openid');
-				if (value && value2) {
-					that.patientId = value
-					that.openid = value2
-					if (options.orderStatus) {
-						that.orderStatus = options.orderStatus
-						if (options.orderStatus == 'WAIT_PAY') {
-							that.title = '待付款'
-							that.goodsOrderinfo();
-						} else if (options.orderStatus == 'WAIT_RECEIVED_GOODS') {
-							that.title = '待收货'
-							that.goodsOrderinfo();
-						} else if (options.orderStatus == 'RECEIVED_GOODS') {
-							that.title = '待评价'
-							that.goodsOrderinfo();
-						} else if (options.orderStatus == 'EVALUATED') {
-							that.title = '已完成'
-							that.goodsOrderinfo();
-						}
-					} else {
+			const value = uni.getStorageSync('patientId');
+			const value2 = uni.getStorageSync('openid');
+			if (value && value2) {
+				that.patientId = value
+				that.openid = value2
+				if (options.orderStatus) {
+					that.orderStatus = options.orderStatus
+					if (options.orderStatus == 'WAIT_PAY') {
+						that.title = '待付款'
+						that.goodsOrderinfo();
+					} else if (options.orderStatus == 'WAIT_RECEIVED_GOODS') {
+						that.title = '待收货'
+						that.goodsOrderinfo();
+					} else if (options.orderStatus == 'RECEIVED_GOODS') {
+						that.title = '待评价'
+						that.goodsOrderinfo();
+					} else if (options.orderStatus == 'EVALUATED') {
+						that.title = '已完成'
 						that.goodsOrderinfo();
 					}
+				} else {
+					that.goodsOrderinfo();
 				}
-			} catch (e) {}
+			}
 		},
 		onReachBottom() { //下滑加载
 			if (this.orderlist.length >= this.total) {} else {
diff --git a/pages/Informationconfirmation/Informationconfirmation.vue b/pages/Informationconfirmation/Informationconfirmation.vue
index e91ed8e..fd54a56 100644
--- a/pages/Informationconfirmation/Informationconfirmation.vue
+++ b/pages/Informationconfirmation/Informationconfirmation.vue
@@ -79,10 +79,11 @@
 				})
 			},
 		},
+		onShow() {},
 		onLoad(options) {
+			var that = this
 			this.updata.totalPrice = Number(options.price)
 			this.updata.hospitalPersonId = Number(options.hospitalPersonId)
-			var that = this
 			const value = uni.getStorageSync('patientId');
 			if (value) {
 				that.updata.patientId = value
diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
index ce72b81..236ddb9 100644
--- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
+++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
@@ -109,40 +109,33 @@
 				pageSize: 15,
 				list: [],
 				orderNo: null,
-				timer: null,
 			}
 		},
 		onShow() {
 			let that = this
 			this.baseurl = baseurl
 			this.pageNum = 1;
-			try {
-				const value3 = uni.getStorageSync('Refresh');
-				if (value3) {
-					that.getinfo();
-				}
-			} catch (e) {}
-			try {
-				const value = uni.getStorageSync('openid');
-				if (value) {} else {
-					uni.navigateTo({
-						url: '/pages/login/login'
-					})
-				}
-			} catch (e) {}
+			const value3 = uni.getStorageSync('Refresh');
+			if (value3) {
+				that.getinfo();
+			}
+			const value = uni.getStorageSync('openid');
+			if (value) {} else {
+				uni.navigateTo({
+					url: '/pages/login/login'
+				})
+			}
 		},
 		onLoad() {
 			let that = this
 			this.pageNum = 1
-			try {
-				const value = uni.getStorageSync('patientId');
-				const value2 = uni.getStorageSync('openid');
-				if (value && value2) {
-					that.patientId = value
-					that.openid = value2
-					that.getinfo()
-				}
-			} catch (e) {}
+			const value = uni.getStorageSync('patientId');
+			const value2 = uni.getStorageSync('openid');
+			if (value && value2) {
+				that.patientId = value
+				that.openid = value2
+				that.getinfo()
+			}
 		},
 		methods: {
 			//查看评价
@@ -175,16 +168,9 @@
 						this.$refs.uToast.show({
 							title: '评价成功',
 							type: 'success',
-							duration: '1500'
+							duration: '1500',
+							url: '/pages/ratesuccess/ratesuccess'
 						})
-						if (this.timer) {
-							clearTimeout(this.timer)
-						}
-						this.timer = setTimeout(e => {
-							uni.navigateTo({
-								url: `/pages/ratesuccess/ratesuccess`
-							})
-						}, 1500)
 					}
 				})
 			},
diff --git a/pages/ProjectDetails/ProjectDetails.vue b/pages/ProjectDetails/ProjectDetails.vue
index 83dad46..344cedc 100644
--- a/pages/ProjectDetails/ProjectDetails.vue
+++ b/pages/ProjectDetails/ProjectDetails.vue
@@ -135,53 +135,31 @@
 			//预约
 			goappointments() {
 				let that = this
-				try {
-					const value = uni.getStorageSync('openid');
-					const value2 = uni.getStorageSync('patientId');
-					if (value && value2) {
-						AppIdentification(value2).then(res => {
-							if (res.code == 200) {
-								if (res.data.loginFlag) {
-									that.usershow = false
-									uni.navigateTo({
-										url: `/pages/appointmenttime/appointmenttime?stationId=${this.stationId}&stationItemId=${this.stationItemId}&stationItemPriceId=${this.stationItemPriceId}`,
-									})
-								} else {
-									that.usershow = true
-								}
-							} else if (res.code == 9999) {
-
-							} else {
-								that.$refs.uToast.show({
-									title: res.msg,
-									type: 'error'
+				const value = uni.getStorageSync('openid');
+				const value2 = uni.getStorageSync('patientId');
+				if (value && value2) {
+					AppIdentification(value2).then(res => {
+						if (res.code == 200) {
+							if (res.data.loginFlag) {
+								that.usershow = false
+								uni.navigateTo({
+									url: `/pages/appointmenttime/appointmenttime?stationId=${this.stationId}&stationItemId=${this.stationItemId}&stationItemPriceId=${this.stationItemPriceId}`,
 								})
-								if (that.timer) {
-									clearTimeout(that.timer)
-								}
-								that.timer = setTimeout(e => {
-									uni.navigateTo({
-										url: '/pages/login/login'
-									})
-								}, 1500)
+							} else {
+								that.usershow = true
 							}
-						})
-					} else {
-						that.$refs.uToast.show({
-							title: '未登录,请先登录',
-							type: 'error'
-						})
-						if (that.timer) {
-							clearTimeout(that.timer)
-						}
-						that.timer = setTimeout(e => {
-							uni.navigateTo({
+						} else if (res.code == 9999) {} else {
+							that.$refs.uToast.show({
+								title: res.msg,
+								type: 'error',
 								url: '/pages/login/login'
 							})
-						}, 1500)
-					}
-				} catch (e) {
-					uni.navigateTo({
+						}
+					})
+				} else {
+					that.$refs.uToast.show({
+						title: '未登录,请先登录',
+						type: 'error',
 						url: '/pages/login/login'
 					})
 				}
diff --git a/pages/ServiceDetails/ServiceDetails.vue b/pages/ServiceDetails/ServiceDetails.vue
index 27be067..246958d 100644
--- a/pages/ServiceDetails/ServiceDetails.vue
+++ b/pages/ServiceDetails/ServiceDetails.vue
@@ -151,14 +151,12 @@
 			this.baseurl = baseurl
 			this.orderNo = options.orderNo
 			var that = this
-			try {
-				const value = uni.getStorageSync('patientId');
-				const value2 = uni.getStorageSync('openid');
-				if (value && value2) {
-					that.patientId = value
-					that.openid = value2
-				}
-			} catch (e) {}
+			const value = uni.getStorageSync('patientId');
+			const value2 = uni.getStorageSync('openid');
+			if (value && value2) {
+				that.patientId = value
+				that.openid = value2
+			}
 			this.getlist()
 		},
 		methods: {
diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue
index 8a3d621..8c43ebe 100644
--- a/pages/appointmenttime/appointmenttime.vue
+++ b/pages/appointmenttime/appointmenttime.vue
@@ -176,12 +176,10 @@
 		},
 		onLoad(options) {
 			var that = this
-			try {
-				const value = uni.getStorageSync('openid');
-				if (value) {
-					that.openid = value
-				}
-			} catch (e) {}
+			const value = uni.getStorageSync('openid');
+			if (value) {
+				that.openid = value
+			}
 			//耗材包详情方法调用
 			this.getPatientInfo(options.stationId, options.stationItemId, options.stationItemPriceId)
 			this.userinfo();
@@ -205,17 +203,15 @@
 			userinfo() {
 				//取出patientId
 				var that = this
-				try {
-					const value = uni.getStorageSync('patientId');
-					if (value) {
-						that.patientId = value
-						//被护理人信息
-						getAppPatientList(that.patientId).then(response => {
-							that.personInfo = response.data
-							that.personInfo.address = response.data.areaName + response.data.address
-						})
-					}
-				} catch (e) {}
+				const value = uni.getStorageSync('patientId');
+				if (value) {
+					that.patientId = value
+					//被护理人信息
+					getAppPatientList(that.patientId).then(response => {
+						that.personInfo = response.data
+						that.personInfo.address = response.data.areaName + response.data.address
+					})
+				}
 			},
 			timechange(index) {
 				this.orderlist.serviceDate = this.orderlist.appointmentTimeList[index].date
diff --git a/pages/classification/classification.vue b/pages/classification/classification.vue
index 849b64f..ea79309 100644
--- a/pages/classification/classification.vue
+++ b/pages/classification/classification.vue
@@ -103,18 +103,16 @@
 		},
 		onShow() {
 			var that = this
-			try {
-				const value = uni.getStorageSync('openid');
-				const value3 = uni.getStorageSync('Refresh');
-				if (value) {} else {
-					uni.navigateTo({
-						url: '/pages/login/login'
-					})
-				}
-				if (value3) {
-					that.goodsListinfo();
-				}
-			} catch (e) {}
+			const value = uni.getStorageSync('openid');
+			const value3 = uni.getStorageSync('Refresh');
+			if (value) {} else {
+				uni.navigateTo({
+					url: '/pages/login/login'
+				})
+			}
+			if (value3) {
+				that.goodsListinfo();
+			}
 		},
 		onLoad(options) { //获取传值
 			this.goodsCategoryId = options.goodsCategoryId //请求id
diff --git a/pages/confirmOrder/confirmOrder.vue b/pages/confirmOrder/confirmOrder.vue
index 6e19aff..b6e729a 100644
--- a/pages/confirmOrder/confirmOrder.vue
+++ b/pages/confirmOrder/confirmOrder.vue
@@ -189,12 +189,10 @@
 		},
 		onShow() {
 			var that = this
-			try {
-				const value = uni.getStorageSync('openid');
-				if (value) {
-					that.openid = value
-				} else {}
-			} catch (e) {}
+			const value = uni.getStorageSync('openid');
+			if (value) {
+				that.openid = value
+			} else {}
 			let useritem = null
 			uni.$on('updata', function(data) {
 				that.updata = JSON.parse(data.updata)
diff --git a/pages/disease/disease.vue b/pages/disease/disease.vue
index ab96af7..9ed914d 100644
--- a/pages/disease/disease.vue
+++ b/pages/disease/disease.vue
@@ -45,14 +45,12 @@
 			},
 			//获取疾病列表
 			diseaseinfo() {
-				try {
-					const value = uni.getStorageSync('patientId');
-					if (value) {
-						getDiseaseInfo(value).then(res => {
-							this.diseaselist = res.data;
-						})
-					}
-				} catch (e) {}
+				const value = uni.getStorageSync('patientId');
+				if (value) {
+					getDiseaseInfo(value).then(res => {
+						this.diseaselist = res.data;
+					})
+				}
 			},
 			//跳转回信息完善页面
 			goinformation() {
diff --git a/pages/goodsorderRate/goodsorderRate.vue b/pages/goodsorderRate/goodsorderRate.vue
index 6c16985..7197507 100644
--- a/pages/goodsorderRate/goodsorderRate.vue
+++ b/pages/goodsorderRate/goodsorderRate.vue
@@ -142,18 +142,14 @@
 		onShow() {
 			this.baseurl = baseurl
 			var that = this
-			try {
-				const value = uni.getStorageSync('openid');
-				if (value) {
-					that.openid = value
-				} else {}
-			} catch (e) {}
-			try {
-				const value = uni.getStorageSync('patientId');
-				if (value) {
-					that.patientId = value
-				} else {}
-			} catch (e) {}
+			const value = uni.getStorageSync('openid');
+			if (value) {
+				that.openid = value
+			} else {}
+			const value2 = uni.getStorageSync('patientId');
+			if (value2) {
+				that.patientId = value2
+			} else {}
 		},
 	}
 </script>
diff --git a/pages/information/information.vue b/pages/information/information.vue
index 57bdf42..e2e9d12 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -192,42 +192,40 @@
 				}
 				if (this.addresslength) {
 					if (this.addresslength.length > 2) {
-						try {
-							const value = uni.getStorageSync('phone');
-							if (value) {
-								that.query.phone = value
-								if (that.radio == 1) {
-									that.$refs.uToast.show({
-										title: '请审核并同意用户协议',
-										type: 'error'
-									})
-								} else {
-									information(that.query).then(res => {
-										if (res.code == 200) {
-											uni.removeStorageSync('invitationPatientId');
-											that.$refs.uToast.show({
-												title: '完善信息成功',
-												type: 'success',
-												duration: '1500'
-											})
-											if (that.timer) {
-												clearTimeout(that.timer)
-											}
-											that.timer = setTimeout(e => {
-												uni.navigateBack({
-													delta: 1
-												})
-											}, 1500)
-										} else if (res.code == 500) {
-											that.$refs.uToast.show({
-												title: res.msg,
-												type: 'error',
-											})
+						const value = uni.getStorageSync('phone');
+						if (value) {
+							that.query.phone = value
+							if (that.radio == 1) {
+								that.$refs.uToast.show({
+									title: '请审核并同意用户协议',
+									type: 'error'
+								})
+							} else {
+								information(that.query).then(res => {
+									if (res.code == 200) {
+										uni.removeStorageSync('invitationPatientId');
+										that.$refs.uToast.show({
+											title: '完善信息成功',
+											type: 'success',
+											duration: '1500'
+										})
+										if (that.timer) {
+											clearTimeout(that.timer)
 										}
-									})
-								}
+										that.timer = setTimeout(e => {
+											uni.navigateBack({
+												delta: 1
+											})
+										}, 1500)
+									} else if (res.code == 500) {
+										that.$refs.uToast.show({
+											title: res.msg,
+											type: 'error',
+										})
+									}
+								})
 							}
-						} catch (e) {}
+						}
 					} else {
 						that.$refs.uToast.show({
 							title: '所属区域应选择所在的区或街道,请重新选择!',
diff --git a/pages/integral/integral.vue b/pages/integral/integral.vue
index 18c09b5..9064a14 100644
--- a/pages/integral/integral.vue
+++ b/pages/integral/integral.vue
@@ -204,6 +204,7 @@
 		},
 		data() {
 			return {
+				timer: null,
 				baseurl: '',
 				patientId: null,
 				integral: 0,
@@ -508,16 +509,9 @@
 					} else {
 						this.$refs.uToast.show({
 							title: '未登录,请先登录',
-							type: 'error'
+							type: 'error',
+							url: '/pages/login/login'
 						})
-						if (this.timer) {
-							clearTimeout(this.timer)
-						}
-						this.timer = setTimeout(e => {
-							uni.navigateTo({
-								url: '/pages/login/login'
-							})
-						}, 1500)
 					}
 				}
 			},
diff --git a/pages/medicine/medicine.scss b/pages/medicine/medicine.scss
index 553de60..4cba9d8 100644
--- a/pages/medicine/medicine.scss
+++ b/pages/medicine/medicine.scss
@@ -1,6 +1,51 @@
 .app{
 	padding: 0%;
 	margin-top: 381rpx;
+	.mask {
+		.information {
+			width: 70%;
+			height: 400rpx;
+			margin: 50% auto;
+			background: #FFFFFF;
+			border-radius: 30rpx;
+			text-align: center;
+			color: #FFFFFF;
+			position: relative;
+	
+			.determine,
+			.cancel {
+				width: 200rpx;
+				height: 70rpx;
+				border-radius: 26rpx;
+				font-size: 34rpx;
+				line-height: 70rpx;
+				position: absolute;
+				top: 74%;
+			}
+	
+			.determine {
+				background: #4C7BC9;
+				right: 36rpx;
+			}
+	
+			.cancel {
+				background: #C5BFBF;
+				left: 36rpx;
+			}
+	
+			.title {
+				font-size: 42rpx;
+				margin-top: 40rpx;
+				color: #000000;
+			}
+	
+			image {
+				width: 100rpx;
+				height: 100rpx;
+				margin: 10% 0 0 0;
+			}
+		}
+	}
 	.swiper {
 		position: fixed;
 		top: 0;
diff --git a/pages/medicine/medicine.vue b/pages/medicine/medicine.vue
index c412198..0b932db 100644
--- a/pages/medicine/medicine.vue
+++ b/pages/medicine/medicine.vue
@@ -49,10 +49,29 @@
 				</view>
 			</view>
 		</view>
+		<u-mask :show="usershow" class='mask'>
+			<view class="information">
+				<image src="../../static/information.png" mode=""></image>
+				<view class="title">
+					请完善个人信息
+				</view>
+				<view class="cancel" @tap='usershow=false'>
+					取消
+				</view>
+				<view class="determine" @tap='goinformation'>
+					去完善
+				</view>
+			</view>
+		</u-mask>
+		<u-toast ref="uToast" />
+		<u-back-top :scroll-top="scrollTop"></u-back-top>
 	</view>
 </template>
 
 <script>
+	import {
+		AppIdentification
+	} from '@/api/AppIdentification/index.js'
 	import {
 		selectDepartment,
 		selectHospitalPerson
@@ -61,6 +80,7 @@
 	export default {
 		data() {
 			return {
+				usershow: false, //完善信息开关
 				baseurl: '',
 				swiperImgUrls: [],
 				autoplay: true, //自动切换轮播图
@@ -79,6 +99,7 @@
 					clientY: '',
 				},
 				touch: {},
+				scrollTop: 0,
 			};
 		},
 		methods: {
@@ -180,8 +201,41 @@
 			},
 			// 跳转预约医生界面
 			goappointment(item) {
+				let that = this
+				const value = uni.getStorageSync('openid');
+				const value2 = uni.getStorageSync('patientId');
+				if (value && value2) {
+					AppIdentification(value2).then(res => {
+						if (res.code == 200) {
+							if (res.data.loginFlag) {
+								that.usershow = false
+								uni.navigateTo({
+									url: `/pages/Informationconfirmation/Informationconfirmation?price=${item.consultingFee}&&hospitalPersonId=${item.id}`
+								})
+							} else {
+								that.usershow = true
+							}
+						} else if (res.code == 9999) {} else {
+							that.$refs.uToast.show({
+								title: res.msg,
+								type: 'error',
+								url: '/pages/login/login'
+							})
+						}
+					})
+				} else {
+					that.$refs.uToast.show({
+						title: '未登录,请先登录',
+						type: 'error',
+						url: '/pages/login/login'
+					})
+				}
+			},
+			//跳转完善页面
+			goinformation() {
+				this.usershow = false
 				uni.navigateTo({
-					url: `/pages/Informationconfirmation/Informationconfirmation?price=${item.consultingFee}&hospitalPersonId=${item.id}`
+					url: '/pages/information/information'
 				})
 			},
 		},
@@ -190,6 +244,9 @@
 			this.baseurl = baseurl
 			this.selectDepartmentinfo()
 		},
+		onShow() {
+			this.usershow = false
+		},
 		//1.分享给朋友
 		onShareAppMessage(res) {
 			let pages = getCurrentPages();
diff --git a/pages/menttimeorder/menttimeorder.vue b/pages/menttimeorder/menttimeorder.vue
index 43f415b..e499724 100644
--- a/pages/menttimeorder/menttimeorder.vue
+++ b/pages/menttimeorder/menttimeorder.vue
@@ -102,18 +102,14 @@
 			var that = this
 			this.baseurl = baseurl
 			this.orderNo = JSON.parse(options.list).orderNo
-			try {
-				const value = uni.getStorageSync('patientId');
-				if (value) {
-					that.patientId = value
-				}
-			} catch (e) {}
-			try {
-				const value = uni.getStorageSync('openid');
-				if (value) {
-					that.openid = value
-				}
-			} catch (e) {}
+			const value = uni.getStorageSync('patientId');
+			if (value) {
+				that.patientId = value
+			}
+			const value2 = uni.getStorageSync('openid');
+			if (value2) {
+				that.openid = value2
+			}
 		},
 		methods: {
 			//支付
diff --git a/pages/modify/modify.vue b/pages/modify/modify.vue
index 1b5658e..2b9cfcb 100644
--- a/pages/modify/modify.vue
+++ b/pages/modify/modify.vue
@@ -319,7 +319,6 @@
 								that.$refs.uToast.show({
 									title: res.msg,
 									type: 'error',
-									url: ''
 								})
 							}
 						})
diff --git a/pages/modifyAddress/modifyAddress.vue b/pages/modifyAddress/modifyAddress.vue
index 1629eec..f66d23f 100644
--- a/pages/modifyAddress/modifyAddress.vue
+++ b/pages/modifyAddress/modifyAddress.vue
@@ -213,36 +213,34 @@
 			// 查询地址信息
 			goodsList() {
 				let that = this
-				try {
-					const value = uni.getStorageSync('patientId');
-					if (value) {
-						that.patientId = value
-						goodPatientInfo(that.patientId).then(res => {
-							res.data.forEach(e => {
-								e.address = e.areaName + e.receiveAddress
-								if (e.defaultAddressFlag == 1) {
-									e.defaultAddressFlag = true
-								} else {
-									e.defaultAddressFlag = false
-								}
-							})
-							that.goodPatient = res.data
+				const value = uni.getStorageSync('patientId');
+				if (value) {
+					that.patientId = value
+					goodPatientInfo(that.patientId).then(res => {
+						res.data.forEach(e => {
+							e.address = e.areaName + e.receiveAddress
+							if (e.defaultAddressFlag == 1) {
+								e.defaultAddressFlag = true
+							} else {
+								e.defaultAddressFlag = false
+							}
 						})
-					} else {
-						that.$refs.uToast.show({
-							title: '登录状态异常',
-							type: 'error'
-						})
-						if (that.timer) {
-							clearTimeout(that.timer)
-						}
-						that.timer = setTimeout(e => {
-							uni.navigateBack({
-								delta: 2
-							})
-						}, 1500)
+						that.goodPatient = res.data
+					})
+				} else {
+					that.$refs.uToast.show({
+						title: '登录状态异常',
+						type: 'error'
+					})
+					if (that.timer) {
+						clearTimeout(that.timer)
 					}
-				} catch (e) {}
+					that.timer = setTimeout(e => {
+						uni.navigateBack({
+							delta: 2
+						})
+					}, 1500)
+				}
 			},
 			// 保存按钮
 			submit() {
diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue
index b0d6c13..a7f7a94 100644
--- a/pages/nursestation/nursestation.vue
+++ b/pages/nursestation/nursestation.vue
@@ -189,7 +189,6 @@
 				nurseStationId: '',
 				pageNum: 1,
 				pageSize: 10,
-				timer: null,
 				tabList: [{
 					name: '全部',
 					id: ''
@@ -280,51 +279,31 @@
 			//预约
 			goappointments(item) {
 				let that = this
-				try {
-					const value = uni.getStorageSync('openid');
-					const value2 = uni.getStorageSync('patientId');
-					if (value && value2) {
-						AppIdentification(value2).then(res => {
-							if (res.code == 200) {
-								if (res.data.loginFlag) {
-									that.usershow = false
-									uni.navigateTo({
-										url: `/pages/appointmenttime/appointmenttime?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`,
-									})
-								} else {
-									that.usershow = true
-								}
-							} else if (res.code == 9999) {} else {
-								that.$refs.uToast.show({
-									title: res.msg,
-									type: 'error'
+				const value = uni.getStorageSync('openid');
+				const value2 = uni.getStorageSync('patientId');
+				if (value && value2) {
+					AppIdentification(value2).then(res => {
+						if (res.code == 200) {
+							if (res.data.loginFlag) {
+								that.usershow = false
+								uni.navigateTo({
+									url: `/pages/appointmenttime/appointmenttime?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`,
 								})
-								if (that.timer) {
-									clearTimeout(that.timer)
-								}
-								that.timer = setTimeout(e => {
-									uni.navigateTo({
-										url: '/pages/login/login'
-									})
-								}, 1500)
+							} else {
+								that.usershow = true
 							}
-						})
-					} else {
-						that.$refs.uToast.show({
-							title: '未登录,请先登录',
-							type: 'error'
-						})
-						if (that.timer) {
-							clearTimeout(that.timer)
-						}
-						that.timer = setTimeout(e => {
-							uni.navigateTo({
+						} else if (res.code == 9999) {} else {
+							that.$refs.uToast.show({
+								title: res.msg,
+								type: 'error',
 								url: '/pages/login/login'
 							})
-						}, 1000)
-					}
-				} catch (e) {
-					uni.navigateTo({
+						}
+					})
+				} else {
+					that.$refs.uToast.show({
+						title: '未登录,请先登录',
+						type: 'error',
 						url: '/pages/login/login'
 					})
 				}
diff --git a/pages/orderDetails/orderDetails.vue b/pages/orderDetails/orderDetails.vue
index ae319b8..ad6ef13 100644
--- a/pages/orderDetails/orderDetails.vue
+++ b/pages/orderDetails/orderDetails.vue
@@ -269,14 +269,12 @@
 			this.baseurl = baseurl
 			this.goodsOrderId = options.goodsOrderId
 			let that = this
-			try {
-				const value = uni.getStorageSync('patientId');
-				const value2 = uni.getStorageSync('openid');
-				if (value && value2) {
-					that.patientId = value
-					that.openid = value2
-				}
-			} catch (e) {}
+			const value = uni.getStorageSync('patientId');
+			const value2 = uni.getStorageSync('openid');
+			if (value && value2) {
+				that.patientId = value
+				that.openid = value2
+			}
 		}
 	}
 </script>
diff --git a/pages/payorderDetails/payorderDetails.vue b/pages/payorderDetails/payorderDetails.vue
index 82b29af..c15e06a 100644
--- a/pages/payorderDetails/payorderDetails.vue
+++ b/pages/payorderDetails/payorderDetails.vue
@@ -167,18 +167,14 @@
 			this.baseurl = baseurl
 			this.goodsOrderId = options.goodsOrderId
 			let that = this
-			try {
-				const value = uni.getStorageSync('patientId');
-				if (value) {
-					that.patientId = value
-				}
-			} catch (e) {}
-			try {
-				const value = uni.getStorageSync('openid');
-				if (value) {
-					that.openid = value
-				} else {}
-			} catch (e) {}
+			const value = uni.getStorageSync('patientId');
+			if (value) {
+				that.patientId = value
+			}
+			const value2 = uni.getStorageSync('openid');
+			if (value2) {
+				that.openid = value2
+			} else {}
 		},
 		onShow() {
 			this.goodsOrderinfo(this.goodsOrderId)