diff --git a/src/api/api.js b/src/api/api.js index 4ff4e0f..be79b00 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -34,7 +34,7 @@ export const WORK_HISTROY = '/workSubmit/queryWorkDetailListByStuId' export const EXAMINATION_QUERY = examinationId => `/examination/queryExaminationDetailById?examinationId=${examinationId} post` export const DISCUSS_LIKE = '/discussSubmit/clickDiscussLikeCountOr post' -export const DISCUSS_LIST = '/discussSubmit/list' +export const DISCUSS_LIST = '/discussSubmit/taskList' export const DISCUSS_DETAIL = '/discussSubmit/detail' export const DISCUSS_SUBMIT_REVIEW_LIST = '/discussSubmit/queryDiscussSubmitAndReview' diff --git a/src/views/discuss/DiscussPage.vue b/src/views/discuss/DiscussPage.vue index 68bcbd9..662dc77 100644 --- a/src/views/discuss/DiscussPage.vue +++ b/src/views/discuss/DiscussPage.vue @@ -30,21 +30,21 @@ -
{{ projectInfo.name }}
+
{{ info.name }}
- {{ projectInfo.name }} + {{ info.name }}
-
+
-
{{ item.name }}
+
{{ info.sName }}
进行中
@@ -54,7 +54,7 @@ style="margin-left: 20px">最热
-
+
{{ d.discussName }}
{{ d.discussExplain }} @@ -93,20 +93,20 @@ import {reactive, ref, toRefs} from "vue"; import {useRoute, useRouter} from "vue-router"; const router = useRouter() -const {query: {id = 317}} = useRoute() +const {query: {id,type}} = useRoute() const param = ref({ - type: 1, + type, id }) -const {data: projectInfo} = useRequest(DISCUSS_LIST, param.value) +const {data: info} = useRequest(DISCUSS_LIST, param.value) const state = reactive({ activeName: "first", }); function comment({discussId: id}) { - router.push({path: 'discussdetail', query: {id}}) + router.push({path: 'discussdetail', query: {id,type}}) } function like(d) { diff --git a/src/views/discussdetail/DiscussDetail.vue b/src/views/discussdetail/DiscussDetail.vue index ea2c0dc..c72f80d 100644 --- a/src/views/discussdetail/DiscussDetail.vue +++ b/src/views/discussdetail/DiscussDetail.vue @@ -214,11 +214,11 @@ import { } from "@/api/api"; import UploadImg from '@/components/img/UploadImg.vue' -const {query: {id, discussSubmitId}} = useRoute() +const {query: {id, discussSubmitId,type}} = useRoute() const {data: commontList, fetchData: commonFetch} = usePage(COMMENT_LIST, {id, type: 1}) -const {data: disDetail} = useRequest(DISCUSS_DETAIL, {id}) +const {data: disDetail} = useRequest(DISCUSS_DETAIL, {id,type}) const fileList = ref([]) const commentSubmitFileList = ref([]) diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index c7d85c2..053d3b8 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -106,17 +106,17 @@ types.toName[value.type] || '' }}
-
-
去上课 -
- -
+ + + + + + + + + + +