From 765511b4d4d28941b45e13024c7328835b5596dd Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Thu, 16 Nov 2023 10:52:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=97=B6=E5=AF=BC=E8=87=B4=E4=B8=8A=E6=BB=91=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=97=B6=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/salesOrderList/salesOrderList.vue | 8 ++++++--
 pages/welcome/welcome.vue                     | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pages/index/salesOrderList/salesOrderList.vue b/pages/index/salesOrderList/salesOrderList.vue
index 54b31ac..f6693c6 100644
--- a/pages/index/salesOrderList/salesOrderList.vue
+++ b/pages/index/salesOrderList/salesOrderList.vue
@@ -85,14 +85,17 @@
 		},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
-				this.isLoadMore = true
+				// this.isLoadMore = true
 				this.pageNum += 1
-				this.serviceList = [];
+				// this.serviceList = [];
 				this.getOrderList();
 			}
 		},
 		onShow() {
 			this.serviceList = [];
+			this.goodtyid = 2;
+			this.pageNum = 1;
+			this.isLoadMore = false;
 			this.getOrderList();
 		},
 		methods: {
@@ -101,6 +104,7 @@
 				this.goodtyid = item.id;
 				this.pageNum = 1;
 				this.serviceList = [];
+				this.isLoadMore = false;
 				this.getOrderList();
 			},
 
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index b7faca9..bfad874 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -39,6 +39,11 @@
 					this.getAccessToken();//获取openID
 				
 			} else {
+				
+				uni.setStorageSync("accountId","");
+				uni.setStorageSync("urlKey","");
+				uni.setStorageSync("urlCode","");
+				
 				if(locationPathArr[1]){
 					let accountId = locationPathArr[1].split("&")[0];
 					app.globalData.accountId=accountId;