XiaoMo/gterFang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	src/components/public/head.vue
This commit is contained in:
A1300399510
2023-07-11 19:43:03 +08:00
parent 234b953f6b fd06b66cc8
commit d92968ae76
5 changed files with 71 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/components/public/head.vue
View File

@@ -4,7 +4,7 @@
<div class="header-nav-item" :class="{ pitch: index == 3 }" v-for="(item, index) in navList" :key="index">
{{ item }}</div>
<img class="header-nav-item header-user-img"
src="https://oss.gter.net/avatar/97KwEWIDY-QTHTXcpEbnWQxaRv6Xz0ll1wRhYWNh/middle?random=1687145465">
src="">
</nav>
<div class="logo-box flexacenter">
<img class="logo-icon" src="@/assets/img/edit/logo.png" />
@@ -15,8 +15,20 @@
<nav class="nav-box flexflex" v-if="!isNoTabList">
<div class="nav-list wid1200 flexflex">
<<<<<<< HEAD
<div class="nav-item flexcenter" :class="{ pitch: item['name'] == '我的' }" v-for="item in tabList"
:key="item">{{ item.name }}</div>
=======
<div class="tab-btn dis-f al-item jus-x" :class="{ 'tab-btn-click': i === 0 }" v-for="(item, i) in tabList"
:key="i">
<el-badge :value="12">
<div class="pd-rl-10">
{{ item.name }}
</div>
</el-badge>
</div>
>>>>>>> origin/main
</div>
</nav>
</header>
@@ -155,14 +167,23 @@ const tabList = [{
transform: translateX(-50%);
margin: 0 auto;
width: 100%;
<<<<<<< HEAD
height: 47px;
=======
height: 50px;
>>>>>>> origin/main
background: rgba(0, 0, 0, 0.596078431372549);
border-bottom: 4px solid rgba(78, 144, 204, 1);
.nav-list {
<<<<<<< HEAD
// background: red;
color: #e2edf7;
font-size: 18px;
=======
color: #E2EDF7;
text-align: center;
>>>>>>> origin/main
margin: 0 auto;
font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
font-weight: 400;
@@ -194,4 +215,43 @@ const tabList = [{
}
}
.tab-btn {
width: 120px;
height: 46px;
font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
font-weight: 400;
font-style: normal;
font-size: 18px;
color: #E2EDF7;
display: flex;
justify-content: center;
align-items: center;
.pd-rl-10{
padding:0 10px;
}
}
.tab-btn-click {
background-color: rgba(98, 177, 255, 1);
border: none;
border-bottom: 0px;
border-radius: 8px;
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold', 'PingFang SC', sans-serif;
font-weight: 650;
font-style: normal;
font-size: 18px;
color: #FFFFFF;
}
.carousel-img {
margin: 0 auto;
width: 660px;
height: 280px;
}
</style>