change

manifest.json

@@ -2,8 +2,8 @@
     "name" : "欧伦",
     "appid" : "__UNI__DE2F207",
     "description" : "欧伦WMS手持系统",
-    "versionName" : "1.0.0",
+    "versionName" : "1.0.1",
-    "versionCode" : 100,
+    "versionCode" : 101,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

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.dataList = res.data
-					// this.totalCount = res.totalElements
+					this.totalCount = res.totalElements
-					// if (res.totalElements > 0) {
+					if (res.totalElements > 0) {
-					// 	const dataMap = res.content
+						const dataMap = res.data
-					// 	this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
-					// 	this.reload = false
+						this.reload = false
-					// } else {
+					} else {
-					// 	this.dataList = []
+						this.dataList = []
-					// }
+					}
-					// if (this.totalCount == this.dataList.length) {
+					if (this.totalCount == this.dataList.length) {
-					// 	this.reload = false
+						this.reload = false
-					// 	this.status = 'noMore'
+						this.status = 'noMore'
-					// }
+					}
 				}
 			},
 			onReachBottom () {

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 = {