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

Merge branch 'dev-0711' into dev0515

Browse Source 
# Conflicts:
#	src/components/PortalHeader.vue
This commit is contained in:
zhangsir
2024-07-12 08:53:50 +08:00
parent ac6640c865 8cca156955
commit 300072e778
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/PortalHeader.vue
View File

@@ -6,7 +6,7 @@
<img src="../assets/logo/logo-white.png" v-if="textColor == '#fff' || textColor == '#ffffff'" style="width:160px;height: 27px;" />
<img src="../assets/logo/logo.png" v-else style="width:160px;height: 27px;" />
</div>
<div class="portal-top-nav">
<div class="portal-top-nav" v-if="userInfo.role === 1">
<div class="top-nav" :style="{color:textColor}" :class="current == 'index' ? activeNav : ''">
<router-link to="/index" >首页
<div :class="current == 'index' ? 'nav-bottbor' : ''"></div>
@@ -65,7 +65,7 @@
</div>
</div>
<div class="portal-top-right">
<div v-if="goSearch !=10" style="position: relative;">
<div v-if="goSearch !=10 && userInfo.role === 1" style="position: relative;">
<el-input class="portal-input" v-show="!hideSearch" placeholder="搜索全部" style="border-radius: 20px !important; " @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="keyword" >
<el-select v-if="current == 'index'" v-model="findType" style="width: 75px; border-radius:20px !important;" slot="prepend" placeholder="请选择">
<el-option label="课程" value="1"></el-option>