mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-11 03:46:44 +08:00
Merge branch 'dev' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into dev
This commit is contained in:
@@ -395,10 +395,8 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
toCourseDetail(item) {
|
toCourseDetail(item) {
|
||||||
if (isNaN(item.type)) {
|
if (item.source == 1) {
|
||||||
return `${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${
|
return `${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.type}`;
|
||||||
item.type
|
|
||||||
}`;
|
|
||||||
//此处使用window.open有问题
|
//此处使用window.open有问题
|
||||||
//window.open(`${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.type}`);
|
//window.open(`${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.type}`);
|
||||||
} else {
|
} else {
|
||||||
@@ -538,9 +536,9 @@ export default {
|
|||||||
}
|
}
|
||||||
this.course.device = 1;
|
this.course.device = 1;
|
||||||
this.getTags();
|
this.getTags();
|
||||||
if(this.course.pageIndex == 1) {
|
// if(this.course.pageIndex == 1) {
|
||||||
this.courseList = [];
|
// this.courseList = [];
|
||||||
}
|
// }
|
||||||
let data = [];
|
let data = [];
|
||||||
let isTopList = [];
|
let isTopList = [];
|
||||||
// 隐藏loadMore
|
// 隐藏loadMore
|
||||||
@@ -551,11 +549,13 @@ export default {
|
|||||||
if (res.status == 200 && res.result.list.length > 0) {
|
if (res.status == 200 && res.result.list.length > 0) {
|
||||||
this.totalPages = res.result.totalPages;
|
this.totalPages = res.result.totalPages;
|
||||||
let courseIds = [];
|
let courseIds = [];
|
||||||
res.result.list.forEach(item => {
|
// res.result.list.forEach(item => {
|
||||||
courseIds.push(item.id);
|
// courseIds.push(item.id);
|
||||||
data.push(item);
|
// data.push(item);
|
||||||
});
|
// });
|
||||||
that.moreState = 1;
|
// data = res.result.list;
|
||||||
|
this.courseList.push(...res.result.list);
|
||||||
|
this.moreState = 1;
|
||||||
} else {
|
} else {
|
||||||
this.moreState = 3;
|
this.moreState = 3;
|
||||||
}
|
}
|
||||||
@@ -563,7 +563,7 @@ export default {
|
|||||||
.catch(err => {
|
.catch(err => {
|
||||||
this.moreState = 3;
|
this.moreState = 3;
|
||||||
});
|
});
|
||||||
this.courseList.push(...data);
|
|
||||||
},
|
},
|
||||||
getTags() {
|
getTags() {
|
||||||
this.searchTags = [];
|
this.searchTags = [];
|
||||||
|
|||||||
Reference in New Issue
Block a user