Merge remote-tracking branch 'origin/main'

This commit is contained in:
luJianJun 2023-08-02 16:11:56 +08:00
commit 2174168e29
2 changed files with 16 additions and 2 deletions

View File

@ -44,7 +44,8 @@
</div>
</div>
</el-popover>
<div class="seach-btn dis-f al-item jus-x" @click="pitchValue['keyword'] ? handleKeyword(pitchValue['keyword']) : ''">
<div class="seach-btn dis-f al-item jus-x"
@click="pitchValue['keyword'] ? handleKeyword(pitchValue['keyword']) : ''">
<img src="../../assets/homeImage/seachImg.svg" class="img" alt="">
搜索
</div>
@ -86,7 +87,7 @@
<img class="triangle" src="@/assets/img/publicImage/triangle-black.svg" />
</div>
<div class="option-area flexflex" :class="{'option-area-unfold': state == 'unfold'}">
<div class="option-area flexflex" :class="{ 'option-area-unfold': state == 'unfold' }">
<div class="option-left">
<div class="option-item flexflex">
<div class="option-title">学校附近</div>
@ -316,6 +317,10 @@ const selectOption = (type, value) => {
}
</script>
<style scoped lang="less">
* {
font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
}
.dis-f {
display: flex;
}
@ -498,6 +503,12 @@ const selectOption = (type, value) => {
.search-input {
/deep/ .el-input__wrapper {
font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
&:hover {
border-color: #c0c4cc;
}
border-radius: 8px 0 0 8px;
box-shadow: none;
background-color: rgba(246, 246, 246, 1);
@ -505,6 +516,8 @@ const selectOption = (type, value) => {
border-right: none;
.el-input__inner {
font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
&::placeholder {
color: #7f7f7f;
font-size:15px;

View File

@ -1324,6 +1324,7 @@ const publicJump = path => router.push(path)
word-break: break-word;
}
.traffic-box {
padding: 0 30px;