From 1d3acbd2992cac0123911f0ffc13a71910ae484b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 19 七月 2025 16:14:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 small-program/pages/index/index.vue |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue
index 1c2ed91..7d73195 100644
--- a/small-program/pages/index/index.vue
+++ b/small-program/pages/index/index.vue
@@ -392,23 +392,32 @@
 		},
 		async onLoad() {
 			await this.$onLaunched;
-			this.getCategoryLists()
-			this.getOrderList()
+			if(this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}') {
+				this.getOrderList()
+				this.getCategoryLists()
+			}
 			this.form.linkPhone = this.userInfo.telephone
 		},
 		onShow(options) {
 			this.typeViewId = 0
-			if(this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}'){
+			if(this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}') {
+				console.log('宸茬櫥闄�')
 				this.isLogin = true
+				
+				if (!this.isOnce && this.userInfo.useIdentity == 1) {
+					this.page = 1
+					this.next = true
+					this.orderList = []
+					this.getOrderList()
+				}
+				
+			} else {
+				this.isLogin = false
+				console.log('鏈櫥闄�')
 			}
+			
 			if (this.userInfo && this.userInfo.useIdentity == 1) {
 				this.typeViewId = 1
-			}
-			if (!this.isOnce && this.userInfo.useIdentity == 1) {
-				this.page = 1
-				this.next = true
-				this.orderList = []
-				this.getOrderList()
 			}
 		},
 		watch: {
@@ -421,7 +430,7 @@
 					this.form.longitude = ''
 					this.form.location = ''
 					this.form.locationEnd = ''
-					this.form.wayInfoDTOList = ''
+					this.form.wayInfoDTOList = []
 					this.form.workType = ''
 					this.form.days = ''
 					this.form.locationRemark = ''

--
Gitblit v1.9.3