hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-21 16:56:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master-bugfix-1335' into master-20251210

Browse Source 
# Conflicts:
#	src/components/PortalHeader.vue
This commit is contained in:
xu
2025-12-16 14:51:41 +08:00
parent 444dbdf769 406c9fbf7c
commit 1326592eda
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Course/courseForm.vue
View File

@@ -1340,7 +1340,7 @@ export default {
}); });
this.teacherValues = tlist; this.teacherValues = tlist;
this.teacherDownList = tlist; this.teacherDownList = tlist;
if (this.courseInfo.tags != '') { if (this.courseInfo.tags) {
this.showTags = this.courseInfo.tags.split(','); this.showTags = this.courseInfo.tags.split(',');
} }
this.$nextTick(function() { this.$nextTick(function() {

10
src/components/PortalHeader.vue
View File

@@ -106,7 +106,8 @@
>贡献者大会</span >贡献者大会</span
> >
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item command="three">2024</el-dropdown-item> <!-- <el-dropdown-item command="four">2025</el-dropdown-item>-->
<el-dropdown-item command="three" divided>2024</el-dropdown-item>
<el-dropdown-item command="one" divided>2023</el-dropdown-item> <el-dropdown-item command="one" divided>2023</el-dropdown-item>
<el-dropdown-item command="two" divided>2022</el-dropdown-item> <el-dropdown-item command="two" divided>2022</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
@@ -418,9 +419,10 @@ export default {
handleContributor(val) { handleContributor(val) {
let urlPre = window.location.protocol + "//" + window.location.host; let urlPre = window.location.protocol + "//" + window.location.host;
let obj = { let obj = {
one: urlPre + "/pc/contributornew/index", one: urlPre + "/web/contributornew/index",
two: urlPre + "/pc/contributor/index", two: urlPre + "/web/contributor/index",
three: urlPre + "/pc/contributor_2024/index", three: urlPre + "/web/contributor_2024/index",
four: urlPre + "/web/contributor_2025/index",
}; };
window.open(obj[val]); window.open(obj[val]);
}, },