From e6a8b10605cbe9e059dd61766f2e39e8f80599e8 Mon Sep 17 00:00:00 2001
From: kuaileWu <1432334894@qq.com>
Date: Tue, 7 May 2024 14:44:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=B0=B1=E8=AF=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                          | 29 +++++------------------
 pages/index/index.vue               | 13 +++++-----
 pages/login/login.vue               | 22 -----------------
 pages/map/map.vue                   | 47 -------------------------------------
 pages/prebook/prebook.vue           |  3 ---
 pages/prebook_list/prebook_list.vue |  6 +++--
 pages/visitors/visitors.vue         |  2 +-
 7 files changed, 17 insertions(+), 105 deletions(-)
 delete mode 100644 pages/login/login.vue
 delete mode 100644 pages/map/map.vue

diff --git a/pages.json b/pages.json
index fe916df..c118540 100644
--- a/pages.json
+++ b/pages.json
@@ -3,22 +3,14 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "预约就诊"
 			}
 		},
         {
             "path" : "pages/prebook_list/prebook_list",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "预约列表",
-                "enablePullDownRefresh": false
-            }
-        },
-        {
-            "path" : "pages/map/map",
             "style" :
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText": "预约列表",
                 "enablePullDownRefresh": false
             }
         },
@@ -60,30 +52,21 @@
             "path" : "pages/prebook/prebook",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText": "预约就诊",
                 "enablePullDownRefresh": false
             }
         },
         {
             "path" : "pages/visitors/visitors",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-        },
-		{
-            "path" : "pages/login/login",
             "style" :
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText": "就诊人",
                 "enablePullDownRefresh": false
-            }
-		}
+            }
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",
 		"navigationStyle":"custom"
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 24dd3b8..a2b88df 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -107,11 +107,11 @@
 				// if(!rebackPagePath)
 			}
 		},
-		onShow() {
+		async onShow() {
 			this.doctor_id = getApp().globalData.doctorId
 			if(!this.doctor_id) return
 
-			var title = ''
+			var title = '预约就诊'
 			if(this.code) title = '登录'
 			uni.setNavigationBarTitle({
 				title:title
@@ -123,7 +123,7 @@
 			// 	this.login()
 			// 	return
 			// }
-			this.getDoctorInfo()
+			await this.getDoctorInfo()
 		},
 		methods: {
 			toLocation(hospital){
@@ -160,10 +160,9 @@
 				// 	}
 				// });
 			},
-			getDoctorInfo() {
+			async getDoctorInfo() {
 				// if(this.loginToken) return;
-				
-				this.$http.req('index_info', {}, 'GET').then(data=>{
+				await this.$http.req('index_info', {}, 'GET').then(data=>{
 					if(data == -1) return
 					this.pageShow = true
 					this.doctorInfo = data
@@ -174,7 +173,7 @@
 					if(this.doctorInfo.hospital_list && this.doctorInfo.hospital_list.length>0){
 						this.hospitals = this.doctorInfo.hospital_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
 					}
diff --git a/pages/login/login.vue b/pages/login/login.vue
deleted file mode 100644
index 8183fd0..0000000
--- a/pages/login/login.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>
diff --git a/pages/map/map.vue b/pages/map/map.vue
deleted file mode 100644
index 677f9a6..0000000
--- a/pages/map/map.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-	<view>
-		<!-- <view> 
-		<a href="http://uri.amap.com/navigation?from=114.02597366,22.54605355&to=114.029243,22.609562&mode=car&src=nyx_super;">高德地图</a>
-		</view>
-		<view>
-			<a href="https://uri.amap.com/marker?position=114.02597366,22.54605355&name=深圳南山">高德地图OK</a>
-			<a href="http://uri.amap.com/marker?position=34.5145141,25.6414014&name=test&src=mypage&coordinate=gaode&callnative=00">高德地图OK</a>
-		</view>
-		<view>			
-			<a href="http://api.map.baidu.com/marker?location=31.2503561772,121.3322653843&title=沃尔玛门店&content=即将前往目的地&output=html&src=webapp.baidu.openAPIdemo">百度地图</a>
-		</view>
-		<view>			
-			<a href='http://apis.map.qq.com/uri/v1/marker?marker=coord:31.2353,121.48108;addr:上海市人民广场'>腾讯地图</a>
-		</view>
-		<view>			
-			<a href='http://apis.map.qq.com/uri/v1/marker?marker=coord:22.54605355,114.02597366;addr:深圳南山'>腾讯地图2</a>			
-		</view>
-		<view>			
-			<a href='https://apis.map.qq.com/uri/v1/marker?marker=coord:39.892326,116.342763;title:超好吃冰激凌;addr:手帕口桥北铁路道口&referer=myapp'>腾讯地图3</a>
-		</view>
-
-		<view class="btna" @click="mapbtn">确定</view> -->
-		<!-- https://blog.csdn.net/jinsedeme0881/article/details/135838478 -->
-		<!-- https://www.cnblogs.com/wangRong-smile/p/12027366.html -->
-		
-		<!-- http://apis.map.qq.com/uri/v1/marker?marker=coord:23.54605355,104.02597366;addr:深圳南山 -->
-		<!-- http://apis.map.qq.com/uri/v1/marker?marker=coord:22.54605355,114.02597366;addr:深圳南山 -->
-		
-		<!-- http://uri.amap.com/marker?position=39.938794,116.427134&name=test&src=mypage&coordinate=gaode&callnative=00 -->
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-		}
-	},
-	methods: {
-		mapbtn() {
-		}
-	}
-}
-</script>
-<style>
-</style>
diff --git a/pages/prebook/prebook.vue b/pages/prebook/prebook.vue
index ccbf98f..2114723 100644
--- a/pages/prebook/prebook.vue
+++ b/pages/prebook/prebook.vue
@@ -51,9 +51,6 @@
 	import SliderBox from '@/components/sliderBox.vue'
 	export default {
 		onLoad(op) {
-			uni.setNavigationBarTitle({
-				title:'李静医生预约就诊'
-			})
 		},
 		data() {
 			return {
diff --git a/pages/prebook_list/prebook_list.vue b/pages/prebook_list/prebook_list.vue
index 9b8f194..6dfe0c4 100644
--- a/pages/prebook_list/prebook_list.vue
+++ b/pages/prebook_list/prebook_list.vue
@@ -42,11 +42,13 @@
 				var timerobj = setTimeout(function(){
 					uni.hideLoading()
 				}, 3000)
-				this.$http.req('client/user/appoint/', param, 'GET', true).then(data=>{
+				this.$http.req('get_appoints', param, 'POST', true).then(data=>{
 					clearTimeout(timerobj)
 					uni.hideLoading()
 					if(data == -1) return
 					this.bookList = data.data
+					console.log(123)
+					
 					// this.bookList = [
 					// 		  {
 					// 			"id": 27,
@@ -254,7 +256,7 @@
 				var param = new Object()
 				param.page = 1
 				param.limit = 10000
-				this.$http.req('client/user/visit_user/', param, 'GET').then(data=>{
+				this.$http.req('get_appoints', param).then(data=>{
 					if(data == -1) return
 					this.getBookData()
 					this.vistors = data.data
diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue
index ee6821c..e4a9669 100644
--- a/pages/visitors/visitors.vue
+++ b/pages/visitors/visitors.vue
@@ -97,7 +97,7 @@
 				return
 			}
 		},
-		onShow() {
+		onReady() {
 			if(this.type == 2){
 				uni.setNavigationBarTitle({
 					title:'就诊人'