From a3a38084722c49f53055494c5814321f7cda5b33 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 13 Dec 2022 05:27:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moreActive/MoreActive.vue |  4 +++-
 src/views/roadmap/PathDetails.vue   | 26 +++++++++++++-------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue
index 911b56a..4c47364 100644
--- a/src/views/moreActive/MoreActive.vue
+++ b/src/views/moreActive/MoreActive.vue
@@ -128,8 +128,10 @@
 <script setup>
 import { TAS_ACTIVITY_DETAIL, TASK_ACTIVITY_SIGN, ACTIVITY } from "@/api/api";
 import { request, useRequest } from "@/api/request";
+import {useRoute} from "vue-router/dist/vue-router";
+const {query: {courseId: activityId}} = useRoute()
 
-const { data } = useRequest(ACTIVITY, { activityId: 155 });
+const { data } = useRequest(ACTIVITY, { activityId });
 console.log("data", data);
 const signClick = (tab, event) => {
   request(TASK_ACTIVITY_SIGN, {
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index 316e313..ae53799 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>
@@ -554,7 +554,7 @@ const types = ref({
     6: '/livebroadcast',
     7: '外链',
     8: '/discusspage',
-    9: '去完成',
+    9: '/moreactive',
     10: '去完成',
     11: '去完成',
     12: '去投票',
@@ -563,7 +563,7 @@ const types = ref({
 })
 
 function toFinish(d) {
-  router.push({path: types.value.path[d.type], query: {id: d.routerTaskId, type: 1}})
+  router.push({path: types.value.path[d.type], query: {id: d.routerTaskId, type: 1, courseId: d.courseId}})
 }
 
 </script>