From d50896e4999e36c82d1c3ff257fa419d8ed6e471 Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Tue, 10 Dec 2024 09:32:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9=E3=80=81?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/book_detail/book_detail.vue       |  9 ++++++--
 pages/index/index.vue                   | 38 ++++++++++++++++-----------------
 pages/modify_visitor/modify_visitor.vue |  2 +-
 pages/prebook_list/prebook_list.vue     | 12 +++++------
 pages/user_modify/user_modify.vue       |  2 +-
 5 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/pages/book_detail/book_detail.vue b/pages/book_detail/book_detail.vue
index 53540ec..078fb79 100644
--- a/pages/book_detail/book_detail.vue
+++ b/pages/book_detail/book_detail.vue
@@ -89,8 +89,9 @@
 								mask:true,
 								image:that.cssUrl+'gou.svg',
 								times:false,
+								duration: 1500,
 								success() {
-									
+									that.$func.toPage('/pages/prebook_list/prebook_list')
 								}
 							})
 						});
@@ -119,7 +120,11 @@
 					bookInfo = data
 					this.bookInfo = bookInfo
 					this.status = this.statusStyleList[bookInfo.status]
-					if(bookInfo.status==0 || bookInfo.status==2) this.showCancelBook = true
+					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
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e30bd79..420dbd6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -247,27 +247,27 @@
 						visitFlag = false;
 					}
 					// if(visitFlag){//暂时注释
-						let workDatKeyArr = Object.keys(this.workdate);
-						let workDateValArr = Object.values(this.workdate);
-						let timeList = [];
+						// 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('、')
-									}
-								}
-							}
+							// 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
 						})
 				});
diff --git a/pages/modify_visitor/modify_visitor.vue b/pages/modify_visitor/modify_visitor.vue
index 7bc80c6..6c4b5c3 100644
--- a/pages/modify_visitor/modify_visitor.vue
+++ b/pages/modify_visitor/modify_visitor.vue
@@ -139,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;
diff --git a/pages/prebook_list/prebook_list.vue b/pages/prebook_list/prebook_list.vue
index 1465e76..80f2dae 100644
--- a/pages/prebook_list/prebook_list.vue
+++ b/pages/prebook_list/prebook_list.vue
@@ -22,7 +22,7 @@
 			preBookList
 		},
 		onShow(){
-			this.getBookData()
+			this.getVisitors()
 		},
 		methods: {
 			selectUser(key){
@@ -34,7 +34,7 @@
 				param.page = 1
 				param.limit = 10000
 				if(this.userSelectIndex-1 >= 0){
-					param.visitor_id = this.vistors[this.userSelectIndex-1].visitor_id
+					param.visitor_id = this.vistors[this.userSelectIndex-1].id
 					console.log(this.vistors)
 				}else{
 					param.visitor_id = '0'
@@ -51,9 +51,9 @@
 					uni.hideLoading()
 					if(data == -1) return
 					this.bookList = data;
-					if(this.userSelectIndex === 0){
-						this.vistors = JSON.parse(JSON.stringify(data))
-					}
+					// if(this.userSelectIndex === 0){
+						// this.vistors = JSON.parse(JSON.stringify(data))
+					// }
 				});
 			},
 			getVisitors() {
@@ -62,8 +62,8 @@
 				param.limit = 10000
 				this.$http.req('user/get_visitors', {}, 'GET').then(data=>{
 					if(data == -1) return
-					this.getBookData()
 					this.vistors = data
+					this.getBookData()
 				});
 			},
 			pageInit() {
diff --git a/pages/user_modify/user_modify.vue b/pages/user_modify/user_modify.vue
index 8b4182a..6ebd4ca 100644
--- a/pages/user_modify/user_modify.vue
+++ b/pages/user_modify/user_modify.vue
@@ -80,7 +80,7 @@
 						  return
 					  	}
 						uni.showToast({
-							title:data.msg
+							title:'修改成功'
 						})
 					  	if(that.tempFilePaths) that.uinfo.user_avatar = that.tempFilePaths
 					  }catch(e){