Merge remote-tracking branch 'origin/master'

This commit is contained in:
yujicun
2023-03-10 00:58:05 +08:00
2 changed files with 14 additions and 8 deletions

View File

@@ -51,19 +51,25 @@
}, },
imageUrl(){ imageUrl(){
this.textShow = false; this.textShow = false;
if(this.course && this.course.cmtask_imgurl && this.course.cmtask_imgurl.startsWith('http')) { if(!this.course){
this.textShow = true;
return this.$config.context+'/static/images/course/courseDefault.png'
}
if(this.course.cmtask_imgurl && this.course.cmtask_imgurl.startsWith('/upload/')) {
return this.course.cmtask_imgurl; return this.course.cmtask_imgurl;
} else }
if(this.course && this.course.coverImg && this.course.coverImg.startsWith('http')) { if(this.course.cmtask_imgurl && this.course.cmtask_imgurl.startsWith('http')) {
return this.course.cmtask_imgurl;
} else if(this.course.coverImg && this.course.coverImg.startsWith('http')) {
return this.course.coverImg; return this.course.coverImg;
} else if(this.course && this.course.courseImage && this.course.courseImage.startsWith('http')){ } else if(this.course.courseImage && this.course.courseImage.startsWith('http')){
return this.course.courseImage; return this.course.courseImage;
}else{ }else{
if(this.course && this.course.image && this.course.image!=''){ if(this.course.image && this.course.image!=''){
return this.$config.fileUrl+this.course.image; return this.$config.fileUrl+this.course.image;
}else if(this.course && this.course.coverImg && this.course.coverImg!=''){ }else if(this.course.coverImg && this.course.coverImg!=''){
return this.$config.fileUrl+this.course.coverImg; return this.$config.fileUrl+this.course.coverImg;
}else if(this.course && this.course.courseImage && this.course.courseImage!=''){ }else if(this.course.courseImage && this.course.courseImage!=''){
return this.$config.fileUrl+this.course.courseImage; return this.$config.fileUrl+this.course.courseImage;
}else if(this.course.coverImg == '' || this.course.courseImage == '' || this.course.image == ''){ }else if(this.course.coverImg == '' || this.course.courseImage == '' || this.course.image == ''){
this.textShow = true; this.textShow = true;

View File

@@ -511,7 +511,7 @@
let params = { let params = {
page: this.taskPageIndex, page: this.taskPageIndex,
size: this.taskPageSize, size: this.taskPageSize,
cmtask_status: this.boeStatus, cmtask_user_status: this.boeStatus,
cmtask_name: this.loadkeyword, cmtask_name: this.loadkeyword,
} }
if (this.cmtask_name) { if (this.cmtask_name) {