diff --git a/src/views/Admin/userLog/hook.tsx b/src/views/Admin/userLog/hook.tsx index 0cc8c71..dfae7a5 100644 --- a/src/views/Admin/userLog/hook.tsx +++ b/src/views/Admin/userLog/hook.tsx @@ -77,8 +77,8 @@ export function useData() { }); if (code) { tableList.value = data.lists; - pagination.value.total = data.totalRow; - pagination.value.currentPage = data.pageNumber; + pagination.value.total = data.count; + pagination.value.currentPage = data.page; } loading.value = false; }; diff --git a/src/views/Statistical/taskAssignment/hook.tsx b/src/views/Statistical/taskAssignment/hook.tsx index c8ccf95..b1ffe78 100644 --- a/src/views/Statistical/taskAssignment/hook.tsx +++ b/src/views/Statistical/taskAssignment/hook.tsx @@ -44,9 +44,13 @@ export function useData() { label: "用户名称", prop: "nickname" }, + { + label: "领取任务时间", + prop: "collection_time" + }, { label: "完成任务时间", - prop: "createtime" + prop: "completion_time" }, { label: "任务名称",