Merge branch 'zcwy-0511-out' into zcwy-0520-out

# Conflicts:
#	src/components/NavLeft.vue
This commit is contained in:
zhangsir
2024-05-20 10:38:28 +08:00
58 changed files with 6890 additions and 3 deletions

View File

@@ -495,6 +495,30 @@
}
];
}
if (
n.indexOf("/InstructorCertification") !== -1 ||
n.indexOf("/instructorcertification") !== -1
) {
state.list = [
{
name: "教师专区",
}, {
name:'讲师认证'
}
];
}
if (
n.indexOf("/LecturerManagement") !== -1 ||
n.indexOf("/lecturermanagement") !== -1
) {
state.list = [
{
name: "教师专区",
}, {
name:'讲师认证'
}
];
}
if (
n.indexOf("/tooldown") !== -1 ||
n.indexOf("/ToolDown") !== -1

View File

@@ -339,7 +339,7 @@
</a-menu-item>
</a-sub-menu>
<!-- 教师专区 -->
<a-sub-menu key="sub22" @titleClick="titleClick" v-if="checkMenu('gratefulnotice,gratefulcarousel,teacherempowerment,teachertopic,tooldown,teacheropinion')">
<a-sub-menu key="sub22" @titleClick="titleClick" v-if="checkMenu('gratefulnotice,gratefulcarousel,teacherempowerment,teachertopic,tooldown,teacheropinion,instructorcertification')">
<template #icon>
<div class="imgBox">
<img
@@ -376,6 +376,17 @@
></span>
<router-link to="/teacherempowerment">教师赋能</router-link>
</a-menu-item>
<a-menu-item key="sub22-7" v-if="checkMenu('instructorcertification')">
<span
:class="{
circleActive: selectedKeys[0] === 'sub22-7' ? true : false,
circle: selectedKeys[0] === 'sub22-7' ? false : true,
}"
></span>
<router-link to="/instructorcertification">讲师认证</router-link>
</a-menu-item>
<a-menu-item key="sub22-4" v-if="checkMenu('teachertopic')">
<span
:class="{
@@ -938,6 +949,12 @@ export default {
selectedKeys: "sub22-6",
pagename: "意见",
},
{
href: "/instructorcertification",
openKeys: "sub22",
selectedKeys: "sub22-7",
pagename: "讲师认证",
},
{
href: "/articlemanage",
openKeys: "sub13",

View File

@@ -8,7 +8,7 @@
>
<div class="drawerMain" id="stuadd">
<div class="header">
<div class="headerTitle">添加学员</div>
<div class="headerTitle">添加讲师</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"