修改

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) {}
 		}
 	}
 </script>

pages/CommodityDetails/CommodityDetails.vue

@@ -277,7 +277,6 @@
 	export default {
 		data() {
 			return {
-				timer: null,
 				goodsInfoId: null, //商品id
 				baseurl: '', //url
 				image: null, //总图片
@@ -406,7 +405,6 @@
 			//立即购买跳转确认订单页面
 			tapbuy() {
 				var that = this
-				try {
 				const value = uni.getStorageSync('openid');
 				const value2 = uni.getStorageSync('patientId');
 				if (value && value2) {
@@ -539,33 +537,18 @@
 						} else if (res.code == 9999) {} else {
 							that.$refs.uToast.show({
 								title: res.msg,
-									type: 'error'
+								type: 'error',
-								})
-								if (that.timer) {
-									clearTimeout(that.timer)
-								}
-								that.timer = setTimeout(e => {
-									uni.navigateTo({
 								url: '/pages/login/login'
 							})
-								}, 1500)
 						}
 					})
 				} else {
 					that.$refs.uToast.show({
 						title: '未登录,请先登录',
-							type: 'error'
+						type: 'error',
-						})
-						if (that.timer) {
-							clearTimeout(that.timer)
-						}
-						that.timer = setTimeout(e => {
-							uni.navigateTo({
 						url: '/pages/login/login'
 					})
-						}, 1500)
 				}
-				} catch (e) {}
 			},
 			//选择商品
 			isActivegoods(item) {
@@ -736,16 +719,9 @@
 					} else {
 						this.$refs.uToast.show({
 							title: '未登录,请先登录',
-							type: 'error'
+							type: 'error',
-						})
-						if (this.timer) {
-							clearTimeout(this.timer)
-						}
-						this.timer = setTimeout(e => {
-							uni.navigateTo({
 							url: '/pages/login/login'
 						})
-						}, 1500)
 					}
 				}
 			},

pages/CommodityOrder/CommodityOrder.vue

@@ -272,7 +272,6 @@
 		},
 		onLoad(options) { //开局调用
 			let that = this
-			try {
 			const value = uni.getStorageSync('patientId');
 			const value2 = uni.getStorageSync('openid');
 			if (value && value2) {
@@ -297,7 +296,6 @@
 					that.goodsOrderinfo();
 				}
 			}
-			} catch (e) {}
 		},
 		onReachBottom() { //下滑加载
 			if (this.orderlist.length >= this.total) {} else {

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

pages/Nursingstationserviceorder/Nursingstationserviceorder.vue

@@ -109,32 +109,26 @@
 				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) {}
 		},
 		onLoad() {
 			let that = this
 			this.pageNum = 1
-			try {
 			const value = uni.getStorageSync('patientId');
 			const value2 = uni.getStorageSync('openid');
 			if (value && value2) {
@@ -142,7 +136,6 @@
 				that.openid = value2
 				that.getinfo()
 			}
-			} catch (e) {}
 		},
 		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)
 					}
 				})
 			},

pages/ProjectDetails/ProjectDetails.vue

@@ -135,7 +135,6 @@
 			//预约
 			goappointments() {
 				let that = this
-				try {
 				const value = uni.getStorageSync('openid');
 				const value2 = uni.getStorageSync('patientId');
 				if (value && value2) {
@@ -149,39 +148,18 @@
 							} else {
 								that.usershow = true
 							}
-							} else if (res.code == 9999) {
+						} else if (res.code == 9999) {} else {
-
-							} else {
 							that.$refs.uToast.show({
 								title: res.msg,
-									type: 'error'
+								type: 'error',
-								})
-								if (that.timer) {
-									clearTimeout(that.timer)
-								}
-								that.timer = setTimeout(e => {
-									uni.navigateTo({
 								url: '/pages/login/login'
 							})
-								}, 1500)
 						}
 					})
 				} else {
 					that.$refs.uToast.show({
 						title: '未登录,请先登录',
-							type: 'error'
+						type: 'error',
-						})
-						if (that.timer) {
-							clearTimeout(that.timer)
-						}
-						that.timer = setTimeout(e => {
-							uni.navigateTo({
-								url: '/pages/login/login'
-							})
-						}, 1500)
-					}
-				} catch (e) {
-					uni.navigateTo({
 						url: '/pages/login/login'
 					})
 				}

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) {}
 			this.getlist()
 		},
 		methods: {

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) {}
 			//耗材包详情方法调用
 			this.getPatientInfo(options.stationId, options.stationItemId, options.stationItemPriceId)
 			this.userinfo();
@@ -205,7 +203,6 @@
 			userinfo() {
 				//取出patientId
 				var that = this
-				try {
 				const value = uni.getStorageSync('patientId');
 				if (value) {
 					that.patientId = value
@@ -215,7 +212,6 @@
 						that.personInfo.address = response.data.areaName + response.data.address
 					})
 				}
-				} catch (e) {}
 			},
 			timechange(index) {
 				this.orderlist.serviceDate = this.orderlist.appointmentTimeList[index].date

pages/classification/classification.vue

@@ -103,7 +103,6 @@
 		},
 		onShow() {
 			var that = this
-			try {
 			const value = uni.getStorageSync('openid');
 			const value3 = uni.getStorageSync('Refresh');
 			if (value) {} else {
@@ -114,7 +113,6 @@
 			if (value3) {
 				that.goodsListinfo();
 			}
-			} catch (e) {}
 		},
 		onLoad(options) { //获取传值
 			this.goodsCategoryId = options.goodsCategoryId //请求id

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) {}
 			let useritem = null
 			uni.$on('updata', function(data) {
 				that.updata = JSON.parse(data.updata)

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) {}
 			},
 			//跳转回信息完善页面
 			goinformation() {

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) {}
+			const value2 = uni.getStorageSync('patientId');
-			try {
+			if (value2) {
-				const value = uni.getStorageSync('patientId');
+				that.patientId = value2
-				if (value) {
-					that.patientId = value
 			} else {}
-			} catch (e) {}
 		},
 	}
 </script>

pages/information/information.vue

@@ -192,7 +192,6 @@
 				}
 				if (this.addresslength) {
 					if (this.addresslength.length > 2) {
-						try {
 						const value = uni.getStorageSync('phone');
 						if (value) {
 							that.query.phone = value
@@ -227,7 +226,6 @@
 								})
 							}
 						}
-						} catch (e) {}
 					} else {
 						that.$refs.uToast.show({
 							title: '所属区域应选择所在的区或街道,请重新选择!',

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',
-						})
-						if (this.timer) {
-							clearTimeout(this.timer)
-						}
-						this.timer = setTimeout(e => {
-							uni.navigateTo({
 							url: '/pages/login/login'
 						})
-						}, 1500)
 					}
 				}
 			},

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;

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}`
+									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/information/information'
 				})
 			},
 		},
@@ -190,6 +244,9 @@
 			this.baseurl = baseurl
 			this.selectDepartmentinfo()
 		},
+		onShow() {
+			this.usershow = false
+		},
 		//1.分享给朋友
 		onShareAppMessage(res) {
 			let pages = getCurrentPages();

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) {}
+			const value2 = uni.getStorageSync('openid');
-			try {
+			if (value2) {
-				const value = uni.getStorageSync('openid');
+				that.openid = value2
-				if (value) {
-					that.openid = value
 			}
-			} catch (e) {}
 		},
 		methods: {
 			//支付

pages/modify/modify.vue

@@ -319,7 +319,6 @@
 								that.$refs.uToast.show({
 									title: res.msg,
 									type: 'error',
-									url: ''
 								})
 							}
 						})

pages/modifyAddress/modifyAddress.vue

@@ -213,7 +213,6 @@
 			// 查询地址信息
 			goodsList() {
 				let that = this
-				try {
 				const value = uni.getStorageSync('patientId');
 				if (value) {
 					that.patientId = value
@@ -242,7 +241,6 @@
 						})
 					}, 1500)
 				}
-				} catch (e) {}
 			},
 			// 保存按钮
 			submit() {

pages/nursestation/nursestation.vue

@@ -189,7 +189,6 @@
 				nurseStationId: '',
 				pageNum: 1,
 				pageSize: 10,
-				timer: null,
 				tabList: [{
 					name: '全部',
 					id: ''
@@ -280,7 +279,6 @@
 			//预约
 			goappointments(item) {
 				let that = this
-				try {
 				const value = uni.getStorageSync('openid');
 				const value2 = uni.getStorageSync('patientId');
 				if (value && value2) {
@@ -297,34 +295,15 @@
 						} else if (res.code == 9999) {} else {
 							that.$refs.uToast.show({
 								title: res.msg,
-									type: 'error'
+								type: 'error',
-								})
-								if (that.timer) {
-									clearTimeout(that.timer)
-								}
-								that.timer = setTimeout(e => {
-									uni.navigateTo({
 								url: '/pages/login/login'
 							})
-								}, 1500)
 						}
 					})
 				} else {
 					that.$refs.uToast.show({
 						title: '未登录,请先登录',
-							type: 'error'
+						type: 'error',
-						})
-						if (that.timer) {
-							clearTimeout(that.timer)
-						}
-						that.timer = setTimeout(e => {
-							uni.navigateTo({
-								url: '/pages/login/login'
-							})
-						}, 1000)
-					}
-				} catch (e) {
-					uni.navigateTo({
 						url: '/pages/login/login'
 					})
 				}

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) {}
 		}
 	}
 </script>

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) {}
+			const value2 = uni.getStorageSync('openid');
-			try {
+			if (value2) {
-				const value = uni.getStorageSync('openid');
+				that.openid = value2
-				if (value) {
-					that.openid = value
 			} else {}
-			} catch (e) {}
 		},
 		onShow() {
 			this.goodsOrderinfo(this.goodsOrderId)