diff --git a/src/api/modules/courseStudy.js b/src/api/modules/courseStudy.js
index 0a6be3bd..43150506 100644
--- a/src/api/modules/courseStudy.js
+++ b/src/api/modules/courseStudy.js
@@ -376,6 +376,11 @@ const myStudysFromES=function (data){
return ajax.post('/xboe/school/study/es/search',data);
}
+/**根据id集合查询，传入的是id数组*/
+const findByIds=function (ids){
+ return ajax.postJson('/xboe/school/study/es/list-by-ids',ids);
+}
+
export default {
hasSignup,
signup,
@@ -406,6 +411,7 @@ export default {
myExamList2,
myCourseStudy,
myStudysFromES,
+ findByIds,
deleteSignUp,
ids,
followIds
diff --git a/src/views/StudyIndex.vue b/src/views/StudyIndex.vue
index ae929839..1ee34a47 100644
--- a/src/views/StudyIndex.vue
+++ b/src/views/StudyIndex.vue
@@ -1,7 +1,7 @@
- 1.学员个人中心首页,根据需求无需此页，直接打开我的任务->我报名的
+
@@ -87,7 +87,7 @@
// })
},
created() {
- //this.$router.push('/uc/study/courses');
+ this.$router.push('/uc/study/courses');
// this.searchData();
// this.getLastStudy();
// this.loadRemoteTask();
diff --git a/src/views/study/Courses.vue b/src/views/study/Courses.vue
index f16a0816..40734cbc 100644
--- a/src/views/study/Courses.vue
+++ b/src/views/study/Courses.vue
@@ -46,8 +46,12 @@
报名时间：{{ formatsec(Number(item.startTime) * 1000 )}}
-
-
当前进度：
+
+
面授地点：{{ item.courseAddress }}
+
上课时间：{{ formatsec(Number(item.attendCourseTime) * 1000 ) }}
+
+
+
当前进度：
@@ -55,7 +59,7 @@
-
+
@@ -67,11 +71,37 @@
-
-
- 继续学习
- 回顾
-
+
+
+
+
+ 继续学习
+ 回顾
+
+
@@ -199,11 +229,29 @@ export default {
this.loading=true;
apiCourseStudy.myStudysFromES(reqData).then(res=>{
if(res.status==200){
+ let localCourseIds=[];//本地在线课程的id集合
res.result.list.forEach(item=>{
if(item.courseImage.startsWith('/upload')){
item.courseImage=$this.fileUrl+item.courseImage.substring(7)
}
- })
+ if(item.source==2){
+ localCourseIds.push(item.id);
+ }
+ });
+ if(localCourseIds.length>0){
+ //二次提取学习进度
+ apiCourseStudy.findByIds(localCourseIds).then(rs2=>{
+ if(rs2.status==200){
+ res.result.list.forEach(item=>{
+ rs2.result.forEach(idItem=>{
+ if(item.id==idItem.id){
+ item.progress=idItem.progress;
+ }
+ })
+ })
+ }
+ })
+ }
this.couresList=res.result.list;
this.page.count=res.result.count;
}else{