diff --git a/.gitignore b/.gitignore index 07e6e472..3c3629e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/node_modules +node_modules diff --git a/src/components/Course/auditCourse1.vue b/src/components/Course/auditCourse1.vue index edf1a8c0..94ce7f8e 100644 --- a/src/components/Course/auditCourse1.vue +++ b/src/components/Course/auditCourse1.vue @@ -176,9 +176,9 @@
- - -
+ + +
diff --git a/src/components/Course/auditCourse2.vue b/src/components/Course/auditCourse2.vue index 9c79582d..8d9c6f43 100644 --- a/src/components/Course/auditCourse2.vue +++ b/src/components/Course/auditCourse2.vue @@ -650,21 +650,23 @@ export default { } } else if(r.contentType == 40) { this.contentData.content=""; - if (r.content != '' && r.content.indexOf('.pdf') > -1) { - this.contentData.content = cfrs.result.previewFilePath; - }else{ + apiCourseFile.detail(r.contentRefId).then(cfrs => { if (cfrs.status == 200) { this.curCFile=cfrs.result; this.converStatus = cfrs.result.converStatus; this.contentData.content = cfrs.result.previewFilePath; + //下面是为了兼容老数据 + if(!cfrs.result.previewFilePath && cfrs.result.filePath.index('.pdf')>-1){ + this.contentData.content=cfrs.result.filePath; + } //console.log(r.content); }else { this.contentData.content=""; this.$message.error('加载pdf课件文件失败'); } }); - } + } this.type = 0; },