From 743cc6f4a5cde7aa832743b5c432d2701c1745f5 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 12 Dec 2022 17:39:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api.js                  | 2 +-
 src/api/request.js              | 2 +-
 src/views/roadmap/LearnPath.vue | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index 07538cd..c208592 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -14,7 +14,7 @@ export const COMMON_TOKEN = 'https://upload-z2.qiniup.com'
 export const ROUTER_CHAPTER_LIST = '/stu/router/chapterList'
 export const ROUTER_LIST = '/stu/router/list post'
 export const ROUTER_PROCESS = '/stu/router/process'
-export const ROUTER_UNCOMPLETE_LIST = '/stu/router/unCompleteTaskList'
+export const ROUTER_UNCOMPLETE_LIST = '/stu/router/unCompleteTaskList post'
 export const TAS_ACTIVITY_DETAIL = '/activity'
 export const TASK_ACTIVITY_SIGN = '/activitySubmit/updateActivitySignInStatus post'
 export const TASK_BROADCAST_COMMIT = '/stu/task/broadcast/commit'
diff --git a/src/api/request.js b/src/api/request.js
index bfe5eb0..8a71ade 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -21,7 +21,7 @@ export function usePage(_url, param) {
     function fetchData() {
         state.loading = true
         request(_url, state.params).then(r => {
-            state.params.pageNo === 1 ? (state.data = r.data.records) : (state.data = [...state.data, ...r.data.records])
+            state.params.pageNo === 1 ? (state.data = (r.data.records||r.data.rows)) : (state.data = [...state.data, ...(r.data.records||r.data.rows)])
             state.size = r.data.size
             state.total = r.data.total
             state.current = r.data.current
diff --git a/src/views/roadmap/LearnPath.vue b/src/views/roadmap/LearnPath.vue
index d0de9a8..106e2d0 100644
--- a/src/views/roadmap/LearnPath.vue
+++ b/src/views/roadmap/LearnPath.vue
@@ -64,7 +64,7 @@
       <!-- 路径列表-->
       <div :style="{ display: !showmapdetail ? 'flex' : 'none' }" class="head">
         <div style="min-width: 770px; width: 100%">
-          <el-table :data="data.rows" style="width: 100%" @row-click="gofun">
+          <el-table :data="data" style="width: 100%" @row-click="gofun">
             <el-table-column
                 prop="img"
                 label="缩略图"
@@ -131,12 +131,13 @@ import {reactive, toRefs, ref} from "vue";
 import nostarted from '../../assets/image/nostarted.png'
 import completed from '../../assets/image/completed.png'
 import ongoing from '../../assets/image/ongoing.png'
-import {request, useRequest} from "@/api/request";
+import {request, usePage, useRequest} from "@/api/request";
 import {ROUTER_CHAPTER_LIST, ROUTER_LIST, ROUTER_UNCOMPLETE_LIST} from "@/api/api";
 import {useImage} from "@/api/utils";
 
 const detail = ref()
-const {data} = useRequest(ROUTER_LIST, {})
+const {data} = usePage(ROUTER_LIST, {})
+
 const {unCompleteTaskList} = useRequest(ROUTER_UNCOMPLETE_LIST, {})
 const state = reactive({
   showmapdetail: false,