From b331ba531a81c3c60d26eba856b5b3905153aba8 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 23 九月 2024 14:46:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-2.0' into master-2.0

---
 pages/home/supplier-home.vue |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pages/home/supplier-home.vue b/pages/home/supplier-home.vue
index e673783..80bfe0b 100644
--- a/pages/home/supplier-home.vue
+++ b/pages/home/supplier-home.vue
@@ -255,6 +255,7 @@
 		},
 		async onPullDownRefresh() {
 			await this.$store.dispatch('getCurrentInfo')
+			await getTj(true)
 			uni.stopPullDownRefresh()
 		},
 		onLoad(options) {
@@ -262,7 +263,7 @@
 			const urlcode = options.url && decodeURIComponent(options.url) || ''
 		},
 		onShow() {
-			this.getTj()
+			this.getTj(true)
 		},
 		created() {
 			//公告
@@ -447,10 +448,10 @@
 					},
 				})
 			},
-			getTj() {
+			getTj(refresh=false) {
 				// /api/supplier/delivery	
 
-				if (this.currentInfo.id && this.currentInfo.id !== this.cacheUserId) {
+				if (this.currentInfo.id && (this.currentInfo.id !== this.cacheUserId || refresh)) {
 					this.cacheUserId = this.currentInfo.id
 					let that = this
 					setTimeout(() => {

--
Gitblit v1.9.3