From 8cb5831161a1e875cd7e3b94ebb58741bf42aa6e Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 13 Dec 2022 04:31:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A8=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api.js                            |  2 +-
 src/views/discuss/DiscussPage.vue         | 18 ++++++++---------
 src/views/discussdetail/DiscussDetail.vue |  4 ++--
 src/views/roadmap/PathDetails.vue         | 24 +++++++++++------------
 4 files changed, 24 insertions(+), 24 deletions(-)

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 @@
     </div>
     <!-- 面包屑导航 -->
     <!-- 标题 -->
-    <div class="title">{{ projectInfo.name }}</div>
+    <div class="title">{{ info.name }}</div>
     <!-- 标题 -->
     <!-- 详细内容 -->
     <div class="bascinfo clearfix">
       <!-- 中间部分 -->
       <div class="middletitle">
         <div class="title">
-          {{ projectInfo.name }}
+          {{ info.name }}
         </div>
 <!--        <button class="btn">发表帖子</button>-->
       </div>
 
-      <div v-for="(item,i) in projectInfo.stageVoList" :key="i">
+      <div>
         <div class="line clearfix">
-          <div class="linetitle">{{ item.name }}</div>
+          <div class="linetitle">{{ info.sName }}</div>
           <div class="radi"></div>
           <div class="intime">进行中</div>
         </div>
@@ -54,7 +54,7 @@
                   style="margin-left: 20px">最热
           </button>
         </div>
-        <div class="discusslist" v-for="(d,j) in item?.discussDtoList">
+        <div class="discusslist" v-for="(d,j) in info?.discussDtoList">
           <div class="itemtitle">{{ d.discussName }}</div>
           <div class="itemdiscuss">
             {{ 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] || ''
               }}
             </div>
-            <div :style="{ display: value.status === 1 ? 'block' : 'none' }">
-              <div
-                  class="goclass"
-                  :style="{ display: value.currentRatio === 0 ? 'none' : 'flex' }">去上课
-              </div>
-              <img
-                  style="width: 76px; height: 76px; margin-right: 61px"
-                  :style="{ display: value.currentRatio === 0 ? 'flex' : 'none' }"
-                  src="../../assets/image/pathdetails/notstarted.png"
-              />
-            </div>
+<!--            <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
+<!--              <div-->
+<!--                  class="goclass"-->
+<!--                  :style="{ display: value.currentRatio === 0 ? 'none' : 'flex' }">去上课-->
+<!--              </div>-->
+<!--              <img-->
+<!--                  style="width: 76px; height: 76px; margin-right: 61px"-->
+<!--                  :style="{ display: value.currentRatio === 0 ? 'flex' : 'none' }"-->
+<!--                  src="../../assets/image/pathdetails/notstarted.png"-->
+<!--              />-->
+<!--            </div>-->
           </div>
         </div>
         <!-- <div class="tag1">必修</div>
@@ -553,7 +553,7 @@ const types = ref({
     5: '去完成',
     6: '去签到',
     7: '外链',
-    8: '去讨论',
+    8: '/discusspage',
     9: '去完成',
     10: '去完成',
     11: '去完成',