From dfa00bcb0fd4cb5faf9d808c21c15ed86ce711e6 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Tue, 31 Oct 2023 10:40:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=A2=84=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesC/ServiceAppointment/ServiceAppointment.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pagesC/ServiceAppointment/ServiceAppointment.vue b/pagesC/ServiceAppointment/ServiceAppointment.vue
index 8b20be9..8bf0bc8 100644
--- a/pagesC/ServiceAppointment/ServiceAppointment.vue
+++ b/pagesC/ServiceAppointment/ServiceAppointment.vue
@@ -22,6 +22,7 @@
 				预约
 			</view>
 		</view>
+		<u-toast ref="uToast" />
 
 	</view>
 </template>
@@ -60,7 +61,16 @@
 				this.userinfo = uni.getStorageSync('userinfo');
 				this.identity = this.userinfo.cardNo
 				getForm(this.identity, this.projectName).then(res => {
-					this.listinfo = res.data
+					if(res.code==500){
+						this.$refs.uToast.show({
+							title: res.msg,
+							type: 'error',
+							duration: '1000',
+						})
+					}else{
+						this.listinfo = res.data
+
+					}
 				})
 			},
 			goprevious() {

From a538844ce746132ac1b4140896f35d134e2878d3 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Tue, 31 Oct 2023 13:39:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/homepage/homepage.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index e3e16ff..7943b1d 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -115,14 +115,14 @@
 				uni.setStorageSync("region", 3)
 			}
 			this.region = uni.getStorageSync('region')
-			if (this.region) {
-				if (this.region == "1" || this.region == "2") {
+			// if (this.region) {
+			// 	if (this.region == "1" || this.region == "2") {
 
-				} else {
-					this.family()
-				}
+			// 	} else {
+			// 		this.family()
+			// 	}
 
-			}
+			// }
 
 			if (this.userinfo) {
 				this.patientName = this.userinfo.patientName