From 3c7384ca75ab29368c22f55e4f7917fd3bff67a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 12 Oct 2023 10:29:09 +0800
Subject: [PATCH] =?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

---
 pages.json                                       |  5 +++--
 pages/homepage/homepage.vue                      | 13 +++++--------
 pagesC/ServiceAppointment/ServiceAppointment.vue |  4 ++--
 pagesC/appointmenttime/appointmenttime.vue       |  4 ++--
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pages.json b/pages.json
index a3329b9..b6f9561 100644
--- a/pages.json
+++ b/pages.json
@@ -9,7 +9,7 @@
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
-		},{
+		}, {
 			"path": "pages/homepage/homepage",
 			"style": {
 				"enablePullDownRefresh": false,
@@ -414,6 +414,7 @@
 					"enablePullDownRefresh": false
 				}
 			},
+			
 			{
 				"path": "Filinginformation/Filinginformation",
 				"style": {
@@ -545,4 +546,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index d3f91a7..67f1ec8 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -203,14 +203,11 @@
 			},
 			// 服务预约
 			goappoint() {
-				uni.navigateTo({
-					url: '/pagesC/ServiceAppointment/ServiceAppointment'
-				})
-				// if (!this.userinfo && !this.identity) {
-					// this.gologin();
-				// } else {
-					// this.detailinfo('', '/pagesC/ServiceAppointment/ServiceAppointment')
-				// }
+				if (!this.userinfo && !this.identity) {
+					this.gologin();
+				} else {
+					this.detailinfo('', '/pagesC/ServiceAppointment/ServiceAppointment')
+				}
 			},
 			// 服务记录
 			servicerecord() {
diff --git a/pagesC/ServiceAppointment/ServiceAppointment.vue b/pagesC/ServiceAppointment/ServiceAppointment.vue
index 34e22ba..1b8ce08 100644
--- a/pagesC/ServiceAppointment/ServiceAppointment.vue
+++ b/pagesC/ServiceAppointment/ServiceAppointment.vue
@@ -38,7 +38,7 @@
 					backgroundColor: '#26A888',
 				},
 				projectName: '',
-				identity: '372431196910127051',
+				identity: '',
 				region: '',
 				listinfo: [],
 				appointlist: [],
@@ -59,7 +59,7 @@
 		methods: {
 			getlist() {
 				this.userinfo = uni.getStorageSync('userinfo');
-				// this.identity=this.userinfo.cardNo
+				this.identity=this.userinfo.cardNo
 				this.region = this.userinfo.cityCode;
 				getForm(this.identity, this.region, this.projectName).then(res => {
 					this.listinfo = res.data
diff --git a/pagesC/appointmenttime/appointmenttime.vue b/pagesC/appointmenttime/appointmenttime.vue
index abbd95c..da182b4 100644
--- a/pagesC/appointmenttime/appointmenttime.vue
+++ b/pagesC/appointmenttime/appointmenttime.vue
@@ -53,7 +53,7 @@
 				if (this.listitem.sourceType == '1') {
 					this.listitem.packageNo = this.appointlist.packageId
 					this.listitem.formNo = this.appointlist.projectId
-					this.listitem.identity='372431196910127051'
+					this.listitem.identity=this.userinfo.cardNo
 					this.listitem.applyStartTime = this.datetimerange[0]
 					this.listitem.applyEndTime = this.datetimerange[1]
 					this.listitem.formName = this.appointlist.projectName
@@ -74,7 +74,7 @@
 						}
 					})
 				} else if (this.listitem.sourceType == '2') {
-					this.listitem.identity='372431196910127051'
+					this.listitem.identity=this.userinfo.cardNo
 					this.listitem.applyStartTime = this.datetimerange[0]
 					this.listitem.applyEndTime = this.datetimerange[1]
 					console.log(this.listitem, '555')