From ff0969ac4b6d110c49ee22ffea70122017f86854 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 24 八月 2022 13:28:59 +0800
Subject: [PATCH] #

---
 pages/basics/notificationFile.vue |   23 ++++++++++++++++++-----
 manifest.json                     |    4 ----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/manifest.json b/manifest.json
index 0ba0751..e27bac1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,11 +2,7 @@
     "name" : "涓壃WMS",
     "appid" : "__UNI__DA5854D",
     "description" : "",
-<<<<<<< HEAD
     "versionName" : "20220824A",
-=======
-    "versionName" : "20220820A",
->>>>>>> 455e1c7242cd79491e2c034c85d60ae7247c0255
     "versionCode" : 103,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
diff --git a/pages/basics/notificationFile.vue b/pages/basics/notificationFile.vue
index 79de519..2693199 100644
--- a/pages/basics/notificationFile.vue
+++ b/pages/basics/notificationFile.vue
@@ -1,6 +1,10 @@
 <template>
 	<view>
-		
+		<view style="width: 100%;height: 200rpx;background-color: aqua;margin-top: 10rpx;"
+			v-for="(item,index) in listData" :key="index">
+			<text>{{index}}</text>
+		</view>
+		<uni-load-more :status="status" :icon-size="16" :content-text="contentText" />
 	</view>
 </template>
 
@@ -10,7 +14,13 @@
 			return {
 				commonUrl:null,
 				listData: [],
-				
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '涓婃媺鍔犺浇鏇村',
+					contentrefresh: '鍔犺浇涓�',
+					contentnomore: '娌℃湁鏇村'
+				}
 			};
 		},
 		onLoad() {
@@ -24,10 +34,12 @@
 			this.getList()
 		},
 		onPullDownRefresh() {
+			this.reload = true;
 			this.getList()
 		},
 		onReachBottom() {
-			
+			this.status = 'more';
+			this.getList();
 		},
 		methods: {
 			// 鑾峰彇url
@@ -36,12 +48,11 @@
 			},
 			getList() {
 				let that = this
-				console.log(that.commonUrl);
 				uni.request({
 					url: that.commonUrl + '/waitPakin/list/auth',
 					data:{
 						curr:1,
-						limit:16,
+						limit:10,
 					},
 					header: {
 						'token':uni.getStorageSync('token')
@@ -52,7 +63,9 @@
 						let res = result.data
 						if (res.code === 200) {
 							if (res.data) {
+								let list = res.data.records
 								that.listData = this.reload ? list : this.listData.concat(list);
+								this.reload = false;
 								
 							}
 						}

--
Gitblit v1.9.1