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

# Conflicts:
#	src/components/PortalHeader.vue
This commit is contained in:
xu
2025-12-16 14:51:41 +08:00
2 changed files with 7 additions and 5 deletions

View File

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

View File

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