diff --git a/pages/entry/entry.vue b/pages/entry/entry.vue
index 1eaabad..e5893d8 100644
--- a/pages/entry/entry.vue
+++ b/pages/entry/entry.vue
@@ -76,9 +76,17 @@ export default {
 		handleEntry(type) {
 			switch (type) {
 				case 'upload':
-					uni.navigateTo({
-						url: '/pages/warehouse/warehouse'
-					})
+					// 有待入库商品则直接跳转到上传页，否则去选仓库货位
+					var pendingList = uni.getStorageSync('pendingProductList') || []
+					if (pendingList.length > 0) {
+						uni.navigateTo({
+							url: '/pages/upload/upload'
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/warehouse/warehouse'
+						})
+					}
 					break
 				case 'refresh':
 					uni.showToast({