Merge remote-tracking branch 'yx/250207-growth-prod-master_1202-zp' into test20250220

This commit is contained in:
joshen
2025-02-27 09:32:49 +08:00
2 changed files with 2 additions and 4 deletions

View File

@@ -242,7 +242,6 @@
<svg-icon :icon-class="activeMenu == '/user/medal'?'myxunzhang-active':'myxunzhang'"></svg-icon> <svg-icon :icon-class="activeMenu == '/user/medal'?'myxunzhang-active':'myxunzhang'"></svg-icon>
<span slot="title">我的勋章</span> <span slot="title">我的勋章</span>
</el-menu-item> </el-menu-item>
<template v-if="userInfo.aid === '981537203807064064'">
<el-submenu index="myGrowth" v-show="curIdentity == 1"> <el-submenu index="myGrowth" v-show="curIdentity == 1">
<template slot="title"> <template slot="title">
<!-- <i class="el-icon-s-grid"></i> --> <!-- <i class="el-icon-s-grid"></i> -->
@@ -254,7 +253,6 @@
<span slot="title" class="study textl">专业力必修</span> <span slot="title" class="study textl">专业力必修</span>
</el-menu-item> </el-menu-item>
</el-submenu> </el-submenu>
</template>
<el-submenu index="mystudy" v-show="curIdentity == 1"> <el-submenu index="mystudy" v-show="curIdentity == 1">
<template slot="title"> <template slot="title">
<!-- <i class="el-icon-s-grid"></i> --> <!-- <i class="el-icon-s-grid"></i> -->

View File

@@ -61,7 +61,7 @@
color="#0077EC" color="#0077EC"
></el-progress> ></el-progress>
</div> </div>
<template v-if="item.electiveTaskNum !== 0"> <!-- <template v-if="item.electiveTaskNum !== 0"> -->
<div class="progress-content"> <div class="progress-content">
<div class="f-j-b" style="margin-bottom: 10px"> <div class="f-j-b" style="margin-bottom: 10px">
<div class="f-a-c"> <div class="f-a-c">
@@ -89,7 +89,7 @@
:percentage="electiveTaskCompletionRate(item)" :percentage="electiveTaskCompletionRate(item)"
></el-progress> ></el-progress>
</div> </div>
</template> <!-- </template> -->
<div class="progress-content"> <div class="progress-content">
<div class="f-j-b" style="margin-bottom: 10px"> <div class="f-j-b" style="margin-bottom: 10px">
<div class="f-a-c"> <div class="f-a-c">