zhaojunkai

Merge remote-tracking branch 'origin/main'

@@ -295,7 +295,7 @@ export struct MorningEveningPaperComponent { @@ -295,7 +295,7 @@ export struct MorningEveningPaperComponent {
295 topPaperTitle(){ 295 topPaperTitle(){
296 Column(){ 296 Column(){
297 PaperTitleComponent().margin({top:this.topSafeHeight}) 297 PaperTitleComponent().margin({top:this.topSafeHeight})
298 - }.height(44+this.topSafeHeight).backgroundColor(this.scrollOffset > 100?this.mixedBgColor:'') 298 + }.height(44+this.topSafeHeight).backgroundColor(this.isHasTopView?(this.scrollOffset > 100?this.mixedBgColor:''):this.mixedBgColor)
299 } 299 }
300 300
301 @Builder 301 @Builder
@@ -75,7 +75,7 @@ export struct topicInfoView { @@ -75,7 +75,7 @@ export struct topicInfoView {
75 left: { anchor: "__container__", align: HorizontalAlign.Start }, 75 left: { anchor: "__container__", align: HorizontalAlign.Start },
76 bottom: this.frontLinkObject.linkUrl.length > 0?{ anchor: "row_detail", align: VerticalAlign.Top }:{ anchor: "__container__", align: VerticalAlign.Bottom } 76 bottom: this.frontLinkObject.linkUrl.length > 0?{ anchor: "row_detail", align: VerticalAlign.Top }:{ anchor: "__container__", align: VerticalAlign.Bottom }
77 }) 77 })
78 - .margin({ left: 16, right: 16 }) 78 + .margin({ left: 16, right: 16, bottom: this.frontLinkObject.linkUrl.length > 0?0:16})
79 .id('txt_summary') 79 .id('txt_summary')
80 80
81 Text(this.frontLinkObject?.title ?? "") 81 Text(this.frontLinkObject?.title ?? "")