Authored by lea guo

Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop

... ... @@ -4,20 +4,19 @@
<div class="left-content">
<Scroll>
<div class="category-left-item-root"
v-for="(item, index) in categoryParent"
:key="index"
:data-id="item"
@click="onClick(item)">
<div :class="{'category-left-item-select-flag' : item.isSelect }"></div>
<p
class="category-left-item-title"
:class="{'category-left-item-select' : item.isSelect }">
{{item.name}}
</p>
v-for="(item, index) in categoryParent"
:key="index"
:class="{'category-left-item-select-flag' : item.isSelect }"
:data-id="item"
@click="onClick(item)">
<p
class="category-left-item-title"
:class="{'category-left-item-select' : item.isSelect }">
{{item.name}}
</p>
</div>
</Scroll>
</div>
<div class="left-right-split-line"></div>
<div class="right-content">
<Scroll>
<div v-for="(itemSub, index) in categorySubList" :key="index">
... ... @@ -35,8 +34,8 @@
:width="60"
:height="60"
/>
<p class="item-title">{{item.name}}</p>
</div>
<p class="item-title">{{item.name}}</p>
<LayoutLink v-if="item.isShow" class="item-a-div" :href="item.link"></LayoutLink>
</div>
</div>
... ... @@ -114,22 +113,19 @@ export default {
background-color: #FFFFFF;
}
.left-right-split-line {
height: 100%;
width: 2px;
background-color: #EEEEEE;
}
.left-content {
width: 30%;
width: 28%;
height: 100%;
border-right: 1px solid #EEEEEE;
flex-shrink: 0;
}
.right-content {
display: flex;
flex-direction: column;
width: 70%;
flex-grow: 1;
height: 100%;
margin: 0 20px;
}
.category-left-item-root {
... ... @@ -139,6 +135,7 @@ export default {
align-items: center;
height: 104px;
line-height: 104px;
position: relative;
}
.category-left-item-title {
... ... @@ -154,17 +151,19 @@ export default {
}
.category-left-item-select {
font-size: 48px;
font-size: 44px;
color: #000000;
}
.category-left-item-select-flag {
width: 9px;
.category-left-item-select-flag:before {
content: "";
width: 6px;
height: 48px;
margin-bottom: 10px;
margin-top: 10px;
position: absolute;
left: 0;
top: 50%;
margin-top: -24px;
background-color: #000000;
justify-self: flex-start;
}
.category-sub-root {
... ... @@ -182,21 +181,17 @@ export default {
.item-div {
position: relative;
display: flex;
flex: 0 0 33%;
height: 195px;
padding: 20px 0;
}
.item-imge-div {
height: 100%;
width: 100%;
height: 130px;
display: flex;
flex-direction: column;
justify-content: space-between;
position: absolute;
z-index: 1;
padding-top: 20px;
padding-bottom: 20px;
align-items: center;
justify-content: center;
position: relative;
}
.item-imge {
... ... @@ -213,7 +208,6 @@ export default {
display: -webkit-box;
-webkit-box-orient: vertical;
overflow: hidden;
}
.item-a-div {
... ...