Authored by 杨延青

Merge branch 'feature/0430' into 'release/6.9.2'

Feature/0430



See merge request !47
... ... @@ -191,6 +191,9 @@ export default {
onDounceScroll({item, scrollTop, startIndex}) {
this.scrollTop = scrollTop;
// 产品要求去掉头部交互
return;
// user 详情页禁止头部交互
if (this.type === 'userArticle') {
return;
... ...
... ... @@ -128,8 +128,8 @@ export default {
}
.avatar {
width: 60px;
height: 60px;
width: 40px;
height: 40px;
border-radius: 50%;
display: inline-block;
vertical-align: middle;
... ... @@ -151,7 +151,7 @@ export default {
}
.fav {
line-height: 60px;
line-height: 40px;
.btn-selected > .icon-btn-text {
color: #d90025!important;
... ...
... ... @@ -515,7 +515,7 @@ export default {
display: flex;
justify-content: flex-end;
padding-top: 4px;
padding-right: 54px;
padding-right: 46px;
li {
margin-left: 140px;
... ... @@ -565,12 +565,13 @@ export default {
text-align: right;
.operate-btn {
width: calc(100% - 20px);
width: calc(100% + 10px);
height: 50px;
font-size: 23px;
line-height: 50px;
display: inline-block;
box-sizing: border-box;
float: right;
}
.btn-user-edit {
... ...