From c92e539cd1ceeecc851bddf9c7468081c16dd45e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 30 九月 2025 10:54:15 +0800
Subject: [PATCH] pda功能初始化

---
 pages/order/orderComb.vue     |    1 +
 pages/warehouse/orderList.vue |   10 +++++++++-
 pages/home/home.vue           |   18 +++++++++---------
 pages/mat/matQuery.vue        |    8 ++++----
 pages/pakin/pakin.vue         |    4 ++--
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 7ce7cc5..86503a6 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -47,7 +47,14 @@
 						color: 'cyan',
 						cuIcon: 'pullup',
 						url: '/pakin/pakin'
-					},					
+					},		
+					{
+					title: '璁㈠崟缁勬墭',
+					name: 'orderComb',
+					color: 'olive',
+					cuIcon: 'pulldown',
+					url: '/order/orderComb'
+					},
 					// {
 					// 	title: '骞冲簱缁勬墭',
 					// 	name: 'putOn',
@@ -69,13 +76,6 @@
 						cuIcon: 'pullup',
 						url: '/warehouse/orderList'
 					},
-					// {
-					// 	title: '璁㈠崟缁勬墭',
-					// 	name: 'orderComb',
-					// 	color: 'olive',
-					// 	cuIcon: 'pulldown',
-					// 	url: '/order/orderComb'
-					// }
 					// ,
 					// {
 					// 	title: '骞舵澘鍏ュ簱',
@@ -183,7 +183,7 @@
 			if (this.storeId == 2) {
 				this.store = '鏂版槍浠�'
 			}
-			this.getAuth()
+			// this.getAuth()
 		},
 		methods: {
 			back() { uni.navigateBack({}) },
diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index 61d3e28..b1148c0 100644
--- a/pages/mat/matQuery.vue
+++ b/pages/mat/matQuery.vue
@@ -51,7 +51,7 @@
 					contentnomore: '娌℃湁鏇村'
 				},
 				// 褰撳墠tagId
-				tagIdNow: 108
+				tagIdNow: 5
 			}
 		},
 		onReachBottom() {
@@ -170,12 +170,12 @@
 						that.tagList = null
 						var res = result.data
 						if (res.code === 200) {
-							if (res.data.records != null && res.data.records.length > 0) {
-								let list = res.data.records
+							if (res.data != null && res.data.length > 0) {
+								let list = res.data
 								that.matList = that.reload ? list : that.matList.concat(list);
 								that.curr = that.curr + 1
 							}
-							if (res.data.records.length == 0) {
+							if (res.data.length == 0) {
 								that.status = 'noMore'
 							}
 							that.baColor = "background-color: #1cbbb4;"
diff --git a/pages/order/orderComb.vue b/pages/order/orderComb.vue
index 97c6d01..df9e280 100644
--- a/pages/order/orderComb.vue
+++ b/pages/order/orderComb.vue
@@ -401,6 +401,7 @@
 						return;
 					}
 				}
+				console.log(that.dataList)
 				uni.request({
 					url: that.baseUrl + '/mobile/comb/auth',
 					data: JSON.stringify({
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 35ccf35..4fc7979 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -34,7 +34,7 @@
 					<uni-icons type="right" color="#c1c1c1"></uni-icons>
 				</view>
 			</view>
-			<view class="item">
+<!-- 			<view class="item">
 				<view class="code-decs" style="width: 25vw;">鏄惁婊℃澘:</view>
 				<radio-group @change="isFullPlt">
 					<label>
@@ -44,7 +44,7 @@
 						<radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
 					</label>
 				</radio-group>
-			</view>
+			</view> -->
 		</view>
 		<!-- ----------------------------------------------  杈撳叆妗�  ----------------------------------------------------------- -->
 		<view class="mat-list-title">
diff --git a/pages/warehouse/orderList.vue b/pages/warehouse/orderList.vue
index 774f6fa..bd823d8 100644
--- a/pages/warehouse/orderList.vue
+++ b/pages/warehouse/orderList.vue
@@ -63,7 +63,15 @@
 					method: 'POST',
 					success(res) {
 						res = res.data
-						that.menuList = res.data
+						if (res.code === 200) {
+							that.menuList = res.data
+						} else if (res.code == 403) {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' });
+							setTimeout(() => {
+								uni.reLaunch({ url: '../login/login' });
+							}, 1000);
+						}
+						
 					}
 				})
 			},

--
Gitblit v1.9.1