This commit is contained in:
zhaofang
2022-10-28 10:44:17 +08:00
parent aef9017991
commit 540b1d8d7a
17 changed files with 86 additions and 82 deletions

View File

@@ -67,11 +67,11 @@ export default {
coudetail(item) {
// let routeData = this.$router.resolve({ path: '/course/detail?id=' + item.objId });
// window.open(routeData.href, '_blank');
if(item.contentType == '20') {
// if(item.contentType == '20') {
this.$router.push({path:'/course/detail',query:{id:item.objId || item.id}})
} else {
this.$router.push({path:'/course/micro',query:{id:item.objId || item.id}})
}
// } else {
// this.$router.push({path:'/course/micro',query:{id:item.objId || item.id}})
// }
},
delItem(item) {

View File

@@ -141,11 +141,11 @@ export default {
}
}
if(item.contentType == 20) {
// if(item.contentType == 20) {
this.$router.push({path:'/course/detail',query:{id:item.objId || item.id}})
} else {
this.$router.push({path:'/course/micro',query:{id:item.objId || item.id}})
}
// } else {
// this.$router.push({path:'/course/micro',query:{id:item.objId || item.id}})
// }
// window.open(`${this.webBaseUrl}/course/detail?id=${item.objId}`)
},

View File

@@ -52,11 +52,11 @@ import courseImage from "@/components/Course/courseImage.vue"
this.$router.push({path:'/uc/study/index?id='+item.courseId});
},
jumpRouter(item){
if(item.courseType==10){
let routeData = this.$router.resolve({ path: '/course/micro?id='+item.courseId}); // , query: { id: 1 }
window.open(this.webBaseUrl+routeData.href, '_blank');
}
if(item.courseType==20){
// if(item.courseType==10){
// let routeData = this.$router.resolve({ path: '/course/micro?id='+item.courseId}); // , query: { id: 1 }
// window.open(this.webBaseUrl+routeData.href, '_blank');
// }
// if(item.courseType==20){
if(item.progress>0 && item.progress<100) {
let routeData = this.$router.resolve({ path: '/course/studyindex?id='+item.courseId}); // , query: { id: 1 }
window.open(this.webBaseUrl+routeData.href, '_blank');
@@ -64,7 +64,7 @@ import courseImage from "@/components/Course/courseImage.vue"
let routeData = this.$router.resolve({ path: '/course/detail?id='+item.courseId}); // , query: { id: 1 }
window.open(this.webBaseUrl+routeData.href, '_blank');
}
}
// }
}
}
}

View File

@@ -68,11 +68,11 @@
},
methods:{
jumpRouter(c){
if(c.type==20){
// if(c.type==20){
return '/course/detail?id='+c.id
}else if(c.type==10){
return '/course/micro?id='+c.id
}
// }else if(c.type==10){
// return '/course/micro?id='+c.id
// }
},
jumpPicture(c){
if(c.type==20){

View File

@@ -600,11 +600,11 @@ export default {
}
}else{
this.$message.error('您还未报名');
if(this.courseInfo.type==10){
location.href = this.webBaseUrl + "/course/micro?id="+this.courseId;
}else{
// if(this.courseInfo.type==10){
// location.href = this.webBaseUrl + "/course/micro?id="+this.courseId;
// }else{
location.href = this.webBaseUrl + "/course/detail?id="+this.courseId;
}
// }
}
} else {
this.$message.error(res.message);

View File

@@ -397,11 +397,11 @@ export default {
if(isNaN(item.courseType)){
return `${this.webBaseUrl}/course/boeframe?id=${item.courseId}&type=${item.courseId}`;
} else {
if(item.courseType==10){
return this.webBaseUrl+'/course/micro?id='+item.courseId;
}else if(item.courseType==20){
// if(item.courseType==10){
// return this.webBaseUrl+'/course/micro?id='+item.courseId;
// }else if(item.courseType==20){
return this.webBaseUrl+'/course/detail?id='+item.courseId;
}
// }
}
return '';

View File

@@ -169,11 +169,11 @@
},
methods:{
continueStudy(item){
if(item.courseType==10){
return '../course/micro?id='+item.courseId
}else{
// if(item.courseType==10){
// return '../course/micro?id='+item.courseId
// }else{
return '../course/studyindex?id='+item.courseId
}
// }
},
...mapActions({
getResOwnerTree:'resOwner/getResOwnerTree',

View File

@@ -622,7 +622,7 @@ export default {
jumpDetails() {
// this.$router.push('/course/micro');
// 跳转打开新页面
let routeData = this.$router.resolve({ path: '/course/micro'}); // , query: { id: 1 }
let routeData = this.$router.resolve({ path: '/course/detail'}); // , query: { id: 1 }
window.open(this.webBaseUrl+routeData.href, '_blank');
},
toExamine(row) {

View File

@@ -269,26 +269,26 @@ export default {
},
jumpRouter(item) {
if (item.published) {
if (item.type == 10) {
// if (item.type == 10) {
// let routeData = this.$router.resolve({ path: '/course/micro?id='+item.id});
// window.open(this.webBaseUrl+routeData.href, '_blank');
// window.open(this.webBaseUrl + '/course/micro?id=' + item.id, '_blank');
this.$router.push({path:'/course/micro',query:{id:item.id}})
}
if (item.type == 20) {
// this.$router.push({path:'/course/micro',query:{id:item.id}})
// }
// if (item.type == 20) {
// let routeData = this.$router.resolve({ path: '/course/detail?id='+item.id});
// window.open(this.webBaseUrl+routeData.href, '_blank');
// window.open(this.webBaseUrl + '/course/detail?id=' + item.id, '_blank');
this.$router.push({path:'/course/detail',query:{id:item.id}})
}
// }
} else {
if (item.type == 10) {
// window.open(`${this.webBaseUrl}/course/microPreview?id=${item.id}`);
this.$router.push({path:'/course/microPreview',query:{id:item.id}})
} else {
// if (item.type == 10) {
// // window.open(`${this.webBaseUrl}/course/microPreview?id=${item.id}`);
// this.$router.push({path:'/course/microPreview',query:{id:item.id}})
// } else {
// window.open(`${this.webBaseUrl}/course/rePreview?id=${item.id}`);
this.$router.push({path:'/course/rePreview',query:{id:item.id}})
}
// }
}
},
findList() {

View File

@@ -311,12 +311,11 @@ export default {
},
//预览跳转页面
toPreview(row) {
if(row.type == 10) {
window.open(`${this.webBaseUrl}/course/microPreview?id=${row.id}`);
} else{
// if(row.type == 10) {
// window.open(`${this.webBaseUrl}/course/microPreview?id=${row.id}`);
// } else{
window.open(`${this.webBaseUrl}/course/rePreview?id=${row.id}`);
}
// }
},
// 直接审核
@@ -401,7 +400,7 @@ export default {
},
jumpDetails() {
// 跳转打开新页面
let routeData = this.$router.resolve({ path: '/course/micro'});
let routeData = this.$router.resolve({ path: '/course/detail'});
window.open(this.webBaseUrl+routeData.href, '_blank');
},
toExamine(row) {

View File

@@ -432,12 +432,11 @@ export default {
},
//预览跳转页面
toPreview(row) {
if(row.type == 10) {
window.open(`${this.webBaseUrl}/course/microPreview?id=${row.id}`);
} else{
// if(row.type == 10) {
// window.open(`${this.webBaseUrl}/course/microPreview?id=${row.id}`);
// } else{
window.open(`${this.webBaseUrl}/course/rePreview?id=${row.id}`);
}
// }
},
//直接审核
@@ -517,7 +516,7 @@ export default {
},
jumpDetails() {
// 跳转打开新页面
let routeData = this.$router.resolve({ path: '/course/micro'});
let routeData = this.$router.resolve({ path: '/course/detail'});
window.open(this.webBaseUrl+routeData.href, '_blank');
},
toExamine(row) {

View File

@@ -141,6 +141,9 @@
this.replysData.reply = item.replysList;
},
addReplys() {
if(this.replysContent.trim().length == 0) {
return this.$message.warning('请填写内容!');
}
this.replysData.reply.push({
content: this.replysContent,
authorInfo:this.userInfo,
@@ -176,6 +179,9 @@
})
},
add() {
if(this.textarea.trim().length == 0) {
return this.$message.warning('请填写内容!');
}
let data = {
content:this.textarea,//留言内容
aid:this.pageId,// 要留言的人的id

View File

@@ -847,16 +847,16 @@ export default {
jumpRouter(item) {
//console.log(item.type, "item.type");
// return console.log(id,type,"fihkj1")
if (item.type == 20) {
// if (item.type == 20) {
//录播课
// window.open(`${this.webBaseUrl}/course/detail?id=${id}`)
this.$router.push(`/course/detail?id=${item.id}`);
}
if (item.type == 10) {
// }
// if (item.type == 10) {
//微课
// window.open(`${this.webBaseUrl}/course/micro?id=${id}`)
this.$router.push(`/course/micro?id=${item.id}`);
}
// this.$router.push(`/course/micro?id=${item.id}`);
// }
},
jumpRouter2(item) {
// console.log(item,"土豪包括九年")
@@ -865,16 +865,16 @@ export default {
//console.log(item.type,type,'item.type');
// return console.log(id,type,"fihkj1")
if (type == 20) {
// if (type == 20) {
//录播课
// window.open(`${this.webBaseUrl}/course/detail?id=${id}`)
this.$router.push(`/course/detail?id=${id}`);
}
if (type == 10) {
// }
// if (type == 10) {
//微课
// window.open(`${this.webBaseUrl}/course/micro?id=${id}`)
this.$router.push(`/course/micro?id=${id}`);
}
// this.$router.push(`/course/micro?id=${id}`);
// }
}
}
};

View File

@@ -287,11 +287,11 @@ export default {
} else if (item.refType == 4||item.refType == 5) {
return this.webBaseUrl + '/qa/answer?id=' + item.refId;
} else {
if (item.conType == 10) {
return this.webBaseUrl + '/course/micro?id=' + item.refId;
} else if (item.conType == 20) {
// if (item.conType == 10) {
// return this.webBaseUrl + '/course/micro?id=' + item.refId;
// } else if (item.conType == 20) {
return this.webBaseUrl + '/course/detail?id=' + item.refId;
}
// }
}
}
}

View File

@@ -312,16 +312,16 @@ computed: {
if(item.isOld){
location.href=`${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.courseType}`
} else {
if(item.courseType==10){
this.$router.push({path:'/course/micro',query:{id:item.courseId}})
}
if(item.courseType==20){
// if(item.courseType==10){
// this.$router.push({path:'/course/micro',query:{id:item.courseId}})
// }
// if(item.courseType==20){
if(item.progress>0 && item.progress<100) {
this.$router.push({path:'/course/studyindex',query:{id:item.courseId}})
} else {
this.$router.push({path:'/course/detail',query:{id:item.courseId}})
}
}
// }
}

View File

@@ -95,14 +95,14 @@ export default {
this.params.courseType = ''
},
jumpRouter(item) {
if (item.courseType == 10) {
let routeData = this.$router.resolve({path: "/course/micro?id=" + item.courseId});
window.open(this.webBaseUrl+routeData.href, "_blank");
}
if (item.courseType == 20) {
// if (item.courseType == 10) {
// let routeData = this.$router.resolve({path: "/course/micro?id=" + item.courseId});
// window.open(this.webBaseUrl+routeData.href, "_blank");
// }
// if (item.courseType == 20) {
let routeData = this.$router.resolve({ path: "/course/detail?id=" + item.courseId}); // , query: { id: 1 }
window.open(this.webBaseUrl+routeData.href, "_blank");
}
// }
},
handleSizeChange(val) {
this.page.pageSize = val;

View File

@@ -660,11 +660,11 @@ export default {
}
} else {
this.$message.error('您还未报名');
if (this.courseInfo.type == 10) {
location.href = this.webBaseUrl + '/course/micro?id=' + this.courseId;
} else {
// if (this.courseInfo.type == 10) {
// location.href = this.webBaseUrl + '/course/micro?id=' + this.courseId;
// } else {
location.href = this.webBaseUrl + '/course/detail?id=' + this.courseId;
}
// }
}
} else {
this.$message.error(res.message);