|
|
@@ -235,11 +235,10 @@ class VMHome : VMBase() {
|
|
|
// 执行接口数据请求
|
|
|
ApiRequest.getJobs(hashMapOf("pageNo" to page.page, "pageSize" to page.pageSize, "status" to page.type, "key" to page.keywords))
|
|
|
.onSuccess {
|
|
|
- if (page.page == 1) _state.value.jobList.clear()
|
|
|
val newJobs = _state.value.jobList.toMutableList()
|
|
|
+ if (page.page == 1) newJobs.clear()
|
|
|
val jobs = it.data?.list ?: emptyList()
|
|
|
newJobs.addAll(jobs)
|
|
|
- _state.value.jobList.addAll(jobs)
|
|
|
// 存储页面数据
|
|
|
delay(1000)
|
|
|
_state.value = _state.value.copy(
|
|
|
@@ -272,11 +271,10 @@ class VMHome : VMBase() {
|
|
|
newTasks.addAll(tasks)
|
|
|
delay(1000)
|
|
|
// 存储页面数据
|
|
|
- _state.value =
|
|
|
- _state.value.copy(
|
|
|
- taskPage = page.copy(isRefresh = false, noMore = (it.data?.total ?: 0) == newTasks.size),
|
|
|
- taskList = newTasks
|
|
|
- )
|
|
|
+ _state.value = _state.value.copy(
|
|
|
+ taskPage = page.copy(isRefresh = false, noMore = (it.data?.total ?: 0) == newTasks.size),
|
|
|
+ taskList = newTasks
|
|
|
+ )
|
|
|
}.onFailure {
|
|
|
delay(1000)
|
|
|
_state.value =
|