Merge branch 'dev0124' into zcwy-master

# Conflicts:
#	src/components/UserCenter/menu.vue
#	src/router/index.js
This commit is contained in:
zhangsir
2024-06-28 13:33:25 +08:00
25 changed files with 2754 additions and 70 deletions

View File

@@ -260,9 +260,12 @@
<!-- <el-menu-item index="/exam/mytask">
<i class="el-icon-menu"></i>
<span slot="title" class="textl">我的考试</span>
</el-menu-item> -->
<!---去掉->
<!-- <el-menu-item index="/uc/study/path" v-show="isTest">
</el-menu-item>
<el-menu-item index="/uc/study/growth">
<span slot="title" class="textl">成长路径</span>
</el-menu-item>
<!-- 去掉
<el-menu-item index="/uc/study/path" v-show="isTest">
<span slot="title" class="textl">学习路径图</span>
</el-menu-item>
<el-menu-item index="/uc/study/project" v-show="isTest">