From 1d4ef611dd517495e625995a4b491e3966dcb1d5 Mon Sep 17 00:00:00 2001
From: "97694732@qq.com" <Long6166@@>
Date: Wed, 3 Jun 2026 17:51:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93/=E8=B4=A7=E4=BD=8D=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=A2=9E=E5=8A=A0=E8=AF=A6=E7=BB=86=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?(URL/=E5=8F=82=E6=95=B0/=E8=BF=94=E5=9B=9E=E5=80=BC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/upload/upload.vue | 15 +++++++++------
 utils/api.js            | 18 ++++++++++++------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/pages/upload/upload.vue b/pages/upload/upload.vue
index 45dfdb5..5cf76e4 100644
--- a/pages/upload/upload.vue
+++ b/pages/upload/upload.vue
@@ -1122,12 +1122,15 @@ export default {
 			this.popupLoading = true
 			try {
 				const res = await getWarehouseList({ status: 1, page: 1, page_size: 100 })
-				if (res.code === 0 && res.data && res.data.list) {
-					this.popupWarehouseList = res.data.list
-					if (this.popupWarehouseList.length > 0) {
-						this.popupActiveWhIndex = 0
-						this.loadPopupLocations(this.popupWarehouseList[0].id)
-					}
+				console.log('仓库列表原始响应:', JSON.stringify(res))
+				// 兼容多种响应格式
+				const list = res.data?.list || res.data?.records || res.list || res.records || []
+				if (list.length > 0) {
+					this.popupWarehouseList = list
+					this.popupActiveWhIndex = 0
+					this.loadPopupLocations(list[0].id)
+				} else {
+					console.warn('仓库列表为空, 响应code:', res.code, '响应data:', JSON.stringify(res.data))
 				}
 			} catch (e) {
 				console.error('加载仓库失败:', e)
diff --git a/utils/api.js b/utils/api.js
index 8c3aba0..2f24acd 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -155,7 +155,9 @@ function getAuthToken() {
 export function getWarehouseList(params = {}) {
 	return new Promise((resolve, reject) => {
 		const url = generateSignedUrl(`${BASE_URL}/api/warehouse/list`, params)
-		console.log('请求仓库列表URL:', url)
+		console.log('【仓库列表】请求URL:', url)
+		console.log('【仓库列表】请求参数:', JSON.stringify(params))
+		console.log('【仓库列表】Authorization:', 'Bearer ' + getAuthToken())
 		uni.request({
 			url: url,
 			method: 'GET',
@@ -163,7 +165,8 @@ export function getWarehouseList(params = {}) {
 				'Authorization': 'Bearer ' + getAuthToken()
 			},
 			success: (res) => {
-				console.log('仓库列表请求成功:', res.statusCode, res.data)
+				console.log('【仓库列表】响应状态码:', res.statusCode)
+				console.log('【仓库列表】响应数据:', JSON.stringify(res.data))
 				if (res.statusCode === 200) {
 					resolve(res.data)
 				} else {
@@ -171,7 +174,7 @@ export function getWarehouseList(params = {}) {
 				}
 			},
 			fail: (err) => {
-				console.error('仓库列表请求失败:', err)
+				console.error('【仓库列表】请求失败:', JSON.stringify(err))
 				reject(err)
 			}
 		})
@@ -184,7 +187,9 @@ export function getWarehouseList(params = {}) {
 export function getLocationList(params = {}) {
 	return new Promise((resolve, reject) => {
 		const url = generateSignedUrl(`${BASE_URL}/api/location/list`, params)
-		console.log('请求货位列表URL:', url)
+		console.log('【货位列表】请求URL:', url)
+		console.log('【货位列表】请求参数:', JSON.stringify(params))
+		console.log('【货位列表】Authorization:', 'Bearer ' + getAuthToken())
 		uni.request({
 			url: url,
 			method: 'GET',
@@ -192,7 +197,8 @@ export function getLocationList(params = {}) {
 				'Authorization': 'Bearer ' + getAuthToken()
 			},
 			success: (res) => {
-				console.log('货位列表请求成功:', res.statusCode, res.data)
+				console.log('【货位列表】响应状态码:', res.statusCode)
+				console.log('【货位列表】响应数据:', JSON.stringify(res.data))
 				if (res.statusCode === 200) {
 					resolve(res.data)
 				} else {
@@ -200,7 +206,7 @@ export function getLocationList(params = {}) {
 				}
 			},
 			fail: (err) => {
-				console.error('货位列表请求失败:', err)
+				console.error('【货位列表】请求失败:', JSON.stringify(err))
 				reject(err)
 			}
 		})