市场秩序下拉刷新调整

pages/breakwords-handle/breakwords-handle.nvue

@@ -84,7 +84,7 @@
 						<text class="empty-text">暂无数据</text>
 					</view>
 				</cell>
-				<view class="planout-block-item__last"> </view>
+				<!-- <view class="planout-block-item__last"> </view> -->
 			</list>
 
 		</view>
@@ -335,6 +335,7 @@
 		background: #f0f4f5;
 		padding: 0 16rpx;
 		overflow-y: scroll;
+		padding-bottom: 60rpx
 	}
 
 	.navs-block {

pages/breakwords-market/breakwords-market.nvue

@@ -87,7 +87,7 @@
 						<text class="empty-text">暂无数据</text>
 					</view>
 				</cell>
-				<view class="planout-block-item__last"> </view>
+				<!-- <view class="planout-block-item__last"> </view> -->
 			</list>
 
 		</view>
@@ -122,7 +122,7 @@
 				},
 				page: {
 					"currentPage": "1",
-					"pageSize": "10",
+					"pageSize": "4",
 				},
 				loadParams: {
 					total: 0,

pages/breakwords-mission/breakwords-mission.nvue

@@ -69,7 +69,7 @@
 						<text class="empty-text">暂无数据</text>
 					</view>
 				</cell>
-				<view class="planout-block-item__last"> </view>
+				<!-- <view class="planout-block-item__last"> </view> -->
 			</list>
 
 		</view>
@@ -126,7 +126,7 @@
 			},
 			scrollHeight() {
 				return {
-					'height': `${this.sysinfo.safeArea.height - 44 - 27 }px`
+					'height': `${this.sysinfo.safeArea.height - 44 - 56 }px`
 				}
 			},
 
@@ -137,6 +137,49 @@
 			this.getClueList()
 		},
 		methods: {
+			async getAllLists(isRefresh){
+				const params1 = {
+					...this.page,
+					...this.condition,
+					type: 1
+				}
+				const params2 = {
+					...this.page,
+					...this.condition,
+					type: 2
+				}
+				uni.showLoading({
+					title: '加载中'
+				});
+				setTimeout(function() {
+					uni.hideLoading();
+				}, 2000);
+				const res1 = await apiGetMissionList(params1)
+				const res2 = await apiGetMissionList(params2)
+				uni.hideLoading();
+				
+				const {
+					count,
+					pagesize,
+					data,
+					results
+				} = res1.data
+				console.log(res2.data,'res2.data')
+				this.loadParams.total = data.concat(res2.data.data).length
+				this.loadParams.totalPage = Math.ceil((count * 1 + res2.data.count * 1)/ (pagesize * 1))
+				
+				
+				if (isRefresh) {
+					this.lists = data.concat(res2.data.data)
+					this.loadParams.isDone = false
+				} else {
+					this.lists = this.lists.concat(data.concat(res2.data.data))
+				}
+				
+				setTimeout(() => {
+					this.refreshing = false;
+				}, 300)
+			},
 			async getClueList(isRefresh) {
 				if (this.loadParams.isDone) {
 					return
@@ -148,7 +191,8 @@
 					this.condition.type = 0
 				} else {
 					this.condition.type = 2
-
+					// this.getAllLists(isRefresh)
+					// return
 				}
 
 				params = {
@@ -298,7 +342,7 @@
 			},
 			checkTab(i) {
 				this.activeTabIndex = i
-				this.lists = []
+				this.reset()
 				this.getClueList()
 			},
 			handleStatustext(item) {