From e7a36e55a719e1498fb222c7b342d6ee75f0cc99 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 22 Mar 2023 14:06:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E6=96=B0=E5=BB=BA=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue  | 2 +-
 src/views/projectcenter/TaskPage.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 64c1b1e7..f558ee50 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -458,7 +458,7 @@
                     <div class="time">
                       <div class="timetext">开始时间</div>
                       <div class="timetext">
-                        {{ item.startTime !== null ? item.startTime : "-" }}
+                        {{ item.type==2 ? item.createTime !== null ? item.createTime : "-" : item.startTime !== null ? item.startTime : "-" }}
                       </div>
                     </div>
                     <div class="progress">
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index e53b7b87..cbb014f2 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -587,7 +587,7 @@
                       <div class="time">
                         <div class="timetext">开始时间</div>
                         <div class="timetext">
-                          {{ item.startTime !== null ? item.startTime : "-" }}
+                          {{ item.type==2 ? item.createTime !== null ? item.createTime : "-" : item.startTime !== null ? item.startTime : "-" }}
                         </div>
                       </div>
                       <div class="progress">

From 581faa5b145abfda660f6eb699556ff99a6ffec2 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 22 Mar 2023 14:26:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE-=E5=AD=A6?=
 =?UTF-8?q?=E5=91=98-=E7=AD=BE=E5=88=B0=E4=BA=8C=E7=BB=B4=E7=A0=81taskId?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BC=A0=E9=80=92=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/router/RouterFaceStu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index 38f34d11..e3e977fb 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -371,7 +371,7 @@ const qrcodeVisible = () => {
   qrCode({
     title: "【签到】二维码",
     name: props.datasource?.name,
-    url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}&type=${props.type}`,
+    url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${props.datasource.id}&taskType=${props.datasource.type}&type=${props.type}`,
   });
 };