diff --git a/App.vue b/App.vue
index 14f3f86..bac732c 100644
--- a/App.vue
+++ b/App.vue
@@ -5,6 +5,7 @@
 			doctoridStorageKey:'doctor_id'
 		},
 		onLaunch: function(option) {
+			console.log(option,'option====');
 			if(!(option.query && option.query.did)){
 				var doctor_id = uni.getStorageSync(this.globalData.doctoridStorageKey)
 				if(doctor_id){
@@ -71,8 +72,8 @@
 		padding: 0;
 		background: #F8F6F9;
 		-webkit-text-size-adjust: 100%;
-		font-family: PingFangSC-Regular,sans-serif;
-		font-weight: 400;
+		font-family: "PingFang SC","Helvetica Neue", Helvetica, Arial, sans-serif;
+		font-weight: normal;
 		height: 100%;
 	}
 	.fl {
@@ -135,31 +136,22 @@
 		font-size:50rpx;
 		line-height: 50rpx;
 	}
-	.PfScRegular{
-		font-family: PingFangSC-Regular, sans-serif !important;
-		font-weight: 400 !important;
-	}
-	.PfScUltralight{
-		font-family: PingFangSC-Ultralight, sans-serif !important;
-	}
-	.PfScLight{
-		font-family: PingFangSC-Light, sans-serif !important;
-	}
-	.PfScThin{
-		font-family: PingFangSC-Thin, sans-serif !important;
-	}
 	.PfScMedium{
-		font-family: PingFangSC-Medium, sans-serif !important;
-		font-weight: 500 !important;
+		font-weight: 600;
 	}
 	.PfScSemibold{
-		font-family: PingFangSC-Semibold, sans-serif !important;
-		font-weight: 600 !important;
+		font-weight: 700;
 	}
-	.PfScHeavy{
-		font-family: PingFangSC-Heavy, sans-serif !important;
-		font-weight: 800 !important;
+
+	@supports (-webkit-touch-callout: none) {
+		.PfScMedium{
+			font-weight: 500;
+		}
+		.PfScSemibold{
+			font-weight: 600;
+		}
 	}
+
 	.over{
 		overflow: hidden;
 		text-overflow: ellipsis;
@@ -234,4 +226,36 @@
 		line-height: 40rpx !important;
 		height: 40rpx !important;
 	}
-</style>
+	
+	.pages-visitors-visitors /deep/ .uni-actionsheet__cell{
+		color:#31333B !important;
+		font-size: 34rpx;
+		line-height: 112rpx;
+		height: 112rpx;
+		padding: 0rpx 6rpx;
+	}
+	.pages-visitors-visitors /deep/ uni-actionsheet .uni-actionsheet {
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: #F6F6F6;
+		border-radius: 20rpx 20rpx 0 0;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	.pages-visitors-visitors /deep/ .uni-actionsheet__menu{
+		border-radius: 20rpx 20rpx 0 0;
+	}
+	
+	.pages-visitors-visitors /deep/ uni-actionsheet .uni-actionsheet__cell:before {
+	    border-top: 2rpx solid #EEEEEE;
+	    color: #EEEEEE;
+	}
+	.pages-visitors-visitors /deep/ uni-actionsheet .uni-actionsheet__action{
+		    margin-top: 24rpx;
+				margin-bottom: 10rpx;
+	}
+	
+	
+	
+</style>
diff --git a/components/bookBox.vue b/components/bookBox.vue
index 4348faf..63eac5c 100644
--- a/components/bookBox.vue
+++ b/components/bookBox.vue
@@ -1,14 +1,17 @@
-<template>
+<template>
   <view class="book-com">
 	<view class="date-wraper">
-		<view :class="'date'+((selectDay==key)?' active':'')" v-for="(item,key) in RegistrationTimeList" @click="chooseDay(key, item)">
-			<view class="top">
-				<view>{{item.date.date.substring(8,10)}}</view>
-				<view class="PfScMedium">{{item.date.weekday}}</view>
-			</view>
-			<view :class="'bot'+((item.date.type!=1 && item.date.type!=5)?' active':'')+(key==0?' PfScMedium':'')">
-				{{item.date.type_text}}
-			</view>
+		<view :class="'date'+((selectDay===item.date)?' active':'')" v-for="(item,key) in Object.values(RegistrationTimeList)" @click="chooseDay(item.date)">
+				<view class="top">
+					<view>{{item.month}}.{{ item.day }}</view>
+					<view class="PfScMedium">{{item.week_desc}}</view>
+				</view>
+				<view :class="'bot'+((item.work_desc !== '不出诊')?' active':'')+(key==0?' PfScMedium':'')">
+					{{item.work_desc}}
+				</view>
+				<!-- <view :class="'bot'+((item.date.type!=1 && item.date.type!=5)?' active':'')+(key==0?' PfScMedium':'')">
+					{{item.work_desc}}
+				</view> -->
 		</view>
 	</view>
 
@@ -16,9 +19,9 @@
 		<view :class="'item'+(timeList.am.length<=0?' itemempty':' ')" v-if="bookTimeList">
 			<view class="title PfScMedium">上午预约</view>
 			<view class="inner-wrapper" v-if="timeList.am.length>0">
-				<view v-for="(item,key) in timeList.am" :class="'son PfScMedium'+(item.bed_count<=0?' disable':'')" @click="confirmSubmit(item, 1)" :hover-class="item.bed_count>0?'hover2':''">
-					{{item.start}}-{{item.end}}
-					<text v-if="visitorList.length > item.bed_count || item.bed_count<=0">（{{item.bed_count>0?item.bed_count:'满'}}）</text>
+				<view v-for="(item,key) in timeList.am" :class="'son PfScMedium'+( time2remain[item] <=0?' disable':'')" @click="confirmSubmit(item, 1)" :hover-class="time2remain[item]>0?'hover2':''">
+					{{item}}
+					<text v-if="visitorList.length > time2remain[item] || time2remain[item]<=0">（{{time2remain[item]>0?time2remain[item]:'满'}}）</text>
 				</view>
 			</view>
 
@@ -31,9 +34,9 @@
 		<view :class="'item'+(timeList.pm.length<=0?' itemempty':' ')" v-if="bookTimeList">
 			<view class="title PfScMedium">下午预约</view>
 			<view class="inner-wrapper" v-if="timeList.pm.length>0">
-				<view :class="'son PfScMedium'+(item.bed_count<=0?' disable':'')" @click="confirmSubmit(item, 2)" :hover-class="item.bed_count>0?'hover2':''" v-for="(item,key) in timeList.pm">
-					{{item.start}}-{{item.end}}
-					<text v-if="visitorList.length > item.bed_count || item.bed_count<=0">（{{item.bed_count?item.bed_count:'满'}}）</text>
+				<view :class="'son PfScMedium'+(time2remain[item]<=0?' disable':'')" @click="confirmSubmit(item, 2)" :hover-class="time2remain[item]>0?'hover2':''" v-for="(item,key) in timeList.pm">
+					{{item}}
+					<text v-if="visitorList.length > time2remain[item] || time2remain[item]<=0">（{{time2remain[item]?time2remain[item]:'满'}}）</text>
 				</view>
 			</view>
 			<view class="empty" v-else>
@@ -51,54 +54,70 @@
 		</view>
 	</view>
 
-  </view>
-</template>
-
-<script>
-export default {
-  name: "bookBox",
+  </view>
+</template>
+
+<script>
+export default {
+  name: "bookBox",
   props: {
-	RegistrationTimeList:{
-		type:Array,
-		default:()=>[]
-	},
+	// RegistrationTimeList:Object,
+	// RegistrationTimeList:{
+	// 	type:Object,
+	// 	default:()=>{}
+	// },
 	visitorList:{
 		type:Array,
 		default:()=>[]
 	},
-  },
-  data() {
+  },
+  data() {
     return {
 		cssUrl:this.cssUrl,
+		workDate:[],
+		time2remain:[],
 		bookTimeList:false,
 		timeList:true,
 		disable:true,
-		selectDay:-1
-    }
-  },
+		selectDay:-1,
+		RegistrationTimeList:[]
+    }
+  },
   methods: {
-	dataInit(firstRegistrationTime) {
-		this.selectDay = 0
-		this.bookTimeList = firstRegistrationTime
+	dataInit(allDate,chooseDate) {//上下午时间
+	// dataInit(firstRegistrationTime,time2remain,chooseDate) {//上下午时间
+		let firstRegistrationTime = allDate['date2time']
+		this.RegistrationTimeList = allDate['date2work']
+		this.time2remain = allDate['time2remain'];
+		if(chooseDate){
+			this.selectDay = chooseDate;
+		}else{
+			this.selectDay = Object.keys(this.RegistrationTimeList)[0];
+			if(!this.selectDay)return
+			this.chooseDay(this.selectDay)
+			return
+		}
 		this.bookTimeList = false
 		if(firstRegistrationTime.am.length > 0 || firstRegistrationTime.pm.length > 0) this.bookTimeList = true
 		this.timeList = firstRegistrationTime
 	},
-	chooseDay(day, book){
-		this.selectDay = day
+	chooseDay(date){
+		this.selectDay = date
 		this.bookTimeList = false
-		if(book.am.length > 0 || book.pm.length > 0) this.bookTimeList = true
-		this.timeList = book
-	},
-	confirmSubmit(times, type){
-		if(times.bed_count <= 0) return
-		times.date = this.RegistrationTimeList[this.selectDay].date
-		times.key = this.selectDay
-		times.type = type
-		this.$emit('confirmSubmitEvent', times)
-	}
-  }
-};
+		this.$emit('getAvailabletRegistrationTime', true,this.selectDay)
+		// if(book.am.length > 0 || book.pm.length > 0) this.bookTimeList = true
+		// this.timeList = book
+	},
+	confirmSubmit(time_interval, type){
+		let param = new Object()
+		if(this.time2remain[time_interval] <= 0) return
+		param.date = this.selectDay
+		param.time_interval = time_interval
+		param.type = type
+		this.$emit('confirmSubmitEvent', param)
+	}
+  }
+};
 </script>
 
 <style lang="scss" scoped>
@@ -281,4 +300,4 @@ export default {
 		}
 	}
 
-</style>
+</style>
diff --git a/components/inputBox.vue b/components/inputBox.vue
index 271d293..2dec23d 100644
--- a/components/inputBox.vue
+++ b/components/inputBox.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <view class="input-com">
 	<view :class="'input-wrapper'+(errormsg?' error':'')">
 		<view class="left">
@@ -11,12 +11,12 @@
 		</view>
 	</view>
 	<view class="errmsg" v-if="errormsg">*{{errormsg}}</view>
-  </view>
-</template>
-
-<script>
-export default {
-  name: "inputBox",
+  </view>
+</template>
+
+<script>
+export default {
+  name: "inputBox",
   props: {
 	value: {
 		type: String,
@@ -29,10 +29,10 @@ export default {
 	label: {
 		type: String,
 		default: ""
-	},
-    holder: {
-      type: String,
-      default: ''
+	},
+    holder: {
+      type: String,
+      default: ''
     },
 	rule: {
 	  type: String,
@@ -42,14 +42,14 @@ export default {
 	  type: Boolean,
 	  default: true
 	}
-  },
-  data() {
+  },
+  data() {
     return {
 		errormsg:'',
-		cssUrl:this.cssUrl
-    }
-  },
-  methods: {
+		cssUrl:this.cssUrl
+    }
+  },
+  methods: {
     handleBlur(e) {
 		var value = e.detail.value
 		var res = this.check(value);
@@ -85,12 +85,36 @@ export default {
 			this.errormsg = this.label+'格式不正确'
 			return false
 		}
-
+		if(this.rule == 'idcard' && !this.validateChineseIDCard(noEmptyVal)){
+			this.errormsg = this.label+'格式不正确'
+			return false
+		}
 		this.errormsg = ''
 		return true
-	}
-  }
-};
+	},
+	validateChineseIDCard(idCard) {
+		const pattern = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/;
+
+		if (!pattern.test(idCard)) {
+			return false;
+		}
+
+		const modWeight = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
+		const modCheckDigit = [1, 0, 'X', 9, 8, 7, 6, 5, 4, 3, 2];
+
+		const idArray = idCard.split('');
+		let sum = 0;
+		for (let i = 0; i < 17; i++) {
+			sum += parseInt(idArray[i]) * modWeight[i];
+		}
+
+		const mod = sum % 11;
+		const checkDigit = modCheckDigit[mod];
+
+		return idArray[17] === checkDigit.toString();
+	}
+  }
+};
 </script>
 
 <style lang="scss" scoped>
@@ -134,7 +158,7 @@ export default {
 				textarea{
 					width: 100%;
 					height: 45rpx;
-				}
+				}
 			}
 		}
 		.errmsg{
@@ -150,4 +174,4 @@ export default {
 			height: 20rpx;
 		}
 	}
-</style>
+</style>
diff --git a/components/preBookList.vue b/components/preBookList.vue
index c9df6f7..034e329 100644
--- a/components/preBookList.vue
+++ b/components/preBookList.vue
@@ -1,52 +1,58 @@
-<template>
-  <view class="prebook-list-com">
-	<view class="list btPadding" v-if="dataList.length>0">
+<template>
+  	<view class="prebook-list-com">
+		<view :class="'list btPadding'+(topnopadding?' topnopadding':'')" v-if="dataList.length>0">
 			<view :class="'item '+item" v-for="(item, key) in dataList" @click="toBookDetail(item)">
 				<view class="left">
-					<view class="title PfScMedium"><text v-if="item.visitor_name">{{item.visitor_name}}</text><text v-else>无</text></view>
-					<view class="date">{{item.visit_date}} {{getDayOfWeek(item.visit_date)}}  {{item.visit_time}}</view>
-					<view class="loction">{{item.h_name}} {{item.depart_name}}</view>
+					<view class="title PfScMedium"><text v-if="item.name">{{item.name}}</text><text v-else>无</text></view>
+					<view class="date">{{item.date}} {{item.week_desc}}  {{item.time_interval}}</view>
+					<view class="loction over1">
+						{{item.hospital_name}} {{item.depart_name}}
+						</view>
 				</view>
 				<view class="right">
-					<view :class="statusList[item.status]+' status'"><view class="over">{{statusDescList[item.status]}}</view></view>
-					<view class="queue-num" v-if="statusList[item.status]=='status_wait' && item.wait_visit_count && item.wait_visit_count>0"><view>前方<text class="PfScSemibold">{{item.wait_visit_count}}</text>人</view> </view>
+					<view :class="statusStyleList[item.status_desc]+' status'"><view class="over">{{item.status_desc}}</view></view>
+					<view class="queue-num" v-if="item.status_desc=='候诊' && item.wait_visit_count && item.wait_visit_count>0"><view>前方<text class="PfScSemibold">{{item.wait_visit_count}}</text>人</view> </view>
 				</view>
 			</view>
 		</view>
+		<img class="emptyImg" v-else :src="cssUrl + 'list_empty.svg'" alt="">
 	</view>
-  </view>
-</template>
-
-<script>
-export default {
-  name: "preBookList",
+</template>
+<script>
+export default {
+  name: "preBookList",
   props: {
-	dataList:{
-		type: Array,
-		default: function(){
-			return []
-		}
-	}
-  },
-  data() {
+		dataList:{
+			type: Array,
+			default: function(){
+				return []
+			}
+		},
+		topnopadding:{
+			type:Boolean,
+			default:false
+		}
+  },
+  data() {
     return {
 		cssUrl:this.cssUrl,
-		statusList:['status_wait', 'status_ing', 'status_down', 'status_out_num', 'status_expire', 'status_expire'],
-		statusDescList:['候诊', '就诊中', '已完成', '过号', '已过期', '已取消']
-    }
-  },
+		// 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/book_detail/book_detail?id='+item.id)
+		  this.$func.toPage('/pages/book_detail/book_detail?id='+item.id+'&depart_id='+item.depart_id)
 	  },
 	  getDayOfWeek(dateString) {
 	  	var str = new Date(dateString);
 	  	var week = str.getDay();
 	  	var weekList = ['周日','周一','周二','周三','周四','周五','周六']
 	  	return weekList[week]
-	  }
-  }
-};
+	  }
+  }
+};
 </script>
 
 <style lang="scss" scoped>
@@ -54,7 +60,13 @@ export default {
 	width: 100%;
 	height: auto;
 	overflow: hidden;
+	background: #FFFFFF;
 	.list{
+		&.topnopadding{
+			.item:first-of-type{
+				padding: 0 13rpx 35rpx 13rpx;
+			}
+		}
 		width: 100%;
 		height: auto;
 		background: #FFFFFF;
@@ -105,20 +117,26 @@ export default {
 				flex-shrink: 1;
 				text-align: right;
 				word-break: break-all;
+				height: 42rpx;
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
 				.status{
 					display: flex;
 					justify-content: flex-end;
 					view{
 						display: flex;
 						border-radius: 6rpx;
-						font-size: 22rpx;
-						height: 32rpx;
-						line-height: 32rpx;
+						font-size: 26rpx;
+						line-height: 40rpx;
 						padding:  0 10rpx;
 						box-sizing: border-box;
 						min-width: 90rpx;
 						display: block;
 						text-align: center;
+						height: 40rpx;
+						min-width: 128rpx;
+						box-sizing: border-box;
 					}
 					
 					&.status_wait{
@@ -131,18 +149,18 @@ export default {
 					&.status_out_num{
 						view{
 							background: #FFFAF7;
-							border: 1rpx solid #FE6710;
 							color: #FE6710;
+							border: 1px solid #FE6710;
 						}
 					}
 					&.status_down{
 						view{
 							background: #FCFCFC;
-							border: 1rpx solid #AEB0B8;
-							color: #B6B8BF;
+							border: 1px solid #999999;
+							color: #999999;
 						}
 					}
-					&.status_expire{
+					&.status_expire,&.status_cancle{
 						view{
 							background: #FCFCFC;
 							border: 1rpx solid #AEB0B8;
@@ -172,6 +190,12 @@ export default {
 			}
 		}
 	}
+	.emptyImg{
+		width: 440rpx;
+		opacity: .6;
+		margin-left: 50%;
+		transform: translateX(-50%);
+	}
 }
 
-</style>
+</style>
diff --git a/index.html b/index.html
index c3ff205..2651985 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="UTF-8" />
+    <meta charset="UTF-8" />
+		<meta name="viewport"  content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
+
     <script>
       var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
         CSS.supports('top: constant(a)'))
diff --git a/main.js b/main.js
index de58246..e52e121 100644
--- a/main.js
+++ b/main.js
@@ -13,35 +13,35 @@ const app = new Vue({
 Vue.prototype.platform = "";
 Vue.prototype.isIos = "";
 Vue.prototype.isIphoneXr = false;
-
-String.prototype.trim=function(){
+
+String.prototype.trim=function(){
 　　return this.replace(/(^s*)|(s*$)/g, "");
 }
 
 const NODE_ENV = 'development';
 // const NODE_ENV = 'production';
-if(NODE_ENV == 'development'){
+if(NODE_ENV == 'development'){
 	Vue.prototype.cssUrl = '/static/images/frontend/';
-	Vue.prototype.request_domain = "http://api.checkcopy.com/";
+	Vue.prototype.request_domain = "http://jasonyizherenxin.checkcopy.com/";
 }else{
 	Vue.prototype.cssUrl = '/static/images/frontend/';
 	Vue.prototype.request_domain = "http://api.yizherenxin.cn/";
 }
 
-try{
-	var res = uni.getSystemInfoSync(),
-	platform = res.platform.toLowerCase(),
-	system = res.system.toLowerCase(),
-	model = res.model.toLowerCase();
-	if(system.indexOf('mac') > -1 || model.indexOf('mac') > -1 || model.indexOf('iphone 12/13 mini') > -1) platform = 'ios';
-	if(system.indexOf('ios') > -1 || model.indexOf('ipad') > -1) platform = 'ios';
-	Vue.prototype.platform = platform;
-	Vue.prototype.isIos = platform == 'ios' ? true : false;
-	Vue.prototype.isIphoneXr = (platform == "ios") && (res.model.toLowerCase().indexOf("iphone x")>-1);
-	if(NODE_ENV == 'development') Vue.prototype.isIos = '';
-	if(platform.indexOf('windows') > -1) Vue.prototype.isPc = true
-	if(model == 'pc') Vue.prototype.isPc = true
-}catch(e){
+try{
+	var res = uni.getSystemInfoSync(),
+	platform = res.platform.toLowerCase(),
+	system = res.system.toLowerCase(),
+	model = res.model.toLowerCase();
+	if(system.indexOf('mac') > -1 || model.indexOf('mac') > -1 || model.indexOf('iphone 12/13 mini') > -1) platform = 'ios';
+	if(system.indexOf('ios') > -1 || model.indexOf('ipad') > -1) platform = 'ios';
+	Vue.prototype.platform = platform;
+	Vue.prototype.isIos = platform == 'ios' ? true : false;
+	Vue.prototype.isIphoneXr = (platform == "ios") && (res.model.toLowerCase().indexOf("iphone x")>-1);
+	if(NODE_ENV == 'development') Vue.prototype.isIos = '';
+	if(platform.indexOf('windows') > -1) Vue.prototype.isPc = true
+	if(model == 'pc') Vue.prototype.isPc = true
+}catch(e){
 }
 
 Vue.prototype.env_val = 'xcx';
@@ -71,8 +71,8 @@ function isMobile() {
    }
 
    return mobile_flag;
-}
-
+}
+
 
 function trim(str, type = 'both') {
 	if (type == 'both') {
@@ -89,7 +89,7 @@ function trim(str, type = 'both') {
 		return str.replace(/\s+/g, '');
 	} else {
 		return str;
-	}
+	}
 }
 
 function isOpenMode() {
@@ -105,10 +105,10 @@ function isOpenMode() {
 	system.xll = (p == "X11") || (p.indexOf("Linux") == 0);
 	system.ipad = (navigator.userAgent.match(/iPad/i) != null) ? true : false;
 	if ((system.win || system.mac || system.xll || system.ipad) && !Vue.prototype.isMobile) {
-		var ua = navigator.userAgent.toLowerCase();
+		var ua = navigator.userAgent.toLowerCase();
 		if (ua.match(/MicroMessenger/i) == "micromessenger") {
 			// "在PC端微信上打开的"
-			Vue.prototype.env_val = 'pc_weixin';
+			Vue.prototype.env_val = 'pc_weixin';
 		} else {
 			// "在PC端非微信上打开的"
 			Vue.prototype.env_val = 'pc';
@@ -148,7 +148,7 @@ try{
 				Vue.prototype.provider = Vue.prototype.provider_alipay;
 			}
 			
-			if(Vue.prototype.xcxtype == -1){
+			if(Vue.prototype.xcxtype == -1){
 				Vue.prototype.isMobile = isMobile();
 				isOpenMode();
 			}else{
@@ -172,47 +172,47 @@ if(Vue.prototype.provider == Vue.prototype.provider_weixin) {
 	const pagesView = getCurrentPages();
 	const currentPageView = pagesView[pagesView.length - 1];
 	Vue.prototype.View = currentPageView+'New';
-}
+}
 
-const CODE_SUCCESS = 0;
-const CODE_ERROR = 40001;
-const CODE_LOGIN_EXIPRE = 40002;
-
-Vue.prototype.user_preview = 1;
-Vue.prototype.edit_preview = 2;
-Vue.prototype.add_preview = 3;
-Vue.prototype.edit_album = 4;
-
-function removeLogin() {
-	uni.removeStorageSync('token');
+const CODE_SUCCESS = 0;
+const CODE_ERROR = 40001;
+const CODE_LOGIN_EXIPRE = 40002;
+
+Vue.prototype.user_preview = 1;
+Vue.prototype.edit_preview = 2;
+Vue.prototype.add_preview = 3;
+Vue.prototype.edit_album = 4;
+
+function removeLogin() {
+	removeToken()
+	removeUinfo()
 }
 
-function req(url, data={}, method = 'POST', header={}) {
-	var domain = Vue.prototype.request_domain;
-	if(Vue.prototype.appid != '') {
-		data.appid = Vue.prototype.appid;
-		data.xcx_scource = Vue.prototype.USER_SOURCE_WX_XCX;
-	}else{
-		domain = '/api/user/';
-		if(Vue.prototype.isMobile){
-			data.xcx_scource = Vue.prototype.USER_SOURCE_H5;
-			if(Vue.prototype.env_val.indexOf('weixin') > -1) data.xcx_scource = Vue.prototype.USER_SOURCE_WX_H5;
-		}else{
-			data.xcx_scource = Vue.prototype.USER_SOURCE_PC;
-		}
-	}
-
-	var noNeedLoginFunc = [
-		'client/common/mp/config',
-		'client/user/login'
-	]
-	var isNeedLogin = !noNeedLoginFunc.includes(url);
-
-	var headerObj = {'content-type': 'application/x-www-form-urlencoded'};
-	var token = uni.getStorageSync('token');
-	if(token) headerObj.Authorization = token
-
-	var getWxH5LoginConfigUri = 'client/common/mp/config' 
+function req(url, data={}, method = 'POST', header={}) {
+	var domain = Vue.prototype.request_domain;
+	if(Vue.prototype.appid != '') {
+		data.appid = Vue.prototype.appid;
+		data.xcx_scource = Vue.prototype.USER_SOURCE_WX_XCX;
+	}else{
+		domain = '/api/';
+		if(Vue.prototype.isMobile){
+			data.xcx_scource = Vue.prototype.USER_SOURCE_H5;
+			if(Vue.prototype.env_val.indexOf('weixin') > -1) data.xcx_scource = Vue.prototype.USER_SOURCE_WX_H5;
+		}else{
+			data.xcx_scource = Vue.prototype.USER_SOURCE_PC;
+		}
+	}
+
+	var getWxH5LoginConfigUri = 'common/wxh5_login' 
+	var noNeedLoginFunc = [
+		getWxH5LoginConfigUri,
+		'client/user/login'
+	]
+	var isNeedLogin = !noNeedLoginFunc.includes(url);
+
+	var headerObj = {'content-type': 'application/x-www-form-urlencoded'};
+	var token = getToken();
+	if(token) headerObj.AUTH = token
 
 	return new Promise((resolve, reject) => {
 		uni.request({
@@ -222,49 +222,52 @@ function req(url, data={}, method = 'POST', header={}) {
 			header: headerObj,
 			async: false,
 			success(res) {
-				try{
-					var rdata = res.data;
-					if(rdata.code != CODE_SUCCESS) {
-						if((rdata.code==CODE_LOGIN_EXIPRE || rdata.msg.indexOf('Signature verification failed')>-1 || rdata.msg.indexOf('身份认证信息未提供')>-1) && data.xcx_scource == Vue.prototype.USER_SOURCE_WX_H5 && url != getWxH5LoginConfigUri && data.repeat != 1){
-							removeLogin();
-
+				try{
+					var rdata = res.data;
+					if(rdata.code != CODE_SUCCESS) {
+						if(rdata.code==CODE_LOGIN_EXIPRE && data.xcx_scource == Vue.prototype.USER_SOURCE_WX_H5 && url != getWxH5LoginConfigUri && data.repeat != 1){
+							removeLogin();
+
 							var logindatac = new Object();
-							logindatac.host = location.host;
+							logindatac.redirect_uri = location.origin;
+							logindatac.state = 'user';
+
 							const pagesc = getCurrentPages();
 							const currentPagec = pagesc[pagesc.length - 1];
-							var pageUrlc = '/'+currentPagec.route;
-							uni.setStorageSync('rebackPagePath', pageUrlc);
-							location.href = Vue.prototype.request_domain+'api/common/wxh5_login/?state=user'
-							// req(getWxH5LoginConfigUri, logindatac, 'GET').then(data=>{
-							// 	if(data == -1 || !data.user_authorize_url) return;
-							// 	location.href = data.user_authorize_url;
-							// });
+							var pageUrlc = '/'+currentPagec.route;
+							uni.setStorageSync('rebackPagePath', pageUrlc);
+							
+							var doctor_id = uni.getStorageSync('doctor_id');
+							req(getWxH5LoginConfigUri+'/?did='+doctor_id, logindatac, 'POST').then(data=>{
+								if(data == -1 || !data.authurl) return;
+								location.href = data.authurl;
+							});
 							return;
-						}
+						}
 
 						uni.showModal({
 							title: '提示',
 							showCancel: false,
 							content: rdata.msg ? rdata.msg+'|'+rdata.code : '网络错误，请重试|'+res.statusCode,
 							success: function (rs) {
-								if (rs.confirm && (rdata.code==CODE_LOGIN_EXIPRE || rdata.msg.indexOf('Signature verification failed')>-1 || rdata.msg.indexOf('身份认证信息未提供')>-1)) {
-									removeLogin();
-									const pages = getCurrentPages();
-									const currentPage = pages[pages.length - 1];
-									let pageUrl = '/'+currentPage.route;
-									if(data.xcx_scource == Vue.prototype.USER_SOURCE_WX_H5){
-										uni.navigateTo({
-											url: '/pages/index/index'
-										});
-									}else{
+								if (rs.confirm && rdata.code==CODE_LOGIN_EXIPRE) {
+									removeLogin();
+									const pages = getCurrentPages();
+									const currentPage = pages[pages.length - 1];
+									let pageUrl = '/'+currentPage.route;
+									if(data.xcx_scource == Vue.prototype.USER_SOURCE_WX_H5){
+										uni.navigateTo({
+											url: '/pages/index/index'
+										});
+									}else{
 									}
-									return;
+									return;
 								}
 							}
-						});
-						
+						});
+
 						return resolve("-1");
-					}else{
+					}else{
 						return resolve(res.data.data);
 					}
 				}catch(e){
@@ -290,26 +293,26 @@ function req(url, data={}, method = 'POST', header={}) {
 			}
 		});
 	});
-}
-
+}
+
 function xcx_login(url, eqdata={}, method = 'POST') {
-	return new Promise((resolve, reject) => {
-		wx.login({
-		  success (res) {
-			if (res.code) {
-			  var pdata = new Object();
-			  pdata.code = res.code;
-			  req('client/user/login', pdata, 'POST').then(data=>{
-					uni.setStorageSync('token', data.token);
-					eqdata.repeat = 1;
+	return new Promise((resolve, reject) => {
+		wx.login({
+		  success (res) {
+			if (res.code) {
+			  var pdata = new Object();
+			  pdata.code = res.code;
+			  req('client/user/login', pdata, 'POST').then(data=>{
+					setToken(data.token)
+					eqdata.repeat = 1;
 					req(url, eqdata, method).then(data=>{
-						return resolve(data);
-					});
-			  });
-			}
-		  }
+						return resolve(data);
+					});
+			  });
+			}
+		  }
 		});
-	})
+	})
 }
 
 function toPage(path){
@@ -336,25 +339,66 @@ function toPage(path){
 		}
 		
 	}
+}
+
+function modelShow(content, path="",title="提示") {
+	uni.showModal({
+		title: title,
+		showCancel: false,
+		content: content,
+		success: function (rs) {
+			if(rs.confirm && path != ""){
+				toPage(path);
+			}
+		}
+	});
+}
+
+function getToken() {
+	var did = uni.getStorageSync('doctor_id')
+	if(!did) return ""
+	return uni.getStorageSync('token_'+did)
+}
+
+function removeToken() {
+	var did = uni.getStorageSync('doctor_id')
+	if(!did) return ""
+	uni.removeStorageSync('token_'+did)
 }
 
-function modelShow(content, path="",title="提示") {
-	uni.showModal({
-		title: title,
-		showCancel: false,
-		content: content,
-		success: function (rs) {
-			if(rs.confirm && path != ""){
-				toPage(path);
-			}
-		}
-	});
+function setToken(token) {
+	var did = uni.getStorageSync('doctor_id')
+	if(!did) return ""
+	uni.setStorageSync('token_'+did, token)
 }
+
+function removeUinfo(){
+	var did = uni.getStorageSync('doctor_id')
+	if(!did) return ""
+	uni.removeStorageSync('uinfo_'+did)
+}
+
+function setUinfo(info){
+	var did = uni.getStorageSync('doctor_id')
+	if(!did) return;
+	uni.setStorageSync('uinfo_'+did, info)
+}
+
 
+//设置页main标题
+function setTitlefFunc(title) {
+	uni.setNavigationBarTitle({
+	  title: title || ''
+	});
+  };
+Vue.prototype.$setTitle = {setTitlefFunc}
 Vue.prototype.$pop = {modelShow}
 Vue.prototype.$func = {toPage}
-Vue.prototype.$http = {req}
-Vue.prototype.$trim = {trim}
+Vue.prototype.$http = {req}
+Vue.prototype.$trim = {trim}
+Vue.prototype.$token = {getToken}
+Vue.prototype.$settoken = {setToken}
+Vue.prototype.$setuinfo = {setUinfo}
 
 app.$mount()
 // #endif
diff --git a/manifest.json b/manifest.json
index befff9e..e27b0f0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -80,7 +80,7 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://api.checkcopy.com",
+                    "target" : "http://api.yizherenxin.cn",
                     "changeOrigin" : true,
                     "secure" : false
                 }
diff --git a/pages.json b/pages.json
index c118540..05f59bf 100644
--- a/pages.json
+++ b/pages.json
@@ -1,11 +1,11 @@
 {
 	"pages": [
-		{
+        {
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "预约就诊"
 			}
 		},
+        
         {
             "path" : "pages/prebook_list/prebook_list",
             "style" :
@@ -14,6 +14,7 @@
                 "enablePullDownRefresh": false
             }
         },
+		
         {
             "path" : "pages/book_detail/book_detail",
             "style" :                                                                                    
@@ -29,7 +30,6 @@
                 "navigationBarTitleText": "修改资料",
                 "enablePullDownRefresh": false
             }
-            
         },
         {
             "path" : "pages/usercenter/usercenter",
diff --git a/pages/book_detail/book_detail.vue b/pages/book_detail/book_detail.vue
index b085ef0..389bc53 100644
--- a/pages/book_detail/book_detail.vue
+++ b/pages/book_detail/book_detail.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
 	<view class="book-page btPadding" v-if="bookInfo">
 		<view class="list-box">
 			<list-box class="item-wrapper" v-if="item.show" v-for="(item,key) in list" :key="key" :leftTitle="item.leftTitle" :rightTitle="item.rightTitle?item.rightTitle:''">
@@ -19,21 +19,22 @@
 				<!-- <view class="btn primary btn1" hover-class="hover" v-if="showReBook && !showCancelBook" @click="rebook">重新预约</view> -->
 			</view>
 		</view>
-	</view>
-</template>
-
+	</view>
+</template>
+
 <script>
 	import listBox from '@/components/listBox.vue';
-	
-	export default {
-		data() {
+	
+	export default {
+		data() {
 			return {
-				statusList:['status_wait', 'status_ing', 'status_out_num', 'status_expire', 'status_down', 'status_expire'],
-				statusDescList:['候诊', '就诊中', '过号', '已过期', '已完成', '已取消'],
+				statusList:['status_wait', 'status_ing', 'status_down', 'status_out_num', 'status_expire', 'status_cancle'],
+				statusStyleList:{'0':'status_wait', '1':'status_ing', '2':'status_down', '3':'status_out_num', '4':'status_expire','5':'status_cancle'},
+				statusDescList:['候诊', '就诊中', '已完成','过号', '已过期',  '已取消'],
 				status:'',
 				queueNum:88,
 				bookDate:"2024.01.09 周二  09:30-12:00",
-				notice:"",
+				notice:"",
 				list:[
 					{'leftTitle':'状态','custom':"",show:true},
 					{'leftTitle':'就诊人','rightTitle':'',show:true},
@@ -46,18 +47,20 @@
 				showCancelBook:false,
 				redirect:'/pages/prebook_list/prebook_list',
 				bookId:false,
+				depart_id:false,
 				bookInfo:false,
 				showReBook:false,
-				cssUrl:this.cssUrl
-			}
+				cssUrl:this.cssUrl
+			}
 		},
 		onLoad(option) {
 			// if(option.index) this.redirect = '/pages/index/index'
 			if(option.id) this.bookId = option.id
+			if(option.depart_id) this.depart_id = option.depart_id
 			
 		},
 		onShow() {
-			if(!this.bookId){
+			if(!this.bookId || !this.depart_id){
 				this.$func.toPage('/pages/index/index')
 				return;
 			}
@@ -65,7 +68,7 @@
 		},
 		components:{
 			listBox
-		},
+		},
 		methods: {
 			cancelBook(){
 				var that = this
@@ -74,7 +77,11 @@
 					content:'确认取消预约?',
 					success(res) {
 						if(!res.confirm) return
-						that.$http.req('cancel_appoint', {appoint_id:that.bookId}, 'GET').then(data=>{
+						that.$http.req('user/cancel_appoint', {
+							appoint_id:that.bookId,
+							depart_id:that.depart_id
+						},
+						 'POST').then(data=>{
 							if(data == -1) return
 							that.getBookDetail()
 							uni.showToast({
@@ -82,8 +89,9 @@
 								mask:true,
 								image:that.cssUrl+'gou.svg',
 								times:false,
+								duration: 1500,
 								success() {
-									
+									that.$func.toPage('/pages/prebook_list/prebook_list')
 								}
 							})
 						});
@@ -97,39 +105,43 @@
 				this.$func.toPage('/pages/index/index')
 			},
 			getBookDetail(){
-				this.$http.req('get_appoint_detail', {appoint_id:this.bookId}, 'GET').then(data=>{
+				this.$http.req('user/get_appoint_detail', {appoint_id:this.bookId,depart_id:this.depart_id}, 'POST').then(data=>{
 					if(data == -1) {
 						this.bookInfo = false
 						return
 					}
 
 					var bookInfo = data
-					if(bookInfo && bookInfo.length <= 0){
-						this.$pop.modelShow('预约信息为空')
-						return
-					}
-
+				// 	if(bookInfo && bookInfo.length <= 0){
+				// 		this.$pop.modelShow('预约信息为空')
+				// 		return
+				// 	}
 					bookInfo = data
 					this.bookInfo = bookInfo
-					this.status = this.statusList[bookInfo.status]
-					if(bookInfo.status==0 || bookInfo.status==2) this.showCancelBook = true
-					this.list[0].custom = "<view class='"+this.status+" status'><view class='over status_text'>"+this.statusDescList[bookInfo.status]+"</view></view>"
-					this.list[1].rightTitle = bookInfo.visitor_name
+					this.status = this.statusStyleList[bookInfo.status]
+					if(bookInfo.status==0 || bookInfo.status==2){
+						this.showCancelBook = true
+					}else{
+						this.showCancelBook = false
+					}
+					this.list[0].custom = "<view class='"+this.status+" status'><view class='over status_text'>"+bookInfo.status_desc+"</view></view>"
+					this.list[1].rightTitle = bookInfo.name
 					this.list[2].rightTitle = bookInfo.hospital_name
 					this.list[3].rightTitle = bookInfo.depart_name
 					this.list[4].rightTitle = bookInfo.doctor_name ? bookInfo.doctor_name : '无'
-					this.list[5].custom = "<view class='queue-text'>前方<text class='queue-num-txt PfScSemibold'>"+bookInfo.wait_visit_count+"</text>人</view>"
-					if(bookInfo.wait_visit_count<=0 || bookInfo.status!=0) this.list[5].show = false
-					this.list[6].custom = "<view class='book-date"+(bookInfo.status==0?' wait':' expire')+"'>"+bookInfo.visit_date+' '+bookInfo.week+' '+bookInfo.visit_time+"</view>"
-					this.notice = bookInfo.notice
+					// this.list[5].custom = "<view class='queue-text'>前方<text class='queue-num-txt PfScSemibold'>"+bookInfo.wait_visit_count+"</text>人</view>"
+					// if(bookInfo.wait_visit_count<=0 || bookInfo.status!=0) this.list[5].show = false
+					this.list[5].show = false
+					this.list[6].custom = "<view class='book-date"+(bookInfo.status==0?' wait':' expire')+"'>"+bookInfo.visit_date+' '+bookInfo.week_desc+' '+bookInfo.visit_time+"</view>"
+					this.notice = bookInfo.notice;
 				});
-			}
-		}
-	}
-</script>
-
+			}
+		}
+	}
+</script>
+
 <style lang="scss" scoped>
-
+
 .book-page{
 	height: 100vh;
 	width: 100%;
@@ -153,16 +165,17 @@
 					.status_text{
 						display: flex;
 						border-radius: 6rpx;
-						font-size: 22rpx;
-						height: 32rpx;
-						line-height: 32rpx;
+						font-size: 26rpx;
+						height: 40rpx;
+						line-height: 40rpx;
 						padding:  0 10rpx;
 						box-sizing: border-box;
 						min-width: 90rpx;
 						display: block;
 						text-align: center;
+						min-width: 128rpx;
 					}
-					&.status_wait {
+					&.status_wait{
 						.status_text{
 							background: #F8FFF7;
 							border: 1rpx solid #5BD07A;
@@ -172,18 +185,18 @@
 					&.status_out_num{
 						.status_text{
 							background: #FFFAF7;
-							border: 1rpx solid #FE6710;
 							color: #FE6710;
+							border: 1px solid #FE6710;
 						}
 					}
 					&.status_down{
 						.status_text{
 							background: #FCFCFC;
-							border: 1rpx solid #AEB0B8;
-							color: #B6B8BF;
+							border: 1px solid #999999;
+							color: #999999;
 						}
 					}
-					&.status_expire{
+					&.status_expire,&.status_cancle{
 						.status_text{
 							background: #FCFCFC;
 							border: 1rpx solid #AEB0B8;
@@ -277,5 +290,5 @@
 	// 		<view class="btn primary">取消预约</view>
 	// 	</view>
 	// </view>
-}
-</style>
+}
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a2b88df..f9f1c56 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,19 +3,18 @@
 		<view class="header-wrapper flex">
 			<view class="left">
 				<view class="flex top PfScMedium">
-					<view class="ft50 over2">{{doctorInfo.doctor_info.name}}</view>
+					<view class="ft50 over2">{{doctorInfo.doctor_info.doctor_name}}</view>
 					<view v-if="doctor_dept">
 						<view class="over2">{{doctor_dept}}</view>
 					</view>
 				</view>
-				<view class="bt over2" v-if="doctorInfo.doctor_info.desc">
-					{{doctorInfo.doctor_info.desc}}
+				<view class="bt over2" v-if="doctorInfo.doctor_info.doctor_desc">
+					{{doctorInfo.doctor_info.doctor_desc}}
 				</view>
 			</view>
 			<img class="right" :src="doctorInfo.doctor_info.avator" alt="" @click="enlargePicture(doctorInfo.doctor_info.avator)" v-if="doctorInfo.doctor_info.avator">
 		</view>
-
-		<view class="block desc-wrapper" v-if="doctorInfo.doctor_info.detail">
+		<view class="block desc-wrapper" v-if="doctorInfo.doctor_info.doctor_detail">
 			<view class="title-wrapper flex">
 				<view class="title">
 					医生简介
@@ -23,25 +22,29 @@
 				<img :src="cssUrl+'right_bg.png'" alt="">
 			</view>
 			
-			<view class="con over2 over4">
-				{{doctorInfo.doctor_info.detail}}
+			<view class="con">
+			<!-- <view class="con over2 over4"> -->
+				{{doctorInfo.doctor_info.doctor_detail}}
 			</view>
 		</view>
-		
+
 		<view class="block hospital-wrapper" v-if="hospitals">
 			<view class="item" v-for="(item,key) in hospitals">
 				<view class="top flex">
 					<view class="left">
 						<view class="title flex">
-							<text class="over2">{{item.h_name}} {{item.depart_name}}</text>
-							<img :src="cssUrl+'index_comback.svg'" v-if="item.h_pos" @click="toLocation(item)">
+							<text class="over2 PfScMedium">{{item.hospital_name}} {{item.depart_name}}
+								 <!-- {{item.depart_name}} -->
+								  <!-- 科室 -->
+								</text>
+							<img :src="cssUrl+'index_comback.svg'" v-if="item.hospital_pos" @click="toLocation(item)">
 						</view>
-						<view class="date over2" v-if="item.visit_times">
-							出诊：{{item.visit_times}}
+						<view class="date over2 over4">
+							出诊：{{ item.workdate_desc }}
 						</view>
 					</view>
 					<view class="right">
-						<view class="flex right-wrapper" style="justify-content:flex-end;" v-if="item.h_pos">
+						<view class="flex right-wrapper" style="justify-content:flex-end;" v-if="item.hospital_pos">
 							<view class="" @click="toLocation(item)">
 								<img :src="cssUrl+'index_nav.svg'" alt="">
 								<view>导航</view>
@@ -70,9 +73,9 @@
 				</view>
 			</view>
 		</view>
-		<pre-book-list class="preg-books" :dataList="recentAppoint"></pre-book-list>
+		<pre-book-list class="preg-books" :dataList="recentAppoint" :topnopadding="true"></pre-book-list>
 
-		<tabbar current="1"></tabbar>
+		<tabbar current="1" leftButtonText="预约"></tabbar>
 	</view>
 </template>
 
@@ -91,7 +94,49 @@
 				doctor_dept:false,
 				hospitals:false,
 				recentAppoint:[],
-				loginToken:false
+				loginToken:false,
+				state:'',
+				workdate:[],
+				workPlan:{
+					1:'上午',
+					2:'下午',
+					3:'全天',
+				},
+				visitlist:[
+					{
+						"id": "16",
+						"depart_id": "18",
+						"name": "暴富喽",
+						"date": "2024-09-28",
+						"week_desc": "六",
+						"time_interval": "08:00-08:30",
+						"status_desc": "就诊完成",
+						"hospital_name": "北京LY暴富",
+						"depart_name": "针灸科"
+					},
+					{
+						"id": "15",
+						"depart_id": "18",
+						"name": "刘老铁",
+						"date": "2024-09-28",
+						"week_desc": "六",
+						"time_interval": "08:30-09:00",
+						"status_desc": "候诊",
+						"hospital_name": "北京LY暴富",
+						"depart_name": "针灸科"
+					},
+					{
+						"id": "14",
+						"depart_id": "18",
+						"name": "首富哈",
+						"date": "2024-09-28",
+						"week_desc": "六",
+						"time_interval": "08:00-08:30",
+						"status_desc": "过号",
+						"hospital_name": "北京LY暴富",
+						"depart_name": "针灸科"
+					},
+				]
 			}
 		},
 		components:{
@@ -99,12 +144,9 @@
 			preBookList,
 		},
 		onLoad(option) {
-			if(option.code) this.code = option.code
-			if(option.token) {
-				this.loginToken = option.token
-				uni.setStorageSync('token', this.loginToken)
-				// var rebackPagePath = uni.getStorageSync('rebackPagePath')
-				// if(!rebackPagePath)
+			if(option.code && option.state) {
+				this.code = option.code
+				this.state = option.state
 			}
 		},
 		async onShow() {
@@ -116,30 +158,37 @@
 			uni.setNavigationBarTitle({
 				title:title
 			})
-
-			// var token = uni.getStorageSync('token')
-			// if(this.code && !token) {
-			// 	var rebackPagePath = uni.getStorageSync('rebackPagePath')
-			// 	this.login()
-			// 	return
-			// }
+			var token = this.$token.getToken()
+			if(this.code && this.state && !token) {
+				var rebackPagePath = uni.getStorageSync('rebackPagePath')
+				this.login()
+				return
+			}
 			await this.getDoctorInfo()
 		},
+		// onReady() {
+		// 	// console.log(this.doctorInfo,'this.doctorInfo');
+		// 	uni.setNavigationBarTitle({
+		// 		title: + '医生预约就诊'
+		// 	})
+		// },
+		// "navigationBarTitleText": "预约就诊"
+
 		methods: {
 			toLocation(hospital){
 				var that = this
 				uni.showActionSheet({
 					itemList: ['腾讯地图', '百度地图', '高德地图'],
 					success: function (res) {
-						var  lngLat = hospital.h_pos.toString().split(',')
+						var  lngLat = hospital.hospital_pos.toString().split(',')
 						var lng = lngLat[0].toString()
 						, lat = lngLat[1].toString()
 
 						var baiduLngLat = that.qqMapTransBMap(lng, lat)
 						var mapList = [
-							'http://apis.map.qq.com/uri/v1/marker?marker=coord:'+ lat+','+lng+';addr:'+hospital.h_name,
-							'http://api.map.baidu.com/marker?location='+baiduLngLat.lat+','+baiduLngLat.lng+'&title='+hospital.h_name+'&content=即将前往目的地&output=html&src=webapp.baidu.openAPIdemo',
-							'https://m.amap.com/share/index/lnglat='+hospital.h_pos+'&name='+hospital.h_name+'&src=uriapi&innersrc=uriapi',
+							'http://apis.map.qq.com/uri/v1/marker?marker=coord:'+ lat+','+lng+';addr:'+hospital.hospital_name,
+							'http://api.map.baidu.com/marker?location='+baiduLngLat.lat+','+baiduLngLat.lng+'&title='+hospital.hospital_name+'&content=即将前往目的地&output=html&src=webapp.baidu.openAPIdemo',
+							'https://m.amap.com/share/index/lnglat='+hospital.hospital_pos+'&name='+hospital.hospital_name+'&src=uriapi&innersrc=uriapi',
 						]
 						// return;
 						location.href = mapList[res.tapIndex]
@@ -148,35 +197,75 @@
 					}
 				});
 			},
+			setLoginUserInfo(info) {
+				var uinfo = new Object();
+				this.$setuinfo.setUinfo(JSON.stringify(info))
+			},
 			login() {
-				// this.$http.req('login', {code:this.code}, 'POST').then(data=>{
-				// 	if(data == -1) return
-				// 	uni.setStorageSync('token', data.token)
-				// 	var rebackPagePath = uni.getStorageSync('rebackPagePath')
-				// 	if(rebackPagePath){
-				// 		uni.navigateTo({
-				// 			url:rebackPagePath
-				// 		})
-				// 	}
-				// });
+				this.$http.req('common/get_user_info', {code:this.code,state:this.state}, 'POST').then(data=>{
+					if(data == -1) return
+					this.$settoken.setToken(data.jwttoken)
+					
+					this.setLoginUserInfo(data)
+					this.getDoctorInfo()
+					// var rebackPagePath = uni.getStorageSync('rebackPagePath')
+					// if(rebackPagePath){
+					// 	uni.navigateTo({
+					// 		url:rebackPagePath
+					// 	})
+					// }
+				});
+				
 			},
 			async getDoctorInfo() {
-				// if(this.loginToken) return;
-				await this.$http.req('index_info', {}, 'GET').then(data=>{
+				await this.$http.req('user/index_info', {}, 'GET').then(data=>{
 					if(data == -1) return
-					this.pageShow = true
-					this.doctorInfo = data
-					if(this.doctorInfo.doctor_info && this.doctorInfo.doctor_info.depart_name.length>0){
-						this.doctor_dept = this.doctorInfo.doctor_info.depart_name
+					this.pageShow = true;
+					let visitFlag = true;
+					this.doctorInfo = data;
+					console.log(data)
+					if(this.doctorInfo.doctor_info &&  this.doctorInfo.doctor_info.depart_name && this.doctorInfo.doctor_info.depart_name.length>0){
+						this.doctor_dept = this.doctorInfo.doctor_info.depart_name;
 					}
-
-					if(this.doctorInfo.hospital_list && this.doctorInfo.hospital_list.length>0){
-						this.hospitals = this.doctorInfo.hospital_list
+					if(this.doctorInfo.hospital_departs && this.doctorInfo.hospital_departs.length>0){
+						this.hospitals = this.doctorInfo.hospital_departs;
+						this.doctor_dept = this.doctorInfo.hospital_departs[0]['depart_name'];
+						this.doctorInfo.doctor_info.depart_name = this.doctor_dept;
+					}else{
+						visitFlag = false;
+					}
+					if(this.doctorInfo.visit_list && this.doctorInfo.visit_list.length>0){
+						this.recentAppoint = this.doctorInfo.visit_list;
 					}
-					var docname = this.doctorInfo.doctor_info.name
-					if(this.doctorInfo.appoint_list && this.doctorInfo.appoint_list.length>0){
-						this.recentAppoint = this.doctorInfo.appoint_list
+					if(this.doctorInfo.workdate && Object.keys(this.doctorInfo.workdate).length > 0){
+						this.workdate = this.doctorInfo.workdate;
+					}else{
+						visitFlag = false;
 					}
+					// if(visitFlag){//暂时注释
+						// let workDatKeyArr = Object.keys(this.workdate);
+						// let workDateValArr = Object.values(this.workdate);
+						// let timeList = [];
+						this.hospital_departs = this.doctorInfo.hospital_departs.map((item,index)=>{
+							item.workdate_desc = this.doctorInfo.workdate_desc[item.depart_id]
+							// let indexofNum = workDatKeyArr.indexOf(item.depart_id);
+							// if(indexofNum > -1){
+							// 	let departCurItem = workDateValArr[indexofNum];
+							// 	let flag = Array.isArray(departCurItem)
+							// 	if(flag){
+							// 		item.visit_time = data.workdate_desc[item.depart_id]
+							// 		item.plan =0
+							// 	}else{
+							// 		for(let key in departCurItem){
+							// 			let dateItem = departCurItem[key];
+							// 			if(Number(dateItem.plan) === 0)continue
+							// 			timeList.push(dateItem.week_desc+this.workPlan[dateItem.plan])
+							// 			item.visit_time = timeList.join('、')
+							// 		}
+							// 	}
+							// }
+							return item
+						})
 				});
 			},
 			enlargePicture(imgUrl) {
@@ -244,7 +333,7 @@
 							width: auto;
 							padding: 0 15rpx;
 							min-width: 125rpx;
-							margin-top: 14rpx;
+							margin-top: 5rpx;
 							line-height: 42rpx;
 							text-align: center;
 							font-size: 28rpx;
@@ -285,7 +374,9 @@
 			font-size: 30rpx;
 			line-height: 50rpx;
 			.con{
-				height: auto;
+				// height: auto;
+				overflow-y: auto;
+    			max-height: 200rpx;
 			}
 		}
 		.title-wrapper{
@@ -338,6 +429,7 @@
 					.right{
 						width: 200rpx;
 						height: 100%;
+						color: #666666;
 						img{
 							width: 52rpx;
 							height: 52rpx;
@@ -374,7 +466,7 @@
 					img{
 						width: 20rpx;
 						height: 32rpx;
-						margin-top: 8rpx;
+						// margin-top: 8rpx;
 						margin-left: 8rpx;
 					}
 				}
@@ -385,4 +477,4 @@
 			margin: 0 auto;
 		}
 	}
-</style>
+</style>
diff --git a/pages/modify_visitor/modify_visitor.vue b/pages/modify_visitor/modify_visitor.vue
index 92c8e9d..6c4b5c3 100644
--- a/pages/modify_visitor/modify_visitor.vue
+++ b/pages/modify_visitor/modify_visitor.vue
@@ -1,37 +1,44 @@
-<template>
+<template>
 	<view class="visitor-form-page">
 		<view class="block">
 			<view class="title PfScMedium">就诊人信息</view>
 			<input-box class="inputcom-wrapper" v-model="name" holder="就诊人姓名" label="姓名" @blurEvent="nameBlurEvent"></input-box>
-			<input-box class="inputcom-wrapper" v-model="idcardExt" holder="请输入身份证后4位" label="身份证尾号" @blurEvent="idCardBlurEvent" rule="idcardext"></input-box>
+			<input-box class="inputcom-wrapper" v-model="idcard" holder="请输入身份证号" label="身份证号" @blurEvent="idCardBlurEvent" rule="idcard"></input-box>
 			<input-box class="inputcom-wrapper" v-model="phone" holder="请输入就诊人手机号" label="常用手机号" @blurEvent="phoneBlurEvent" rule="phone"></input-box>
 		</view>
 
-		<view class="submit-wrapper btPadding">
+		<view class="submit-wrapper btPadding" v-if="!vid">
 			<view :class="'btn btn3 submit'+(canSubmit?' primary':' noclick')" :hover-class="(canSubmit?'hover':'')" @click="submit">
 				确认就诊人
 			</view>
 		</view>
-	</view>
-</template>
-
+		<view class="fixedBot btPadding" v-if="vid">
+			<view class="submit">
+				<view class="btn cancel btn1" @click="reback">取消</view>
+				<view class="btn primary btn1" hover-class="hover" @click="submit">确认</view>
+			</view>
+		</view>
+	</view>
+</template>
+
 <script>
 	import InputBox from '@/components/inputBox.vue';
-
-	export default {
-		data() {
-			return {
+
+	export default {
+		data() {
+			return {
 				canSubmit:false,
 				name:'',
 				nameRule:false,
-				idcardExt:'',
+				idcard:'',
 				idcardExtRule:false,
 				phone:'',
 				phoneRule:false,
 				type:1,
 				adding:false,
-				vid:false
-			}
+				vid:false,
+				visitor_info:{}
+			}
 		},
 		components:{
 			InputBox
@@ -42,56 +49,61 @@
 		},
 		onShow() {
 			if(this.vid) this.getVisitorInfo()
-		},
+		},
 		methods: {
 			add() {
 				if(this.adding) return
 				this.adding = true
 				var param = new Object()
 				param.name = this.name
-				param.idcard_ext = this.idcardExt
+				param.idcard = this.idcard
 				param.phone = this.phone
 				var that = this
 				var addtimer = setTimeout(function() {
 					that.adding = false
 				}, 5000);
 				
-				var req = 'setting_visitor/'
+				var req = 'user/add_visitor'
 				var method = 'POST'
 				if(this.vid){
 					param.id = this.vid
+					req = 'user/update_visitor'
 				}
  
 				this.$http.req(req, param, method, true).then(data=>{
 					clearTimeout(addtimer)
 					this.adding = false
-					if(data == -1) return
+					if(this.vid){
+						uni.removeStorageSync('visitor_info_'+ this.vid)
+					}
 					this.$func.toPage('/pages/visitors/visitors?type='+this.type)
 				});
 			},
 			getVisitorInfo() {
-				this.$http.req('get_visitor_info', {id:this.vid}, 'GET', true).then(data=>{
-					if(data == -1) {
-						this.$func.toPage('/pages/index/index')
-						return
-					}
-
-					this.name = data.name
-					this.idcardExt = data.idcard_ext
-					this.phone = data.phone
+				this.visitor_info = JSON.parse(uni.getStorageSync('visitor_info_'+ this.vid))
+				//获取就诊人详细信息？？？
+				// this.$http.req('user/get_visitor_info', {id:this.vid}, 'GET', true).then(data=>{
+				// 	if(data == -1) {
+				// 		this.$func.toPage('/pages/index/index')
+				// 		return
+				// 	}
+				console.log(this.visitor_info,'visitor_info');
+					this.name = this.visitor_info.name
+					this.idcard = this.visitor_info.idcard
+					this.phone = this.visitor_info.phone
 					this.nameRule = true
 					this.idcardExtRule = true
 					this.phoneRule = true
 					this.checkSubmit()
-				});
-			},
+				// });
+			},
 			nameBlurEvent(value, res){
 				this.name = value
 				this.nameRule = res
 				this.checkSubmit()
 			},
 			idCardBlurEvent(value, res){
-				this.idcardExt = value
+				this.idcard = value
 				this.idcardExtRule = res
 				this.checkSubmit()
 			},
@@ -105,15 +117,21 @@
 				if(!this.nameRule || !this.idcardExtRule || !this.phoneRule) return
 				this.canSubmit = true
 			},
+			reback(){
+				if(this.vid){
+					uni.removeStorageSync('visitor_info_'+ this.vid)
+				}
+				this.$func.toPage('/pages/visitors/visitors')
+			},
 			submit(){
 				this.checkSubmit()
 				if(!this.canSubmit) return
 				this.add()
-			}
-		}
-	}
-</script>
-
+			}
+		}
+	}
+</script>
+
 <style lang="scss" scoped>
 	.visitor-form-page{
 		background: #F8F8F8;
@@ -121,7 +139,7 @@
 		overflow-y: scroll;
 		.block{
 			min-height: 50vh;
-			min-height: 562rpx;
+			min-height: 662rpx;
 			background: #FFFFFF;
 			box-shadow: 0rpx 2rpx 24rpx 0rpx rgba(0,0,0,0.03);
 			border-radius: 8rpx;
@@ -149,6 +167,24 @@
 		.submit{
 			margin: 0 auto;
 		}
-	}
-	
-</style>
+		.fixedBot{
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			height: 124rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx -2rpx 6rpx 0rpx rgba(181,181,181,0.13);
+			backdrop-filter: blur(20rpx);
+			display: flex;
+			.submit{
+				width: 100%;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				column-gap: 50rpx;
+			}
+		}
+	}
+	
+</style>
diff --git a/pages/prebook/prebook.vue b/pages/prebook/prebook.vue
index 2114723..59b63a3 100644
--- a/pages/prebook/prebook.vue
+++ b/pages/prebook/prebook.vue
@@ -1,19 +1,19 @@
-<template>
-	<view class="page-prebook">
+<template>
+	<view class="page-prebook">
 		<view class="title flex">
 			<img :src="cssUrl+'ten.svg'">
-			{{depart.h_name}} {{depart.depart_name}}
+			{{depart.hospital_name}} {{depart.depart_name}}
 		</view>
-		<book ref="book" @confirmSubmitEvent="showConfirm" :RegistrationTimeList="RegistrationTimeList" :visitorList="activeVisitors"/>
+		<book ref="book" @confirmSubmitEvent="showConfirm" @getAvailabletRegistrationTime = "getAvailabletRegistrationTime" :visitorList="activeVisitors"/>
 		<slider-box ref="sliderbox">
 			<view class="slider-title PfScMedium">预约信息确认</view>
 			<view class="members-box" v-if="needSelectMembers">
-				<view class="desc">当前时段余号不足，只能预约{{times.remain_num}}人</view>
+				<view class="desc">当前时段余号不足，只能预约{{times.remain}}人</view>
 				<view class="members">
 					<view :class="'memmbers-item'+(item.choose?' active':'')" v-for="(item,key) in activeVisitors" @click="chooseVisitor(key)">
 						<img :src="cssUrl+'checkbox_false.svg'">
 						<img :src="cssUrl+'checkbox_true.svg'">
-						{{item.visitor_name}}
+						{{item.name}}
 					</view>
 				</view>
 			</view>
@@ -21,39 +21,39 @@
 				<view class="left">就诊人：</view>
 				<view class="right over2 over5">
 					<text v-for="(item,key) in activeVisitors">
-						<text v-if="key<=9">{{nums[key]}}</text><text v-else>n.</text>{{item.visitor_name}}
+						<text v-if="key<=9">{{nums[key]}}</text><text v-else>n.</text>{{item.name}}
 					</text>
 				</view>
 			</view>
 			<view class="item" >
 				<view class="left">医生姓名：</view>
-				<view class="right">{{doctorInfo.doctor_info.name}}</view>
+				<view class="right">{{doctorInfo.doctor_info.doctor_name}}</view>
 			</view>
 			<view class="item">
 				<view class="left">就诊医院：</view>
-				<view class="right over2 over5">{{depart.h_name}} {{depart.depart_name}}</view>
+				<view class="right over2 over5">{{depart.hospital_name}} {{depart.depart_name}}</view>
 			</view>
 			<view class="item">
 				<view class="left">看诊时间：</view>
-				<view class="right orange">{{times.date}} {{times.time_desc}} {{times.start_time}}-{{times.end_time}}</view>
+				<view class="right orange">{{times.date}} {{times.time_desc}} {{times.time_interval}}</view>
 			</view>
 
 			<view class="btns-box flex">
 				<view class="btn cancel btn1" hover-class="hover" @click="closeConfirm">我再想想</view>
 				<view class="primary btn btn1" hover-class="hover" @click="submitConfim">确认预约</view>
 			</view>
-		</slider-box>
-	</view>
-</template>
-
+		</slider-box>
+	</view>
+</template>
+
 <script>
-	import Book from '@/components/bookBox.vue'
-	import SliderBox from '@/components/sliderBox.vue'
+	import Book from '@/components/bookBox.vue'
+	import SliderBox from '@/components/sliderBox.vue'
 	export default {
 		onLoad(op) {
-		},
-		data() {
-			return {
+		},
+		data() {
+			return {
 				cssUrl:this.cssUrl,
 				needSelectMembers:false,
 				doctorId:false,
@@ -66,8 +66,8 @@
 				chooseVisitorCount:0,
 				departId:false,
 				depart:false,
-				visit_nums_id:false
-			}
+				visitor_ids:false,
+			}
 		},
 		components:{
 			Book,
@@ -94,8 +94,8 @@
 				return
 			}
 			this.depart = JSON.parse(this.depart)
-			this.getAvailabletRegistrationTime()
-		},
+			this.getAvailabletRegistrationTime(true)
+		},
 		methods: {
 			chooseVisitor(key){
 				var visitor = this.activeVisitors[key]
@@ -129,116 +129,64 @@
 					}
 				})
 			},
-			getAvailabletRegistrationTime(refresh = true, chooseDay = '') {
-				this.$http.req('get_appoint_times',{depart_id:this.departId}, 'GET').then(data=>{
-					if(data == -1) return
-					// data.days = [
-					// 	{
-					// 		date: "2024-04-17", type: 2, type_text: "上午出诊", weekday: "周一", 
-					// 		am: [
-					// 			{
-					// 				"start": "12:00",
-					// 				"end": "12:30",
-					// 				"bed_count": 0
-					// 			},
-					// 			{
-					// 				"start": "13:00",
-					// 				"end": "14:30",
-					// 				"bed_count": 2
-					// 			}
-					// 		],
-					// 		pm: []
-					// 	},
-					// 	{
-					// 		date: "2024-04-18", type: 5, type_text: "未开放预约", weekday: "周二", am: [], pm: []
-					// 	},
-					// 	{
-					// 		date: "2024-04-19", type: 3, type_text: "全天出诊", weekday: "周三", am: [
-					// 			{
-					// 				"start": "12:00",
-					// 				"end": "12:30",
-					// 				"bed_count": 0
-					// 			},
-					// 			{
-					// 				"start": "13:00",
-					// 				"end": "14:30",
-					// 				"bed_count": 2
-					// 			}
-					// 		], pm: [
-					// 			{
-					// 				"start": "12:00",
-					// 				"end": "12:30",
-					// 				"bed_count": 0
-					// 			},
-					// 			{
-					// 				"start": "13:00",
-					// 				"end": "14:30",
-					// 				"bed_count": 8
-					// 			}
-					// 		]
-					// 	},
-					// 	{
-					// 		date: "2024-04-20", type: 4, type_text: "下午出诊", weekday: "周四", am: [], pm: [
-					// 			{
-					// 				"start": "12:00",
-					// 				"end": "12:30",
-					// 				"bed_count": 0
-					// 			},
-					// 			{
-					// 				"start": "13:00",
-					// 				"end": "14:30",
-					// 				"bed_count": 1
-					// 			}
-					// 		]
-					// 	},
-					// 	{
-					// 		date: "2024-04-21", type: 1, type_text: "全天休息", weekday: "周五", am: [], pm: []
-					// 	},
-					// ]
-
-					// if(!refresh){
-					// 	// data.days[3].pm[1].bed_count=0
-					// 	// data.days[3].type=1
-					// 	data.days = [
-					// 		{
-					// 			date: "2024-04-17", type: 2, type_text: "上午出诊", weekday: "周一", 
-					// 			am: [
-					// 				{
-					// 					"start": "12:00",
-					// 					"end": "12:30",
-					// 					"bed_count": 0
-					// 				},
-					// 				{
-					// 					"start": "13:00",
-					// 					"end": "14:30",
-					// 					"bed_count": 2
-					// 				}
-					// 			],
-					// 			pm: []
-					// 		},
-					// 		{
-					// 			date: "2024-04-18", type: 5, type_text: "未开放预约", weekday: "周二", am: [], pm: []
-					// 		}
-					// 	]
-					// }
-
-					this.RegistrationTimeList = data
-					if(this.RegistrationTimeList.length>0) {
-						if(refresh || chooseDay>=this.RegistrationTimeList.length) {
-							this.$refs.book.dataInit(this.RegistrationTimeList[0])
+			getAvailabletRegistrationTime(flag,date) {
+				const param = {
+					depart_id:this.departId,
+					date:date?date:''
+				}
+				//仅测试
+				// const data1={"date2work":{"2024-12-09":{"date":"2024-12-09","week_desc":"周三","work_desc":"上午出诊"},"2024-12-10":{"date":"2024-12-10","week_desc":"周四","work_desc":"上午出诊"},"2024-12-11":{"date":"2024-12-11","week_desc":"周五","work_desc":"不出诊"},"2024-09-30":{"date":"2024-09-30","week_desc":"周一","work_desc":"下午出诊"},"2024-10-01":{"date":"2024-10-01","week_desc":"周二","work_desc":"全天出诊"},"2024-10-02":{"date":"2024-10-02","week_desc":"周三","work_desc":"上午出诊"},"2024-10-03":{"date":"2024-10-03","week_desc":"周四","work_desc":"上午出诊"}},
+				// "date2time":{
+				// 	"am":[
+				// 		"8:00-08:30","08:30-09:00","09:00-09:30","09:30-10:00","10:00-10:30","10:30-11:00","11:00-11:30","11:30-12:00"
+				// 	],"pm":[
+				// 		"13:00-13:30",
+				// 		"13:30-14:00",
+				// 		"14:00-14:30",
+				// 		"14:30-15:00",
+				// 		"15:00-15:30",
+				// 		"15:30-16:00",
+				// 		"14:00-14:30",
+				// 		"14:30-15:00",
+				// 		"15:00-15:30",
+				// 		"15:30-16:00",
+				// 		"16:00-16:30",
+				// 		"16:30-17:00",
+				// 	]},
+				// 	"time2remain":{"8:00-08:30":1,"08:30-09:00":2,"09:00-09:30":20,"09:30-10:00":20,"10:00-10:30":20,"10:30-11:00":20,"11:00-11:30":20,"11:30-12:00":20}}
+				this.$http.req('/user/get_appoint_times',param, 'POST').then(data=>{
+					let date2work =  data.date2work
+					// let date2work =  data1.date2work;//后续可删除
+					let regxp = /^0/;
+					for(let key in date2work){
+						let itemObj = date2work[key];
+						let month = itemObj.date.split('-')[1];
+						let day = itemObj.date.split('-')[2];
+						itemObj['day'] = day;
+						if(regxp.test(month)){
+							itemObj['month'] = month.replace('0','')
 						}else{
-							this.$refs.book.chooseDay(chooseDay, this.RegistrationTimeList[chooseDay])
+							itemObj['month'] = month
 						}
 					}
+					// this.RegistrationTimeList = date2work
+					// if(this.RegistrationTimeList.length>0) {
+						if(flag) {
+							// this.$refs.book.dataInit(data1['date2time'],data1['time2remain'])
+							this.$refs.book.dataInit(data,date)
+							// this.$refs.book.dataInit(data['date2time'],data['time2remain'],date)
+						// }else{
+						// 	this.$refs.book.chooseDay(chooseDay, this.RegistrationTimeList[chooseDay])
+						}
+					// }
 				});
-			},
+			},
 			closeConfirm() {
 				this.$refs.sliderbox.closeConfirm()
 			},
 			appoint() {
 				var param = new Object()
 				param.depart_id = this.departId
-				param.visit_nums_id = this.visit_nums_id
 				var uids = new Array()
 				for (var i = 0; i < this.activeVisitors.length; i++) {
 					var visitor = this.activeVisitors[i]
@@ -252,48 +200,45 @@
 
 				if(uids.length <= 0){
 					this.$pop.modelShow('请选择预约就诊人')
+					console.log(88888);
 					return
 				}
 
-				if(uids.length > this.times.remain_num){
-					this.$pop.modelShow('当前时段余号不足，只能预约'+this.times.remain_num+'人')
+				if(uids.length > this.times.remain){
+					this.$pop.modelShow('当前时段余号不足，只能预约'+this.times.remain+'人')
 					return
 				}
-				param.visitor_ids = uids.join(',')
-
+				param.visitor_ids = uids;
+				param.time_interval = this.times.time_interval;
+				param.date = this.times.date;
 				this.chooseVisitorCount = uids.length
-				this.$http.req('appoint', param).then(data=>{
+				this.$http.req('user/appoint', param,'POST').then(data=>{
 					if(data == -1) return
 					this.tips()
 				});
 			},
-			appointCheck(times, chooseDay='', visit_nums_id){
-				var param = new Object()
-				param.depart_id = this.departId
-				this.visit_nums_id = param.visit_nums_id = visit_nums_id
-
-				var visitor_ids = new Array();
+			appointCheck(times){
+				var param = {...times}
+				param.depart_id = this.departId;
+				let visitor_ids = new Array();
 				for (var i = 0; i < this.activeVisitors.length; i++) {
 					visitor_ids.push(this.activeVisitors[i].id)
 				}
-				param.visitor_ids = visitor_ids.join(',')
-
-				this.times = param
-				this.times.date = times.date.date
-				this.times.start_time = times.start
-				this.times.end_time = times.end
-				this.times.time_desc = '下午'
-				if(times.type == 1) this.times.time_desc = '上午'
-
-				this.$http.req('check_appoint_nums', param).then(data=>{
-					if(data == -1) {
-						this.getAvailabletRegistrationTime(false, chooseDay)
-						return
-					}
-
-					if(data.remain_num < this.activeVisitors.length){
+				
+				param.visitor_ids = this.visitor_ids = visitor_ids;
+				this.times = param;
+				this.times.date = times.date;
+				this.times.time_desc = '下午';
+				if(times.type == 1) this.times.time_desc = '上午';
+				this.$http.req('user/check_appoint_nums', param,'POST').then(data=>{
+					// if(data == -1) {
+					// 	this.getAvailabletRegistrationTime(false, chooseDay)
+					// 	return
+					// }
+					let remain = 1
+					if(data.remain < this.activeVisitors.length){
 						this.needSelectMembers = true
-						this.$set(this.times, 'remain_num', data.remain_num)
+						this.$set(this.times, 'remain', data.remain)
 						this.$refs.sliderbox.showConfirm()
 					}else{
 						this.$refs.sliderbox.showConfirm()
@@ -301,16 +246,16 @@
 				});
 			},
 			showConfirm(times) {
-				this.appointCheck(times, times.key, times.id)
+				this.appointCheck(times)
 			},
 			submitConfim(){
 				this.appoint()
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
 	.page-prebook{
 		width: 100%;
 		height: 100vh;
@@ -444,5 +389,5 @@
 				}
 			}
 		}
-	}
-</style>
+	}
+</style>
diff --git a/pages/prebook_list/prebook_list.vue b/pages/prebook_list/prebook_list.vue
index e0bf99b..aefe447 100644
--- a/pages/prebook_list/prebook_list.vue
+++ b/pages/prebook_list/prebook_list.vue
@@ -1,311 +1,118 @@
 <template>
 	<view class="page-prebook-list">
-		<view class="nav">
-			<view :class="'item'+(userSelectIndex==0?' active':'')" @click="selectUser(0)">全部</view>
-			<view :class="'item'+(userSelectIndex==(key+1)?' active':'')" v-for="(item,key) in vistors" @click="selectUser(key+1)">{{item.visitor_name}}</view>
-		</view>
-		<pre-book-list class="preg-books" :dataList="bookList"></pre-book-list>
+		<view class="nav">
+			<view :class="'item'+(userSelectIndex==0?' active':'')" @click="selectUser(0)">全部</view>
+			<view :class="'item'+(userSelectIndex==(key+1)?' active':'')" v-for="(item,key) in vistors" @click="selectUser(key+1)">{{item.name}}</view>
+		</view>
+		<pre-book-list class="preg-books" :dataList="bookList"></pre-book-list>
 	</view>
 </template>
 
-<script>
+<script>
 	import preBookList from '@/components/preBookList.vue'
 	export default {
 		data() {
 			return {
-				userSelectIndex:0,
-				vistors:false,
+				userSelectIndex:0,
+				vistors:false,
 				bookList:[]
 			}
-		},
-		components:{
-			preBookList
-		},
-		onShow(){
-			this.getVisitors()
 		},
-		methods: {
-			selectUser(key){
-				this.userSelectIndex = key
-				this.getBookData()
-			},
-			getBookData() {
-				var param = new Object()
-				param.page = 1
-				param.limit = 10000
-				if(this.userSelectIndex-1 >= 0){
-					param.visitor_id = this.vistors[this.userSelectIndex-1].id
-					console.log(this.vistors)
-				}
-				uni.showLoading({
-					title:'加载中',
-					mask:true
-				})
-				var timerobj = setTimeout(function(){
-					uni.hideLoading()
-				}, 3000)
-				this.$http.req('get_appoints', param, 'POST', true).then(data=>{
-					clearTimeout(timerobj)
-					uni.hideLoading()
-					if(data == -1) return
-					this.bookList = data.data
-					// this.bookList = [
-					// 		  {
-					// 			"id": 27,
-					// 			"user_ids": [],
-					// 			"user_infos": null,
-					// 			"doctor_id": 2,
-					// 			"date": "2024-04-03",
-					// 			"username": "阿兰",
-					// 			"create_datetime": "2024-04-03 15:44:26",
-					// 			"visit_hospital": {
-					// 			  "id": 1,
-					// 			  "visit_day_text": "周一下午,周二上午,周三下午",
-					// 			  "hospital_name": "测试医院",
-					// 			  "hospital_location": "34.5145141,25.6414014",
-					// 			  "hospital_dept_name": "呼吸科",
-					// 			  "remind_text": "你好"
-					// 			},
-					// 			"wait_count": 10,
-					// 			"handler_type": 1,
-					// 			"start_time": "16:00",
-					// 			"end_time": "16:30",
-					// 			"status": 0
-					// 		  },
-					// 		  {
-					// 			"id": 26,
-					// 			"user_ids": [],
-					// 			"user_infos": null,
-					// 			"doctor_id": 2,
-					// 			"date": "2024-04-03",
-					// 			"username": "张三",
-					// 			"create_datetime": "2024-04-03 14:57:17",
-					// 			"visit_hospital": {
-					// 			  "id": 1,
-					// 			  "visit_day_text": "周一下午,周二上午,周三下午",
-					// 			  "hospital_name": "测试医院",
-					// 			  "hospital_location": "34.5145141,25.6414014",
-					// 			  "hospital_dept_name": "呼吸科",
-					// 			  "remind_text": "你好"
-					// 			},
-					// 			"wait_count": 0,
-					// 			"handler_type": 1,
-					// 			"start_time": "15:00",
-					// 			"end_time": "15:30",
-					// 			"status": 2
-					// 		  },
-					// 		  {
-					// 			"id": 25,
-					// 			"user_ids": [],
-					// 			"user_infos": null,
-					// 			"doctor_id": 1,
-					// 			"date": "2024-03-30",
-					// 			"username": "阿兰",
-					// 			"create_datetime": "2024-03-30 08:48:17",
-					// 			"visit_hospital": {
-					// 			  "id": 1,
-					// 			  "visit_day_text": "周一下午,周二上午,周三下午",
-					// 			  "hospital_name": "测试医院",
-					// 			  "hospital_location": "34.5145141,25.6414014",
-					// 			  "hospital_dept_name": "呼吸科",
-					// 			  "remind_text": "你好"
-					// 			},
-					// 			"wait_count": 0,
-					// 			"handler_type": 1,
-					// 			"start_time": "09:00",
-					// 			"end_time": "09:30",
-					// 			"status": 2
-					// 		  },
-					// 		  {
-					// 			"id": 24,
-					// 			"user_ids": [],
-					// 			"user_infos": null,
-					// 			"doctor_id": 2,
-					// 			"date": "2024-03-30",
-					// 			"username": "张三",
-					// 			"create_datetime": "2024-03-30 07:46:51",
-					// 			"visit_hospital": {
-					// 			  "id": 1,
-					// 			  "visit_day_text": "周一下午,周二上午,周三下午",
-					// 			  "hospital_name": "测试医院",
-					// 			  "hospital_location": "34.5145141,25.6414014",
-					// 			  "hospital_dept_name": "呼吸科",
-					// 			  "remind_text": "你好"
-					// 			},
-					// 			"wait_count": 0,
-					// 			"handler_type": 2,
-					// 			"start_time": "14:00",
-					// 			"end_time": "14:30",
-					// 			"status": 1
-					// 		  },
-					// 		  {
-					// 			"id": 23,
-					// 			"user_ids": [],
-					// 			"user_infos": null,
-					// 			"doctor_id": 1,
-					// 			"date": "2024-03-31",
-					// 			"username": "张三",
-					// 			"create_datetime": "2024-03-30 06:50:52",
-					// 			"visit_hospital": {
-					// 			  "id": 1,
-					// 			  "visit_day_text": "周一下午,周二上午,周三下午",
-					// 			  "hospital_name": "测试医院",
-					// 			  "hospital_location": "34.5145141,25.6414014",
-					// 			  "hospital_dept_name": "呼吸科",
-					// 			  "remind_text": "你好"
-					// 			},
-					// 			"wait_count": 0,
-					// 			"handler_type": 1,
-					// 			"start_time": "15:00",
-					// 			"end_time": "15:30",
-					// 			"status": 2
-					// 		  },
-					// 		  {
-					// 			"id": 22,
-					// 			"user_ids": [],
-					// 			"user_infos": null,
-					// 			"doctor_id": 1,
-					// 			"date": "2024-03-30",
-					// 			"username": "张三",
-					// 			"create_datetime": "2024-03-30 06:21:43",
-					// 			"visit_hospital": {
-					// 			  "id": 1,
-					// 			  "visit_day_text": "周一下午,周二上午,周三下午",
-					// 			  "hospital_name": "测试医院",
-					// 			  "hospital_location": "34.5145141,25.6414014",
-					// 			  "hospital_dept_name": "呼吸科",
-					// 			  "remind_text": "你好"
-					// 			},
-					// 			"wait_count": 0,
-					// 			"handler_type": 1,
-					// 			"start_time": "07:00",
-					// 			"end_time": "07:30",
-					// 			"status": 2
-					// 		  },
-					// 		  {
-					// 			"id": 21,
-					// 			"user_ids": [],
-					// 			"user_infos": null,
-					// 			"doctor_id": 1,
-					// 			"date": "2024-03-30",
-					// 			"username": "张三",
-					// 			"create_datetime": "2024-03-30 06:20:40",
-					// 			"visit_hospital": {
-					// 			  "id": 1,
-					// 			  "visit_day_text": "周一下午,周二上午,周三下午",
-					// 			  "hospital_name": "测试医院",
-					// 			  "hospital_location": "34.5145141,25.6414014",
-					// 			  "hospital_dept_name": "呼吸科",
-					// 			  "remind_text": "你好"
-					// 			},
-					// 			"wait_count": 0,
-					// 			"handler_type": 1,
-					// 			"start_time": "07:00",
-					// 			"end_time": "07:30",
-					// 			"status": 2
-					// 		  },
-					// 		  {
-					// 			"id": 20,
-					// 			"user_ids": [],
-					// 			"user_infos": null,
-					// 			"doctor_id": 1,
-					// 			"date": "2024-03-31",
-					// 			"username": "张三",
-					// 			"create_datetime": "2024-03-30 05:07:08",
-					// 			"visit_hospital": {
-					// 			  "id": 1,
-					// 			  "visit_day_text": "周一下午,周二上午,周三下午",
-					// 			  "hospital_name": "测试医院",
-					// 			  "hospital_location": "34.5145141,25.6414014",
-					// 			  "hospital_dept_name": "呼吸科",
-					// 			  "remind_text": "你好"
-					// 			},
-					// 			"wait_count": 0,
-					// 			"handler_type": 1,
-					// 			"start_time": "15:00",
-					// 			"end_time": "15:30",
-					// 			"status": 2
-					// 		  },
-					// 		  {
-					// 			"id": 19,
-					// 			"user_ids": [],
-					// 			"user_infos": null,
-					// 			"doctor_id": 1,
-					// 			"date": "2024-03-31",
-					// 			"username": "阿三",
-					// 			"create_datetime": "2024-03-30 05:02:29",
-					// 			"visit_hospital": {
-					// 			  "id": 1,
-					// 			  "visit_day_text": "周一下午,周二上午,周三下午",
-					// 			  "hospital_name": "测试医院",
-					// 			  "hospital_location": "34.5145141,25.6414014",
-					// 			  "hospital_dept_name": "呼吸科",
-					// 			  "remind_text": "你好"
-					// 			},
-					// 			"wait_count": 0,
-					// 			"handler_type": 1,
-					// 			"start_time": "10:00",
-					// 			"end_time": "10:30",
-					// 			"status": 2
-					// 		  }
-					// 		]
-					// console.log(this.bookList)
-				});
-			},
-			getVisitors() {
-				var param = new Object()
-				param.page = 1
-				param.limit = 10000
-				this.$http.req('get_visitor_names', param, 'GET').then(data=>{
-					if(data == -1) return
-					this.getBookData()
-					this.vistors = data
-				});
+		components:{
+			preBookList
+		},
+		onShow(){
+			this.getVisitors()
+		},
+		methods: {
+			selectUser(key){
+				this.userSelectIndex = key
+				this.getBookData()
+			},
+			getBookData() {
+				var param = new Object()
+				param.page = 1
+				param.limit = 10000
+				if(this.userSelectIndex-1 >= 0){
+					param.visitor_id = this.vistors[this.userSelectIndex-1].id
+					console.log(this.vistors)
+				}else{
+					param.visitor_id = '0'
+				}
+				uni.showLoading({
+					title:'加载中',
+					mask:true
+				})
+				var timerobj = setTimeout(function(){
+					uni.hideLoading()
+				}, 3000)
+				this.$http.req('user/get_appoints', param, 'POST', true).then(data=>{
+					clearTimeout(timerobj)
+					uni.hideLoading()
+					if(data == -1) return
+					this.bookList = data;
+					// if(this.userSelectIndex === 0){
+						// this.vistors = JSON.parse(JSON.stringify(data))
+					// }
+				});
+			},
+			getVisitors() {
+				var param = new Object()
+				param.page = 1
+				param.limit = 10000
+				this.$http.req('user/get_visitors', {}, 'GET').then(data=>{
+					if(data == -1) return
+					this.vistors = data
+					this.getBookData()
+				});
 			},
-			pageInit() {
-
+			pageInit() {
+
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.page-prebook-list{
-		width: 100%;
-		height: 100vh;
-		box-sizing: border-box;
-		overflow-y: auto;
-		background: #F8F8F8;
-		.nav{
-			width: 100%;
-			display: flex;
-			height: 132rpx;
-			display: flex;
-			box-sizing: border-box;
-			overflow-x: auto;
-			align-items: center;
-			padding: 0 18rpx;
-			column-gap: 20rpx;
-			.item{
-				width: auto;
-				flex-shrink: 0;
-				padding: 0 20rpx;
-				height: 60rpx;
-				line-height: 60rpx;
-				background: rgba(201,203,209,0.25);
-				border-radius: 30rpx;
-				box-sizing: border-box;
-				font-size: 24rpx;
+	.page-prebook-list{
+		width: 100%;
+		height: 100vh;
+		box-sizing: border-box;
+		overflow-y: auto;
+		background: #F8F8F8;
+		.nav{
+			width: 100%;
+			display: flex;
+			height: 132rpx;
+			display: flex;
+			box-sizing: border-box;
+			overflow-x: auto;
+			align-items: center;
+			padding: 0 18rpx;
+			column-gap: 20rpx;
+			.item{
+				width: auto;
+				flex-shrink: 0;
+				padding: 0 20rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				background: rgba(201,203,209,0.25);
+				border-radius: 30rpx;
+				box-sizing: border-box;
+				font-size: 24rpx;
 				color: #616266;
+				min-width: 136rpx;
+				text-align: center;
 				&.active{
 					border: 1rpx solid #5BD07A;
 					color: #58CA7F;
-				}
-			}
-		}
-		.preg-books{
-			width: 714rpx;
-			margin: 0 auto;
-		}
+					background: #F8FFF7;
+				}
+			}
+		}
+		.preg-books{
+			width: 714rpx;
+			margin: 0 auto;
+		}
 	}
 </style>
diff --git a/pages/user_modify/user_modify.vue b/pages/user_modify/user_modify.vue
index 5ecf4f0..1c527ae 100644
--- a/pages/user_modify/user_modify.vue
+++ b/pages/user_modify/user_modify.vue
@@ -1,12 +1,12 @@
-<template>
+<template>
 	<view class="page-user-modify">
-		<view class="top"></view>
+		<view class="top"></view>
 		<view class="item-box btPadding">
 			<view class="item">
 				<view class="left PfScMedium">头像</view>
 				<view class="right" @click="upload">
-					<img :src="avator" class="avator" v-if="!uinfo.avator">
-					<img :src="uinfo.avator" class="avator" v-else>
+					<img :src="avator" class="avator" v-if="!uinfo.user_avatar">
+					<img :src="uinfo.user_avatar" class="avator" v-else>
 					<view class="avator_tips">点击上传照片</view>
 				</view>
 			</view>
@@ -28,27 +28,30 @@
 		<view class="submit-blank"></view>
 		<view class="submit-box btPadding">
 			<view class="primary btn btn3" hover-class="hover" @click="save">保存</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
 				cssUrl:this.cssUrl,
 				avator:this.cssUrl+'default_avator.svg',
-				uinfo:{},
+				uinfo:{
+					user_avatar:''
+				},
 				nick:'',
-				tempFilePaths:'',
-			}
+				tempFilePaths:'',
+				tempFiles:''
+			}
 		},
 		onLoad() {
-			this.getUser()
-		},
+			// this.getUser()
+		},
 		methods: {
 			getUser(){
-				this.$http.req('get_userinfo', {}, 'GET').then(data=>{
+				this.$http.req('user/get_user_info', {}, 'GET').then(data=>{
 					if(data == -1) return
 					this.uinfo = data
 					this.nick = this.uinfo.nick
@@ -56,18 +59,20 @@
 			},
 			save(){
 				var param = new Object()
-				param.nick = this.nick
-				var that = this
-				var token = uni.getStorageSync('token')
-				console.log(that.tempFilePaths)
+				var token = this.$token.getToken()
+
+				var that = this;
+				param.nick = this.nick;
 				uni.uploadFile({
-				  url: '/api/user/setting_user/',
-				  filePath: that.tempFilePaths,
-				  name: that.tempFilePaths ? 'avator':'empty',
+				  url: '/api/user/setting_user',
+				  filePath:that.tempFilePaths,
+				  name: 'avatar_file',
 				  header: {
-					'Authorization': token
+					'AUTH': token
 				  },
-				  formData:{nick:param.nick},
+				  formData:{
+					nick:param.nick,
+				},
 				  success: function(res){
 					  try{
 						var data = JSON.parse(res.data)
@@ -76,9 +81,9 @@
 						  return
 					  	}
 						uni.showToast({
-							title:data.msg
+							title:'修改成功'
 						})
-					  	if(that.tempFilePaths) that.uinfo.avator = that.tempFilePaths
+					  	if(that.tempFilePaths) that.uinfo.user_avatar = that.tempFilePaths
 					  }catch(e){
 						  that.$pop.modelShow('保存失败~'+e.message)
 					  }
@@ -95,22 +100,26 @@
 					success: function () {
 					}
 				});
-			},
+			},
 			upload() {
 				var that = this
 				uni.chooseImage({
 				  count: 1,
 				  success: function(res) {
+					console.log(res,'res---');
 				    var tempFilePaths = res.tempFilePaths
+				    let tempFiles = res.tempFiles;
 					that.tempFilePaths = tempFilePaths[0]
-					that.uinfo.avator = that.tempFilePaths
+					that.tempFiles = tempFiles[0]
+					that.uinfo.user_avatar = that.tempFilePaths
+					console.log(that.uinfo,'=uinfo');
 				  }
 				});
-			}
-		}
-	}
-</script>
-
+			}
+		}
+	}
+</script>
+
 <style lang="scss" scoped>
 	.page-user-modify{
 		.top{
@@ -214,5 +223,5 @@
 				margin: 0 auto;
 			}
 		}
-	}
-</style>
+	}
+</style>
diff --git a/pages/usercenter/usercenter.vue b/pages/usercenter/usercenter.vue
index af736e0..67bf2bb 100644
--- a/pages/usercenter/usercenter.vue
+++ b/pages/usercenter/usercenter.vue
@@ -1,9 +1,9 @@
-<template>
+<template>
 	<view class="page-usercenter">
 		<view class="user-wrapper" @click="toUserModify">
-			<img :src="uinfo.avator" class="avator" v-if="uinfo.avator">
+			<img :src="uinfo.user_avatar" class="avator" v-if="uinfo.user_avatar">
 			<img :src="cssUrl+'user_grey.svg'" class="avator" v-else>
-			<view class="ucode PfScMedium over2">{{uinfo.uid}}</view>
+			<view class="ucode PfScMedium over2">{{uinfo.user_nick}}</view>
 		</view>
 
 		<view class="menu">
@@ -18,32 +18,32 @@
 			</view>
 		</view>
 
-		<tabbar current="2"></tabbar>
-	</view>
-</template>
-
+		<tabbar current="2" leftButtonText="预约"></tabbar>
+	</view>
+</template>
+
 <script>
-	import tabbar from '@/components/tabbar.vue';
-	export default {
-		data() {
+	import tabbar from '@/components/tabbar.vue';
+	export default {
+		data() {
 			return {
 				cssUrl:this.cssUrl,
 				uinfo:{}
-			}
+			}
 		},
 		components:{
 			tabbar:tabbar
 		},
 		onShow() {
 			this.getUser()
-		},
+		},
 		methods: {
 			getUser(){
-				this.$http.req('get_userinfo', {}, 'GET').then(data=>{
+				this.$http.req('user/get_user_info', {}, 'POST').then(data=>{
 					if(data == -1) return
 					this.uinfo = data
 				});
-			},
+			},
 			toVisitors(){
 				uni.navigateTo({
 					url:'/pages/visitors/visitors?type=2'
@@ -58,12 +58,12 @@
 				uni.navigateTo({
 					url:'/pages/user_modify/user_modify'
 				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
 	.page-usercenter{
 		width: 100%;
 		height: 100vh;
@@ -118,5 +118,5 @@
 				}
 			}
 		}
-	}
-</style>
+	}
+</style>
diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue
index 1c914b7..99416a0 100644
--- a/pages/visitors/visitors.vue
+++ b/pages/visitors/visitors.vue
@@ -1,16 +1,16 @@
-<template>
-	<view class='add-visitor-page'>
+<template>
+	<view class='add-visitor-page'>
 		<view class="header block flex line40" @click="addVisitor">
 			<img :src="cssUrl+'add.svg'">增加就诊人
 		</view>
 		<view class="list-wrapper" v-if="type == 1">
 			<view :class="'item block'+(item.select?' active':'')" v-for="(item,key) in visitUsers" @click="chooseVisitor(item, key)">
 				<view class="top flex">
-					<view class="name PfScSemibold">{{item.visitor_name}}</view>
-					<view class="aam_times" v-if="item.remain_num">{{item.remain_desc}}</view>
+					<view class="name PfScSemibold">{{item.name}}</view>
+					<view class="aam_times" v-if="item.remain_num > 0">剩余{{item.remain_num}}次</view>
 				</view>
 				<view class="bot line36">
-					身份证尾号：{{item.idcard_ext}}
+					身份证尾号：{{item.idcard}}
 				</view>
 				<img class="status" :src="cssUrl+'visitor_select_active.svg'">
 				<img class="bg" :src="cssUrl+'visitor_list__bg.svg'">
@@ -26,21 +26,35 @@
 		<view class="list-wrapper2" v-if="type == 2">
 			<view class="item block" v-for="(item,key) in visitUsers">
 				<view class="top flex" @click="vistorOption(item)">
-					<view class="PfScSemibold">{{item.visitor_name}}</view>
-					<view>身份证尾号：{{item.idcard_ext}}</view>
+					<view class="PfScSemibold">{{item.name}}</view>
+					<view>身份证尾号：{{item.idcard}}</view>
 				</view>
-				<view class="bt" v-if="item.hospital_info.length>0">
-					<!-- <view class="bt-item flex" v-for="(item2,key2) in item.hospital_info" @click="showNotice(item2.popmsgIndex)"> -->
+				<!-- 暂时注释 多个医院信息渲染 -->
+				<!-- <view class="bt" v-if="item.hospital_info.length>0">
 					<view class="bt-item flex" v-for="(item2,key2) in item.hospital_info">
 						<view class="left flex">
 							<view class="over3">{{item2.hospital_name}} {{item2.hospital_dept}}</view>
 							<view class="status2" v-if="!item2.hospital_state">停诊</view>
 							<view class="status2" v-else-if="item2.is_expire">{{item2.expire_desc}}</view>
 						</view>
-						<view class="more right" v-if="item2.times>=0">剩余<text>{{item2.times}}</text>次</view>
-						<view class="owe right" v-else>超<text>{{-item2.times}}</text>次</view>
+						<view class="more right" v-if="item2.remain_num>=0">剩余<text>{{item2.remain_num}}</text>次</view>
+						<view class="owe right" v-else>超<text>{{-item2.remain_num}}</text>次</view>
+					</view>
+				</view> -->
+				<view class="bt">
+					<view class="bt-item flex">
+						<view class="left flex">
+							<view class="over">{{ item.hospital?item.hospital:'暂无剩余针灸次数'}}</view>
+							<!-- <view :class="(!item.doctor_status && !item.weeks)? 'over' : ''">{{ item.hospital}}</view> -->
+							<view class="over depart">{{item.depart }}</view>
+							<view class="status2" v-if="item.doctor_status !== '出诊' && item.hospital">{{ item.doctor_status }}</view>
+							<view class="status2" v-else-if="item.weeks && item.hospital">{{ item.weeks }}周未看病</view>
+						</view>
+						<view class="more right" v-if="item.hospital && item.remain_num>=0">剩余<text>{{item.remain_num}}</text>次</view>
+						<view class="owe right" v-else-if="item.hospital">超<text>{{-item.remain_num}}</text>次</view>
 					</view>
 				</view>
+				
 			</view>
 		</view>
 		
@@ -53,15 +67,15 @@
 		  @confirm="popConfirm"
 		  @cancel="popCancel"
 		></pop>
-	</view>
-</template>
-
+	</view>
+</template>
+
 <script>
 	import pop from '@/components/pop.vue';
-	
-	export default {
-		data() {
-			return {
+	
+	export default {
+		data() {
+			return {
 				cssUrl:this.cssUrl,
 				type:1,
 				res:true,
@@ -74,8 +88,8 @@
 				activeVisitors:[],
 				popMsgs:[],
 				popIndex:0,
-				depart_id:0
-			}
+				depart_id:0
+			}
 		},
 		components:{
 			pop
@@ -107,7 +121,7 @@
 					title:'请选择就诊人'
 				})
 			}
-		},
+		},
 		methods: {
 			modifyVistor(visitor){
 				uni.setStorageSync('visitor_info_'+visitor.id, JSON.stringify(visitor))
@@ -117,11 +131,10 @@
 				var that = this
 				uni.showModal({
 					title:'删除',
-					content:'确认删除就诊人（'+visitor.visitor_name+'）?',
+					content:'删除'+visitor.name+'后，就诊记录还可以查到，确定删除吗？',
 					success(res) {
 						if(!res.confirm) return
-						that.$http.req('setting_visitor', {id:visitor.id,is_del:1}).then(data=>{
-							if(data == -1) return
+						that.$http.req('/user/del_visitor', {id:visitor.id},'POST').then(data=>{
 							that.getVisitors()
 						});
 					}
@@ -144,7 +157,6 @@
 					fail: function (res) {
 					}
 				});
-				console.log(visitor)
 			},
 			chooseVisitor(info, key){
 				this.selectCount = 0
@@ -155,61 +167,14 @@
 				}
 			},
 			getVisitors() {
-				var param = new Object()
-				param.page = 1
-				param.limit = 10000
-				this.$http.req('get_visitors', param, 'GET').then(data=>{
-					if(data == -1) return
-					this.visitUsers = data
-					console.log(this.visitUsers)
+				this.$http.req('user/get_visitors', {}, 'POST').then(data=>{
+					this.visitUsers = data;
+					this.visitUsers = [...this.visitUsers]
 					this.popMsgs = []
 					var popmsgIndex = 0
 					for (var i = 0; i < this.visitUsers.length; i++) {
 						this.visitUsers[i].select = false
-						// this.visitUsers[i].hospital_info = [
-						//   {
-						// 	"times": -1,
-						// 	"hospital_name": "测试医院",
-						// 	"hospital_dept": "呼吸科",
-						// 	"hospital_state": true,
-						// 	"is_expire":true,
-						// 	"last_visit_time": "2021-01-12 13:16:26"
-						//   },
-						  
-						//   {
-						// 	"times": 10,
-						// 	"hospital_name": "测试医院",
-						// 	"hospital_dept": "呼吸科",
-						// 	"hospital_state": true,
-						// 	"is_expire":true,
-						// 	"last_visit_time": "2021-01-12 13:16:26"
-						//   }
-						// ]
-
-						try{
-							var hospitalInfo = this.visitUsers[i].hospital_info
-							for (var j = 0; j < hospitalInfo.length; j++) {
-								if(!hospitalInfo[j].hospital_state || this.type == 1) continue
-
-								var popobj = new Object()
-								popobj.popShowCancel = false
-								if(hospitalInfo[j].is_expire){
-									popobj.popContent = this.visitUsers[i].real_name+'已<span style="color:red;">'+hospitalInfo[j].expire_day+'</span>没有来'+hospitalInfo[j].hospital_name+hospitalInfo[j].hospital_dept+'针灸。如还需要，请尽快安排'
-									popobj.popTitle = "提醒"
-								}
-
-								if(hospitalInfo[j].times < 0){
-									popobj.popContent = this.visitUsers[i].real_name+'在'+hospitalInfo[j].hospital_name+hospitalInfo[j].hospital_dept+'须补挂号啦，请挂号缴费后告知医生'
-									popobj.popTitle = "挂号提醒"
-								}
-								popmsgIndex = this.popMsgs.length
-								this.visitUsers[i].hospital_info[j].popmsgIndex = popmsgIndex
-								this.popMsgs.push(popobj)
-							}
-						}catch(et){
-						}
 					}
-
 					if(this.popMsgs.length > 0 && !uni.getStorageSync('has_noticed')){
 						this.popIndex = 0
 						var popinfo = this.popMsgs[this.popIndex]
@@ -272,11 +237,11 @@
 					url:"/pages/prebook/prebook"
 				})
 			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
 .add-visitor-page{
 	overflow: hidden;
 	.block{
@@ -318,16 +283,16 @@
 					letter-spacing: 3rpx;
 				}
 				.aam_times{
-					min-width: 134rpx;
+					// min-width: 134rpx;
 					color: #79624A;
 					text-align: center;
 					font-size: 28rpx;
 					background: rgba(254, 232, 198, 0.66);
 					border-radius: 6rpx;
 					height: 44rpx;
-					padding: 0 10rpx;
+					padding: 0 17rpx;
 					line-height: 44rpx;
-					margin-left: 56rpx;
+					margin-left: 56rpx;
 				}
 			}
 			.bot{
@@ -412,14 +377,20 @@
 							min-height: 40rpx;
 							line-height: 40rpx;
 							font-size: 28rpx;
-							color: #949699;
+							color: #666;
 							letter-spacing: 2rpx;
 							max-width: 250rpx;
 							align-items: flex-end;
 						}
-						
+						.depart{
+							margin-left: 10rpx;
+							color: #666;
+							min-height: 40rpx;
+							line-height: 40rpx;
+						}
 						.status2{
-							height: 38rpx;
+							min-height: 40rpx;
+							line-height: 40rpx;
 							background: #FFE9E9;
 							line-height: 38rpx;
 							padding: 0 7rpx;
@@ -430,28 +401,24 @@
 					}
 					.right{
 						flex-grow: 1;
-						&.more{
+						&.more,&.owe{
 							font-size: 28rpx;
 							color: #949699;
 							letter-spacing: 2rpx;
 							text-align: right;
+							line-height: 52rpx;
 							text{
 								font-size: 52rpx;
 								color: #000000;
+								line-height: 52rpx;
 								letter-spacing: 3rpx;
 							}
 						}
 						&.owe{
-							text-align: right;
-							font-size: 28rpx;
 							color: #FD0000;
-							letter-spacing: 2rpx;
 							line-height: 52rpx;
 							text{
-								font-size: 52rpx;
 								color: #FD0000;
-								line-height: 52rpx;
-								letter-spacing: 3rpx;
 							}
 						}
 					}
@@ -459,5 +426,5 @@
 			}
 		}
 	}
-}
-</style>
+}
+</style>
diff --git a/static/images/frontend/list_empty.svg b/static/images/frontend/list_empty.svg
new file mode 100644
index 0000000..d8650b6
--- /dev/null
+++ b/static/images/frontend/list_empty.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg version="1.1" width="436px" height="382px" viewBox="0 0 436.0 382.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><clipPath id="i0"><path d="M925,0 L925,1792 L0,1792 L0,0 L925,0 Z"></path></clipPath><clipPath id="i1"><path d="M29.7438149,0 C31.8558017,0 33.7477899,0.555366602 35.4197795,1.66609981 C37.0917692,2.77683301 38.3384281,4.23832407 39.1597564,6.050573 L50.2476873,27.7098706 C52.2423416,28.4113863 53.884998,29.6390388 55.1756567,31.392828 C56.4663153,33.1466172 57.1116446,35.1634749 57.1116446,37.443401 C57.1116446,38.3787552 56.9649788,39.3725692 56.6716473,40.4248428 L58.1676381,43.4062846 C58.2849708,43.8739619 58.4316365,44.3708688 58.6076355,44.8970054 L58.9596332,46.3000369 C59.0769658,46.7677141 59.1356322,47.1477018 59.1356322,47.4399999 C59.1356322,49.0768699 58.6956349,50.523746 57.8156404,51.7806284 C56.9356458,53.0375107 55.791653,53.9582501 54.3836618,54.5428465 C53.8556651,54.6013061 53.2983352,54.6305359 52.7116721,54.6305359 C52.2423417,54.6889956 51.714345,54.7182253 51.127682,54.7182253 L49.4556924,54.7182253 L35.7277777,54.8936043 L35.7277777,69.5377447 C35.7277777,71.7007516 35.7717775,73.8783732 35.8597769,76.0706098 C35.9477763,78.2628464 36.0504424,80.2358594 36.167775,81.9896486 C36.2851076,84.0941958 36.4317734,86.1110534 36.6077723,88.0402216 L23.9358511,88.0402216 L24.1998494,84.6203325 C24.2585158,83.2757609 24.3171821,81.448897 24.3758484,79.1397411 C24.4314271,76.9521197 24.460679,74.0692982 24.4636041,70.4912766 L24.4638478,56.4720146 C23.4665207,57.3489094 22.351861,57.7873567 21.1198687,57.7873567 C20.1225415,57.7873567 19.2572136,57.553518 18.5238849,57.0858409 C17.790556,56.6181637 17.1892264,55.9751077 16.719896,55.1566727 L6.77595789,54.6305359 C4.8399699,54.1628588 3.2266466,53.1836597 1.93598796,51.6929389 C0.645329318,50.2022179 0,48.4338138 0,46.3877264 C0,46.0369684 0.0293331416,45.7154404 0.087999425,45.4231422 C0.146665708,45.130844 0.234665162,44.8385457 0.351997786,44.5462476 L2.5519841,39.4602587 C2.66931673,38.1741466 3.03598111,36.975724 3.65197726,35.8649907 C4.26797341,34.7542575 5.04530189,33.7896734 5.98396272,32.9712384 L19.7998768,7.45360441 L19.8878762,7.45360441 C21.002536,5.40751693 22.3225277,3.65372765 23.8478515,2.19223659 C25.3731754,0.730745532 27.3384965,0 29.7438149,0 Z"></path></clipPath><linearGradient id="i2" x1="85.5030739px" y1="86.983739px" x2="17.4544481px" y2="88.0402216px" gradientUnits="userSpaceOnUse"><stop stop-color="rgba(224, 229, 239, 0)" offset="0%"></stop><stop stop-color="#E0E5EF" offset="100%"></stop></linearGradient><linearGradient id="i3" x1="4.97642725px" y1="85.6200193px" x2="60.3362748px" y2="-8.42386662px" gradientUnits="userSpaceOnUse"><stop stop-color="#D8D7D7" offset="0%"></stop><stop stop-color="#BFBFBF" offset="100%"></stop></linearGradient><clipPath id="i4"><path d="M29.7438148,0 C31.8558018,0 33.7477902,0.555366602 35.41978,1.66609981 C37.0917689,2.77683301 38.3384282,4.23832407 39.159756,6.050573 L50.247687,27.7098706 C52.2423419,28.4113863 53.8849984,29.6390388 55.1756567,31.392828 C56.4663149,33.1466172 57.111645,35.1634749 57.111645,37.443401 C57.111645,38.3787552 56.9649786,39.3725692 56.6716468,40.4248428 L58.167638,43.4062846 C58.2849711,43.8739619 58.4316365,44.3708688 58.6076352,44.8970054 L58.9596335,46.3000369 C59.0769656,46.7677141 59.1356322,47.1477018 59.1356322,47.4399999 C59.1356322,49.0768699 58.695635,50.523746 57.8156407,51.7806284 C56.9356453,53.0375107 55.7916525,53.9582501 54.3836622,54.5428465 C53.8556652,54.6013061 53.2983349,54.6305359 52.7116723,54.6305359 C52.2423419,54.6889956 51.7143449,54.7182253 51.1276823,54.7182253 L49.4556925,54.7182253 L35.7277774,54.8936043 L35.7277774,69.5377447 C35.7277774,71.7007516 35.7717774,73.8783732 35.8597772,76.0706098 C35.947776,78.2628464 36.0504425,80.2358594 36.1677746,81.9896486 C36.2851077,84.0941958 36.4317731,86.1110534 36.6077728,88.0402216 L23.9358507,88.0402216 L24.1998492,84.6203325 C24.2585158,83.2757609 24.3171824,81.448897 24.3758489,79.1397411 C24.4314268,76.9521197 24.4606788,74.0692982 24.463604,70.4912766 L24.4638477,56.4720146 C23.4665203,57.3489094 22.3518607,57.7873567 21.1198691,57.7873567 C20.1225416,57.7873567 19.2572139,57.553518 18.523885,57.0858409 C17.790556,56.6181637 17.1892268,55.9751077 16.7198964,55.1566727 L6.77595819,54.6305359 C4.83996985,54.1628588 3.22664657,53.1836597 1.93598834,51.6929389 C0.645329113,50.2022179 0,48.4338138 0,46.3877264 C0,46.0369684 0.0293332782,45.7154404 0.0879998345,45.4231422 C0.146665389,45.130844 0.234665223,44.8385457 0.351997333,44.5462476 L2.55198417,39.4602587 C2.66931629,38.1741466 3.03598126,36.975724 3.65197709,35.8649907 C4.26797293,34.7542575 5.04530179,33.7896734 5.98396269,32.9712384 L19.7998766,7.45360441 L19.8878764,7.45360441 C21.002536,5.40751693 22.3225275,3.65372765 23.8478519,2.19223659 C25.3731754,0.730745532 27.338496,0 29.7438148,0 Z"></path></clipPath><linearGradient id="i5" x1="85.5030739px" y1="86.983739px" x2="17.4544481px" y2="88.0402216px" gradientUnits="userSpaceOnUse"><stop stop-color="rgba(224, 229, 239, 0)" offset="0%"></stop><stop stop-color="#E0E5EF" offset="100%"></stop></linearGradient><linearGradient id="i6" x1="4.97642725px" y1="85.6200193px" x2="60.3362748px" y2="-8.42386662px" gradientUnits="userSpaceOnUse"><stop stop-color="#D8D7D7" offset="0%"></stop><stop stop-color="#BFBFBF" offset="100%"></stop></linearGradient><clipPath id="i7"><path d="M23.1900933,0 C24.836727,0 26.3118362,0.435457941 27.6154211,1.30637372 C28.919006,2.17728951 29.8909783,3.32323134 30.531335,4.74419931 L39.1761626,21.7270576 C40.7313175,22.2771097 42.0120319,23.2397009 43.0183088,24.614831 C44.0245848,25.9899613 44.5277228,27.571361 44.5277228,29.3590303 C44.5277228,30.0924331 44.4133735,30.8716736 44.184674,31.6967517 L45.3510401,34.0344732 C45.44252,34.4011746 45.5568692,34.7907949 45.694089,35.2033338 L45.9685274,36.303438 C46.0600072,36.6701394 46.1057471,36.9680843 46.1057471,37.1972727 C46.1057471,38.4807275 45.7626983,39.61521 45.0766007,40.60072 C44.3905031,41.58623 43.4985774,42.3081733 42.4008206,42.7665501 C41.9891624,42.8123878 41.5546338,42.8353065 41.0972357,42.8353065 C40.7313175,42.8811443 40.3196593,42.904063 39.8622602,42.904063 L38.5586753,42.904063 L27.8555559,43.0415761 L27.8555559,54.5239134 C27.8555559,56.2199075 27.8898606,57.9273608 27.9584699,59.6462736 C28.0270803,61.3651864 28.1071249,62.9122079 28.1986047,64.2873381 C28.2900835,65.9374944 28.4044338,67.5188942 28.5416525,69.0315374 L18.6618504,69.0315374 L18.8676795,66.3500335 C18.9134194,65.295767 18.9591593,63.8633397 19.0048992,62.0527515 C19.0477804,60.3553251 19.0705606,58.1240958 19.0732406,55.3590634 L19.0735086,44.2791934 C18.2959311,44.9667585 17.4268749,45.3105411 16.4663378,45.3105411 C15.6887614,45.3105411 15.014099,45.1271903 14.4423507,44.7604889 C13.8706033,44.3937874 13.40177,43.8895731 13.0358507,43.2478456 L5.28294986,42.8353065 C3.7735359,42.4686052 2.51569093,41.7008241 1.50941396,40.5319634 C0.503137986,39.3631027 0,37.9765131 0,36.3721945 C0,36.0971685 0.0228694529,35.8450612 0.0686093609,35.6158729 C0.114349269,35.3866845 0.182959632,35.1574961 0.274439448,34.9283078 L1.98968249,30.9404301 C2.08116231,29.9320013 2.36703598,28.992329 2.84730451,28.1214132 C3.32757205,27.2504973 3.93362508,26.4941757 4.6654626,25.8524482 L15.4371924,5.8443035 L15.5058018,5.8443035 C16.374858,4.23998486 17.4040044,2.86485462 18.59324,1.71891279 C19.7824757,0.572970965 21.3147601,0 23.1900933,0 Z"></path></clipPath><linearGradient id="i8" x1="66.6634135px" y1="68.203159px" x2="13.6085528px" y2="69.0315374px" gradientUnits="userSpaceOnUse"><stop stop-color="rgba(224, 229, 239, 0)" offset="0%"></stop><stop stop-color="#E0E5EF" offset="100%"></stop></linearGradient><linearGradient id="i9" x1="3.87992633px" y1="67.1338788px" x2="47.0418413px" y2="-6.60507724px" gradientUnits="userSpaceOnUse"><stop stop-color="#D8D7D7" offset="0%"></stop><stop stop-color="#BFBFBF" offset="100%"></stop></linearGradient><clipPath id="i10"><path d="M211.986207,0 C273.506935,0 328.906778,5.00906842 367.631211,13.0098406 C405.505121,13.2614486 436,24.5852849 436,38.517597 C436,49.5592464 416.846486,58.9625403 390.043685,62.514259 C383.646747,64.403405 376.446044,66.1840795 368.536721,67.8389146 C368.742613,68.8931722 368.845977,69.9583188 368.845977,71.0324515 C368.845977,95.3440874 315.894128,115.052562 250.574713,115.052562 C191.807915,115.052562 143.051801,99.0999253 133.861106,78.1948097 C55.4465279,72.2513364 0,57.6225612 0,40.5185111 C0,18.1407557 94.9094572,0 211.986207,0 Z"></path></clipPath><clipPath id="i11"><path d="M0,0 L101.232184,12.7125703 L99.6150539,62.028338 L0,50.4133518 L0,0 Z"></path></clipPath><clipPath id="i12"><path d="M80.1715136,0 L80.183908,56.6821803 L0,73.0333657 L0,16.4502956 L80.1715136,0 Z"></path></clipPath><clipPath id="i13"><path d="M86.1977011,0 L86.1977011,104.875872 L0,127.058047 L0,22.1821753 L86.1977011,0 Z"></path></clipPath><clipPath id="i14"><path d="M0,0 L94.216092,18.7564406 L93.6679688,124.056676 L0,103.17065 L0,0 Z"></path></clipPath><clipPath id="i15"><path d="M20.2137873,0 L115.264368,20.1876081 L96.6652891,60.0274238 L0,37.1852656 L20.2137873,0 Z"></path></clipPath><clipPath id="i16"><path d="M86.2838718,0 L108.248276,36.929013 L25.6059432,64.0292521 L0,23.7289005 L86.2838718,0 Z"></path></clipPath><linearGradient id="i17" x1="48.1569866px" y1="78.3127949px" x2="4.04399575px" y2="0px" gradientUnits="userSpaceOnUse"><stop stop-color="#A2ABB9" offset="0%"></stop><stop stop-color="#E7EAF0" offset="100%"></stop></linearGradient><linearGradient id="i18" x1="24.669146px" y1="15.4100681px" x2="2.07159815px" y2="1.14076823e-07px" gradientUnits="userSpaceOnUse"><stop stop-color="#A2ABB9" offset="0%"></stop><stop stop-color="#E7EAF0" offset="100%"></stop></linearGradient><linearGradient id="i19" x1="0px" y1="65.3014522px" x2="87.8298514px" y2="2.68938991px" gradientUnits="userSpaceOnUse"><stop stop-color="#A2ABB9" offset="0%"></stop><stop stop-color="#E3E7EE" offset="100%"></stop><stop stop-color="#E7EAF0" offset="100%"></stop></linearGradient><linearGradient id="i20" x1="-2.89819683px" y1="18.3617741px" x2="34.3294733px" y2="3.74743371px" gradientUnits="userSpaceOnUse"><stop stop-color="#A2ABB9" offset="0%"></stop><stop stop-color="#E7EAF0" offset="100%"></stop></linearGradient><linearGradient id="i21" x1="0px" y1="46.0764064px" x2="108.589511px" y2="-7.05050106e-08px" gradientUnits="userSpaceOnUse"><stop stop-color="#A2ABB9" offset="0%"></stop><stop stop-color="#E7EAF0" offset="100%"></stop></linearGradient><clipPath id="i22"><path d="M0,0 C34.023401,5.32046648 47.9503145,14.7167318 41.7807404,28.1887958 C35.6111664,41.6608594 21.6842528,32.2645946 0,0 Z"></path></clipPath><linearGradient id="i23" x1="3.63550695px" y1="33.175238px" x2="44.078398px" y2="-3.23207331px" gradientUnits="userSpaceOnUse"><stop stop-color="#C0C7D2" offset="0%"></stop><stop stop-color="#A2ABB9" offset="100%"></stop><stop stop-color="#909AA9" offset="100%"></stop></linearGradient><linearGradient id="i24" x1="3.63550686px" y1="33.2027031px" x2="44.078398px" y2="-3.26670263px" gradientUnits="userSpaceOnUse"><stop stop-color="#D8D7D7" offset="0%"></stop><stop stop-color="#BFBFBF" offset="100%"></stop></linearGradient><clipPath id="i25"><path d="M39.0299152,2.19899651 C38.1229429,10.2692482 25.1129716,16.1332389 0,19.7909686 C4.97846249,2.19899651 17.9884339,-3.66499418 39.0299152,2.19899651 Z"></path></clipPath><linearGradient id="i26" x1="3.28447555px" y1="19.230999px" x2="39.8223473px" y2="-1.87356587px" gradientUnits="userSpaceOnUse"><stop stop-color="#C0C7D2" offset="0%"></stop><stop stop-color="#A2ABB9" offset="100%"></stop><stop stop-color="#909AA9" offset="100%"></stop></linearGradient><linearGradient id="i27" x1="3.28447547px" y1="19.2469201px" x2="39.8223473px" y2="-1.89363994px" gradientUnits="userSpaceOnUse"><stop stop-color="#D8D7D7" offset="0%"></stop><stop stop-color="#BFBFBF" offset="100%"></stop></linearGradient><clipPath id="i28"><path d="M65.1432428,5.86156042 C52.1332714,29.8854869 30.4188567,38.4747549 0,31.6293636 C15.5379031,1.46573917 37.2523168,-7.12352788 65.1432428,5.86156042 Z"></path></clipPath><linearGradient id="i29" x1="5.48198446px" y1="32.9469984px" x2="66.4658591px" y2="-3.20983666px" gradientUnits="userSpaceOnUse"><stop stop-color="#C0C7D2" offset="0%"></stop><stop stop-color="#A2ABB9" offset="100%"></stop><stop stop-color="#909AA9" offset="100%"></stop></linearGradient><linearGradient id="i30" x1="5.48198433px" y1="32.9742752px" x2="66.4658591px" y2="-3.24422837px" gradientUnits="userSpaceOnUse"><stop stop-color="#D8D7D7" offset="0%"></stop><stop stop-color="#BFBFBF" offset="100%"></stop></linearGradient><linearGradient id="i31" x1="-6.11909724e-08px" y1="15.647817px" x2="15.0326486px" y2="0px" gradientUnits="userSpaceOnUse"><stop stop-color="#909AA9" offset="0%"></stop><stop stop-color="#C0C7D2" offset="100%"></stop></linearGradient><linearGradient id="i32" x1="13.421778px" y1="20.4956376px" x2="1.48351075e-07px" y2="-1.83356753px" gradientUnits="userSpaceOnUse"><stop stop-color="#909AA9" offset="0%"></stop><stop stop-color="#C0C7D2" offset="100%"></stop></linearGradient><linearGradient id="i33" x1="0px" y1="16.5109993px" x2="24.0585549px" y2="-1.68768162e-07px" gradientUnits="userSpaceOnUse"><stop stop-color="#909AA9" offset="0%"></stop><stop stop-color="#C0C7D2" offset="100%"></stop></linearGradient></defs><g transform="translate(-196.0 -211.0)"><g clip-path="url(#i0)"><g transform="translate(196.0 212.17360499999995)"><g transform="translate(49.112643678160936 199.9177284664484)"><g opacity="44.5247105%"><g clip-path="url(#i1)"><polygon points="0,0 59.1356322,0 59.1356322,88.0402216 0,88.0402216 0,0" stroke="none" fill="url(#i2)"></polygon><polygon points="0,0 59.1356322,0 59.1356322,88.0402216 0,88.0402216 0,0" stroke="none" fill="url(#i3)"></polygon></g></g><g transform="translate(310.71264367816093 0.0)"><g opacity="36.8196033%"><g clip-path="url(#i4)"><polygon points="0,0 59.1356322,0 59.1356322,88.0402216 0,88.0402216 0,0" stroke="none" fill="url(#i5)"></polygon><polygon points="0,0 59.1356322,0 59.1356322,88.0402216 0,88.0402216 0,0" stroke="none" fill="url(#i6)"></polygon></g></g></g><g transform="translate(286.6574712643678 19.008684217430442)"><g opacity="36.8196033%"><g clip-path="url(#i7)"><polygon points="0,0 46.1057471,0 46.1057471,69.0315374 0,69.0315374 0,0" stroke="none" fill="url(#i8)"></polygon><polygon points="0,0 46.1057471,0 46.1057471,69.0315374 0,69.0315374 0,0" stroke="none" fill="url(#i9)"></polygon></g></g></g></g><g transform="translate(0.0 264.9474376313421)"><g clip-path="url(#i10)"><polygon points="0,0 436,0 436,115.052562 0,115.052562 0,0" stroke="none" fill="#E5E5E5"></polygon></g></g><g transform="translate(116.26666666666665 179.9085871849427)"><g transform="translate(100.22988505747128 0.0)"><g clip-path="url(#i11)"><polygon points="0,0 101.232184,0 101.232184,62.028338 0,62.028338 0,0" stroke="none" fill="#BEBCBC"></polygon></g></g><g transform="translate(20.04597701149426 0.0)"><g clip-path="url(#i12)"><polygon points="0,0 80.183908,0 80.183908,73.0333657 0,73.0333657 0,0" stroke="none" fill="#C9C8C8"></polygon></g></g><g transform="translate(114.26206896551733 16.00731302520458)"><g clip-path="url(#i13)"><polygon points="0,0 86.1977011,0 86.1977011,127.058047 0,127.058047 0,0" stroke="none" fill="#BFBFBF"></polygon></g></g><g transform="translate(21.048275862068962 19.008684217430442)"><g clip-path="url(#i14)"><polygon points="0,0 94.216092,0 94.216092,124.056676 0,124.056676 0,0" stroke="none" fill="#D3D3D3"></polygon></g></g><g transform="translate(0.0 18.00822715335515)"><g clip-path="url(#i15)"><polygon points="0,0 115.264368,0 115.264368,60.0274238 0,60.0274238 0,0" stroke="none" fill="#DFDCDC"></polygon></g></g><g transform="translate(115.26436781609199 14.006398897054005)"><g clip-path="url(#i16)"><polygon points="0,0 108.248276,0 108.248276,64.0292521 0,64.0292521 0,0" stroke="none" fill="#D8D7D7"></polygon></g></g></g><g transform="translate(126.69678395705085 0.0)"><g transform="translate(0.0 44.81744278461752)"><path d="M12.8809661,0 C-11.5887368,34.9751501 -1.19500118,61.0794148 44.0621729,78.3127949" stroke="url(#i17)" stroke-width="1" fill="none" stroke-linecap="round" stroke-miterlimit="10"></path></g><g transform="translate(4.459932790627239 117.23857706097576)"><path d="M0,0 C8.28259048,10.2733784 15.806429,15.4100682 22.5715156,15.4100682" stroke="url(#i18)" stroke-width="1" fill="none" stroke-linecap="round" stroke-miterlimit="10"></path></g><g transform="translate(116.49258482455814 0.0)"><path d="M87.7995531,0 C88.9072758,31.0860426 59.6407587,52.8531933 0,65.301452" stroke="url(#i19)" stroke-width="1" fill="none" stroke-linecap="round" stroke-miterlimit="10"></path></g><g transform="translate(177.91690930271932 39.11765570689211)"><path d="M34.3294733,0 C19.6977573,12.2411829 8.25459957,18.3617744 0,18.3617744" stroke="url(#i20)" stroke-width="1" fill="none" stroke-linecap="round" stroke-miterlimit="10"></path></g><g transform="translate(79.43554391145463 108.53618320019783)"><path d="M108.589511,1.6615142 C50.9949295,-5.27927074 14.7984257,9.52569399 0,46.0764064" stroke="url(#i21)" stroke-width="1" fill="none" stroke-linecap="round" stroke-miterlimit="10"></path></g><g transform="translate(11.535793639270612 68.84168528624727)"><g clip-path="url(#i22)"><polygon points="0,0 43.2012739,0 43.2012739,34.1412367 0,34.1412367 0,0" stroke="none" fill="url(#i23)"></polygon><polygon points="0,0 43.2012739,0 43.2012739,34.1412367 0,34.1412367 0,0" stroke="none" fill="url(#i24)"></polygon></g></g><g transform="translate(133.73029986823627 19.326687111226285)"><g clip-path="url(#i25)"><polygon points="0,-1.77635684e-15 39.0299152,-1.77635684e-15 39.0299152,19.7909686 0,19.7909686 0,-1.77635684e-15" stroke="none" fill="url(#i26)"></polygon><polygon points="0,-1.77635684e-15 39.0299152,-1.77635684e-15 39.0299152,19.7909686 0,19.7909686 0,-1.77635684e-15" stroke="none" fill="url(#i27)"></polygon></g></g><g transform="translate(88.10201413674238 135.9900742409754)"><g clip-path="url(#i28)"><polygon points="0,-6.96819931e-15 65.1432428,-6.96819931e-15 65.1432428,33.9063518 0,33.9063518 0,-6.96819931e-15" stroke="none" fill="url(#i29)"></polygon><polygon points="0,-6.96819931e-15 65.1432428,-6.96819931e-15 65.1432428,33.9063518 0,33.9063518 0,-6.96819931e-15" stroke="none" fill="url(#i30)"></polygon></g></g><g transform="translate(128.89125714639755 32.650725955998794)"><path d="M0,15.647817 C3.80753187,7.50164206 8.81841472,2.28570314 15.0326486,0" stroke="url(#i31)" stroke-width="1" fill="none" stroke-linecap="round" stroke-miterlimit="10"></path></g><g transform="translate(44.062172926627326 93.05190415215918)"><path d="M0,0 C7.11659637,1.64586222 10.6748946,8.4777412 10.6748946,20.4956376" stroke="url(#i32)" stroke-width="1" fill="none" stroke-linecap="round" stroke-miterlimit="10"></path></g><g transform="translate(81.44014161260407 160.75410235773663)"><path d="M0,16.5109991 C5.77764678,5.50366638 13.7971651,0 24.0585549,0" stroke="url(#i33)" stroke-width="1" fill="none" stroke-linecap="round" stroke-miterlimit="10"></path></g></g></g></g></g></svg>
\ No newline at end of file