From 8cc51e3f20f3bef5bb4f39920eca32f02b7e261b Mon Sep 17 00:00:00 2001
From: "97694732@qq.com" <Long6166@@>
Date: Thu, 4 Jun 2026 18:01:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:token=E4=BB=8Estorage=E8=AF=BB=E5=8F=96+NEE?=
 =?UTF-8?q?D=5FLOGIN=E5=BC=B9=E7=AA=97=E5=A2=9E=E5=8A=A0=E5=8E=BB=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/upload/upload.vue | 22 ++++++++++++++++------
 utils/api.js            |  4 ++--
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/pages/upload/upload.vue b/pages/upload/upload.vue
index cca4188..c45849f 100644
--- a/pages/upload/upload.vue
+++ b/pages/upload/upload.vue
@@ -1402,11 +1402,16 @@ export default {
 				console.error('加载仓库失败:', e)
 				const errMsg = e.message || String(e)
 				if (errMsg.includes('NEED_LOGIN')) {
-					const displayMsg = errMsg.replace('NEED_LOGIN:', '')
 					uni.showModal({
 						title: '系统提示',
-						content: displayMsg,
-						showCancel: false
+						content: 'PSI系统登录已过期，请重新登录',
+						confirmText: '去登录',
+						cancelText: '取消',
+						success: (modalRes) => {
+							if (modalRes.confirm) {
+								uni.navigateTo({ url: '/pages/login/login' })
+							}
+						}
 					})
 				}
 			} finally {
@@ -1464,11 +1469,16 @@ export default {
 				console.error('加载货位失败:', e)
 				const errMsg = e.message || String(e)
 				if (errMsg.includes('NEED_LOGIN')) {
-					const displayMsg = errMsg.replace('NEED_LOGIN:', '')
 					uni.showModal({
 						title: '系统提示',
-						content: displayMsg,
-						showCancel: false
+						content: 'PSI系统登录已过期，请重新登录',
+						confirmText: '去登录',
+						cancelText: '取消',
+						success: (modalRes) => {
+							if (modalRes.confirm) {
+								uni.navigateTo({ url: '/pages/login/login' })
+							}
+						}
 					})
 				}
 				this.popupLocationList = this.popupAllLocationList
diff --git a/utils/api.js b/utils/api.js
index 27df417..3df2b4e 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -150,8 +150,8 @@ function requestWithRetry(requestFn, apiName) {
 	return requestFn(getAuthToken()).catch((err) => {
 		const errMsg = err.message || String(err)
 		console.error(`【${apiName}】请求失败:`, errMsg)
-		if (errMsg.includes('401') || errMsg.includes('无效的认证令牌') || errMsg.includes('未登录')) {
-			throw new Error('NEED_LOGIN:PSI系统登录已过期，请在登录页重新登录')
+		if (errMsg.includes('401') || errMsg.includes('无效的认证令牌')) {
+            throw new Error('NEED_LOGIN:PSI系统登录已过期，请在登录页重新登录')
 		}
 		throw err
 	})