From 8e8ff976b3504e238b76e7bb0e67ccbbee610eee Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 15 Jul 2025 17:03:42 +0800
Subject: [PATCH] change

---
 manifest.json               |  4 ++--
 pages/common/mater-list.vue | 26 +++++++++++++-------------
 utils/getData3.js           |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/manifest.json b/manifest.json
index 4ddf7bc..3c54387 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "欧伦",
     "appid" : "__UNI__DE2F207",
     "description" : "欧伦WMS手持系统",
-    "versionName" : "1.0.0",
-    "versionCode" : 100,
+    "versionName" : "1.0.1",
+    "versionCode" : 101,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue
index 1cede0d..a34d69d 100644
--- a/pages/common/mater-list.vue
+++ b/pages/common/mater-list.vue
@@ -95,19 +95,19 @@
 			async _getMaterialList () {
 				let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '')
 				if (res.code === '200') {
-					this.dataList = res.data
-					// this.totalCount = res.totalElements
-					// if (res.totalElements > 0) {
-					// 	const dataMap = res.content
-					// 	this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
-					// 	this.reload = false
-					// } else {
-					// 	this.dataList = []
-					// }
-					// if (this.totalCount == this.dataList.length) {
-					// 	this.reload = false
-					// 	this.status = 'noMore'
-					// }
+					// this.dataList = res.data
+					this.totalCount = res.totalElements
+					if (res.totalElements > 0) {
+						const dataMap = res.data
+						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+						this.reload = false
+					} else {
+						this.dataList = []
+					}
+					if (this.totalCount == this.dataList.length) {
+						this.reload = false
+						this.status = 'noMore'
+					}
 				}
 			},
 			onReachBottom () {
diff --git a/utils/getData3.js b/utils/getData3.js
index 102f5c9..451255c 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -2,7 +2,7 @@ import request from './request.js'
 
 // 版本更新测试
 export const pdaUpdate = () => request({
-	url:'api/pda//iosout/update'
+	url:'api/pda/iosout/update'
 })
 // export const pdaUpdate = () => {
 // 	let res = {