Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-stu into develop

src/views/roadmap/LearnPath.vue

@@ -74,11 +74,11 @@
 						<el-table-column align="center" prop="organizationName" label="归属组织" />
 						<el-table-column #default="scope" align="center" :width="150" prop="state" label="状态">
 							<img :src="
-								scope.row.status === 0
+								scope.row.taskStatus === 1
 									? ongoing
-									: scope.row.status === 1
+									: scope.row.taskStatus === 2
 										? completed
-										: scope.row.status === -1
+										: scope.row.taskStatus === 0
 											? nostarted
 											: null
 							" style="width: 99px; height: 99px" />

src/views/roadmap/PathDetails.vue

@@ -401,7 +401,7 @@ function toFinish(d) {
   }
   if (d.type === 3 || d.type === 7) {
     request(STUDY_RECORD, {
-      studentId: data.value.userInfoBo.userId,
+      studentId: userInfo.value.id,
       targetId: data.value.routerId,
       logo: 1,
       stageOrChapterId: data.value.currentStageId,