diff --git a/components/preBookList.vue b/components/preBookList.vue
index 4c20d76..29e4c89 100644
--- a/components/preBookList.vue
+++ b/components/preBookList.vue
@@ -38,21 +38,13 @@ export default {
   data() {
     return {
 		cssUrl:this.cssUrl,
-		// statusList:['status_wait', 'status_ing', 'status_down', 'status_out_num', 'status_expire', 'status_expire'],
-		// statusDescList:['候诊', '就诊中', '已完成', '过号', '已过期', '已取消'],
 		statusStyleList:{'待就诊':'status_wait', '就诊中':'status_ing', '就诊完成':'status_down', '过号':'status_out_num', '过期':'status_expire','取消':'status_cancle'}
     }
   },
   methods: {
 	  toBookDetail(item){
-		  this.$func.toPage('/pages/visit_detail/visit_detail?id='+item.id+'&depart_id='+item.depart_id+'&visitor_id='+item.visitor_id)
+		this.$nav.navToPath('/pages/visit_detail/visit_detail?id='+item.id+'&depart_id='+item.depart_id+'&visitor_id='+item.visitor_id)
 	  },
-	  getDayOfWeek(dateString) {
-	  	var str = new Date(dateString);
-	  	var week = str.getDay();
-	  	var weekList = ['周日','周一','周二','周三','周四','周五','周六']
-	  	return weekList[week]
-	  }
   }
 };
 </script>
@@ -120,7 +112,6 @@ export default {
 				text-align: right;
 				word-break: break-all;
 				height: 42rpx;
-				// display: flex;
 				align-items: center;
 				justify-content: flex-end;
 				.bedDesc{
diff --git a/components/tabbar.vue b/components/tabbar.vue
index 7c4dd3b..6b5ee43 100644
--- a/components/tabbar.vue
+++ b/components/tabbar.vue
@@ -52,10 +52,12 @@
 			}
 		},
 		mounted() {
+			// #ifdef H5
 			this.isWechat = /MicroMessenger/i.test(navigator.userAgent)
 			if (this.isWechat && !this.wxConfig) {
 				this.initWxConfig()
 			}
+			// #endif
 		},
 		methods: {
 			async initWxConfig() {
@@ -129,7 +131,7 @@
 							})
 							return;
 						}
-						this.$func.toPage('/pages/nonsupport/nonsupport');
+						this.$nav.navToPath('/pages/nonsupport/nonsupport');
 					});
 					return;
 				}
diff --git a/components/userCard.vue b/components/userCard.vue
index 2c4b93d..0ca0951 100644
--- a/components/userCard.vue
+++ b/components/userCard.vue
@@ -1,12 +1,15 @@
 <template>
-  <view :class="'user-card-com'+(!showuinfo?' popup-user-card':'')">
-		<uni-card :title="dataitem.name" extra="身份证：9098******8778" margin="0 10rpx 20rpx 10rpx" shadow="none" :border="false" padding="24rpx 0 0 0">
+	<view :class="'user-card-com' + (!showuinfo ? ' popup-user-card' : '')">
+		<uni-card :title="dataitem.name" extra="身份证：9098******8778" margin="0 10rpx 20rpx 10rpx" shadow="none"
+			:border="false" padding="24rpx 0 0 0">
 			<view>
-				<uni-data-checkbox mode="button" v-model="type" :localdata="types" @change="changeType"></uni-data-checkbox>
+				<uni-data-checkbox mode="button" v-model="type" :localdata="types"
+					@change="changeType"></uni-data-checkbox>
 			</view>
 
 			<view class="bed-wrapper" v-show="type == 1">
-				<uni-easyinput v-model="value" placeholder="请输入床位位置" placeholderStyle="color: #999999;font-size: 30rpx;" :trim="true" @input="inputevent"></uni-easyinput>
+				<uni-easyinput v-model="value" placeholder="请输入床位位置" placeholderStyle="color: #999999;font-size: 30rpx;"
+					:trim="true" @input="inputevent"></uni-easyinput>
 			</view>
 
 			<view class="card-cus-txt" v-if="type == 0">
@@ -18,34 +21,35 @@
 			</view>
 
 		</uni-card>
-  </view>
+	</view>
 </template>
 
 <script>
 export default {
-  name: "visitorList",
-  props: {
-		add:{
-			type:Boolean,
-			default:()=>false
+	name: "visitorList",
+	options: { styleIsolation: "shared" },
+	props: {
+		add: {
+			type: Boolean,
+			default: () => false
 		},
-		showuinfo:{
-			type:Boolean,
-			default:()=>true
+		showuinfo: {
+			type: Boolean,
+			default: () => true
 		},
-		dataitem:{
-			type:Object,
-			default:()=>{}
+		dataitem: {
+			type: Object,
+			default: () => { }
 		},
-		index:{
-			type:Number,
-			default:()=>-1
+		index: {
+			type: Number,
+			default: () => -1
 		},
-  },
-  data() {
-    return {
-			cssUrl:this.cssUrl,
-			value:'',
+	},
+	data() {
+		return {
+			cssUrl: this.cssUrl,
+			value: '',
 			type: 0,
 			types: [{
 				text: '等医生叫号',
@@ -54,12 +58,12 @@ export default {
 				text: '找床位候诊',
 				value: 1
 			}],
-    }
-  },
-  methods: {
+		}
+	},
+	methods: {
 		confirm() {
 		},
-		inputevent(e){
+		inputevent(e) {
 			var obj = new Object()
 			obj.key = this.index
 			obj.type = this.type
@@ -71,14 +75,14 @@ export default {
 			obj.key = this.index
 			obj.type = this.type
 			obj.bed_desc = ''
-			if(this.type == 1) obj.bed_desc = this.value
+			if (this.type == 1) obj.bed_desc = this.value
 			this.$emit('clickEvent', obj)
 		},
 		setType(typeval) {
 			this.value = typeval
 		},
 		setTypeValue(typeval) {
-			setTimeout(function(){
+			setTimeout(function () {
 				this.type = typeval
 			}.bind(this))
 			// this.type = typeval
@@ -89,163 +93,184 @@ export default {
 			obj.type = this.type
 			return obj
 		}
-  }
+	}
 };
 
 </script>
 
 <style lang="scss" scoped>
-	.user-card-com{
-		width: 100%;
-		height: auto;
-		overflow: hidden;
-
-		&.popup-user-card{
-			::v-deep {
-				.uni-card__header{
-					display: none !important;
-				}
-				.uni-card{
-					padding: 0 32rpx 0rpx 32rpx !important;
-					margin-bottom: 0rpx !important;
-				}
-				.uni-card__content{
-					padding: 0 !important;
-				}
-				.checklist-group{
-					margin-bottom: 46rpx !important;
-				}
-				.card-cus-txt{
-					margin-bottom: 42rpx;
-				}
-				.uni-easyinput{
-					margin-bottom: 46rpx;
+.user-card-com {
+	width: 100%;
+	height: auto;
+	overflow: hidden;
+
+	&.popup-user-card {
+		::v-deep {
+			.uni-card__header {
+				display: none !important;
+			}
+
+			.uni-card {
+				padding: 0 32rpx 0rpx 32rpx !important;
+				margin-bottom: 0rpx !important;
+			}
+
+			.uni-card__content {
+				padding: 0 !important;
+			}
+
+			.checklist-group {
+				margin-bottom: 46rpx !important;
+			}
+
+			.card-cus-txt {
+				margin-bottom: 42rpx;
+			}
+
+			.uni-easyinput {
+				margin-bottom: 46rpx;
+			}
+		}
+	}
+
+	::v-deep {
+		.uni-easyinput {
+			margin-bottom: 24rpx;
+
+			.uni-easyinput__content-input {
+				padding-left: 24rpx !important;
+				color: #333333;
+				font-size: 30rpx;
+				line-height: 30rpx;
+				letter-spacing: 0.22rpx;
+				height: 86rpx;
+				line-height: 86rpx;
+				display: flex;
+				align-items: center;
+				position: relative;
+				top: -2rpx;
+			}
+
+			.is-input-border {
+				border: 2rpx solid #DCDCDC !important;
+			}
+
+			.is-input-border.is-focused {
+				border-color: #39D067 !important;
+
+				.uni-icons.content-clear-icon.uniui-clear {
+					color: #39D067 !important;
 				}
 			}
 		}
 
-		::v-deep {
-				.uni-easyinput{
-					margin-bottom: 24rpx;
-					.uni-easyinput__content-input{
-						padding-left: 24rpx !important;
-						color: #333333;
+		.uni-card {
+			border-radius: 0;
+			padding: 32rpx !important;
+
+			.uni-data-checklist .checklist-group {
+				column-gap: 24rpx;
+				margin-bottom: 24rpx;
+
+				.checklist-box {
+					margin: 0;
+					width: calc(50% - 14rpx);
+					box-sizing: border-box;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+
+					.checklist-content {
+						flex: none;
+					}
+
+					.checklist-content .checklist-text {
 						font-size: 30rpx;
-						line-height: 30rpx;
+						font-weight: normal;
 						letter-spacing: 0.22rpx;
-						height: 86rpx;
-						line-height: 86rpx;
-						display: flex;
-						align-items: center;
-						position: relative;
-						top: -2rpx;
-					}
-					.is-input-border{
-						border: 2rpx solid #DCDCDC !important;
+						margin-left: 12rpx;
+						color: #666666;
 					}
-					.is-input-border.is-focused{
-						border-color: #39D067 !important;
-						.uni-icons.content-clear-icon.uniui-clear{
-							color: #39D067 !important;
-						}
+
+					.radio__inner {
+						width: 36rpx;
+						height: 36rpx;
+						border: 2rpx solid #BCBCBC;
+						border-radius: 36rpx;
 					}
-				}
-				.uni-card{
-					border-radius: 0;
-					padding: 32rpx !important;
-					.uni-data-checklist .checklist-group {
-						column-gap: 24rpx;
-						margin-bottom: 24rpx;
-						.checklist-box{
-							margin: 0;
-							width: calc(50% - 14rpx);
-							box-sizing: border-box;
-							display: flex;
-							justify-content: center;
-							align-items: center;
-							.checklist-content{
-								flex: none;
-							}
-							.checklist-content .checklist-text{
-								font-size: 30rpx;
-								font-weight: normal;
-								letter-spacing: 0.22rpx;
-								margin-left: 12rpx;
-								color: #666666;
+
+					&.is--button {
+						margin-right: 0rpx;
+						padding: 20rpx 42rpx 20rpx 24rpx;
+						box-sizing: border-box;
+						border: none;
+						min-height: 82rpx;
+						border-radius: 8rpx;
+						transition: border-color 0.2s;
+						background: #F8F8F8;
+
+						&.is-checked {
+							background: #F5FFF4;
+
+							.radio__inner {
+								border-color: #00C160;
 							}
 
-							.radio__inner{
-								width: 36rpx;
-								height: 36rpx;
-								border: 2rpx solid #BCBCBC;
-								border-radius: 36rpx;
+							.radio__inner-icon {
+								background: #00C160;
 							}
 
-							&.is--button{
-								margin-right: 0rpx;
-								padding: 20rpx 42rpx 20rpx 24rpx;
-								box-sizing: border-box;
-								border: none;
-								min-height: 82rpx;
-								border-radius: 8rpx;
-								transition: border-color 0.2s;
-								background: #F8F8F8;
-								&.is-checked{
-									background: #F5FFF4;
-									.radio__inner{
-										border-color: #00C160;
-									}
-									.radio__inner-icon{
-										background: #00C160;
-									}
-									.checklist-text{
-											color: #333333;
-									}
-								}
+							.checklist-text {
+								color: #333333;
 							}
 						}
 					}
-					.card-cus-txt{
-						font-size: 24rpx;
-						font-weight: normal;
-						line-height: 34rpx;
-						height: 34rpx;
-						letter-spacing: 1.77rpx;
-						color: #666666;
-						text-align: center;
-					}
-					.uni-card__header{
-						border: none;
-						padding: 0;
-						.uni-card__header-extra .uni-card__header-extra-text{
-							font-size: 24rpx;
-							font-weight: normal;
-							line-height: normal;
-							letter-spacing: 0.14rpx;
-							color: #949699;
-						}
+				}
+			}
 
-						.uni-card__header-content .uni-card__header-content-title{
-							font-weight: 600;
-							line-height: 42rpx;
-							font-size: 32rpx;
-							color: #333333;
-							&:before{
-								content: '';
-								display: inline-block;
-								width: 8rpx;
-								height: 34rpx;
-								z-index: 0;
-								border-radius: 10rpx;
-								background: #58CA7F;
-								position: relative;
-								top: 5rpx;
-								margin-right: 12rpx;
-							}
-						}
+			.card-cus-txt {
+				font-size: 24rpx;
+				font-weight: normal;
+				line-height: 34rpx;
+				height: 34rpx;
+				letter-spacing: 1.77rpx;
+				color: #666666;
+				text-align: center;
+			}
+
+			.uni-card__header {
+				border: none;
+				padding: 0;
+
+				.uni-card__header-extra .uni-card__header-extra-text {
+					font-size: 24rpx;
+					font-weight: normal;
+					line-height: normal;
+					letter-spacing: 0.14rpx;
+					color: #949699;
+				}
+
+				.uni-card__header-content .uni-card__header-content-title {
+					font-weight: 600;
+					line-height: 42rpx;
+					font-size: 32rpx;
+					color: #333333;
+
+					&:before {
+						content: '';
+						display: inline-block;
+						width: 8rpx;
+						height: 34rpx;
+						z-index: 0;
+						border-radius: 10rpx;
+						background: #58CA7F;
+						position: relative;
+						top: 5rpx;
+						margin-right: 12rpx;
 					}
 				}
 			}
+		}
 	}
-
+}
 </style>
diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue
index bbe54b4..c2eec9c 100644
--- a/pages/visitors/visitors.vue
+++ b/pages/visitors/visitors.vue
@@ -170,10 +170,9 @@
 		},
 		methods: {
 			reback(){
-				this.$nav.navToPath('/')
+				this.$nav.navToPath('/pages/index/index')
 			},
 			// 预约时间 -跳转就诊人页面-预约时间
-
 			async getDoctorInfo() {
 				await this.$http.req('user/index_info', {}, 'GET').then(data=>{
 					if(data == -1) return