Showing
1 changed file
with
6 additions
and
10 deletions
| @@ -270,10 +270,13 @@ export struct MorningEveningPaperComponent { | @@ -270,10 +270,13 @@ export struct MorningEveningPaperComponent { | ||
| 270 | 270 | ||
| 271 | } | 271 | } |
| 272 | 272 | ||
| 273 | - if (this.audioPlayUrl !== ""){ | 273 | + if (this.audioPlayUrl.length > 0){ |
| 274 | ListItem() { | 274 | ListItem() { |
| 275 | this.AudioBarView() | 275 | this.AudioBarView() |
| 276 | } | 276 | } |
| 277 | + .margin({ | ||
| 278 | + top: this.isHasTopView ? 10 : 44+this.topSafeHeight | ||
| 279 | + }) | ||
| 277 | } | 280 | } |
| 278 | 281 | ||
| 279 | ListItem() { | 282 | ListItem() { |
| @@ -284,7 +287,7 @@ export struct MorningEveningPaperComponent { | @@ -284,7 +287,7 @@ export struct MorningEveningPaperComponent { | ||
| 284 | compListItem: this.compListItem, | 287 | compListItem: this.compListItem, |
| 285 | }) | 288 | }) |
| 286 | .margin({ | 289 | .margin({ |
| 287 | - top: this.isHasTopView ? 10 : 44+this.topSafeHeight | 290 | + top: this.isHasTopView || this.audioPlayUrl.length > 0 ? 10 : 44+this.topSafeHeight |
| 288 | }) | 291 | }) |
| 289 | } | 292 | } |
| 290 | } | 293 | } |
| @@ -333,7 +336,7 @@ export struct MorningEveningPaperComponent { | @@ -333,7 +336,7 @@ export struct MorningEveningPaperComponent { | ||
| 333 | .margin({ left: 10 }) | 336 | .margin({ left: 10 }) |
| 334 | .alignSelf(ItemAlign.Start) | 337 | .alignSelf(ItemAlign.Start) |
| 335 | 338 | ||
| 336 | - Text(`${this.pageInfoBean.topicInfo.topicPattern === 1 ? '早上好' : this.pageInfoBean.topicInfo.topicPattern === 2 ? '中午好' : '晚上好'}, 请收听今日新闻播报`) | 339 | + Text(`${this.pageInfoBean.topicInfo?.topicPattern === 1 ? '早上好' : this.pageInfoBean.topicInfo?.topicPattern === 2 ? '中午好' : '晚上好'}, 请收听今日新闻播报`) |
| 337 | .fontSize(14) | 340 | .fontSize(14) |
| 338 | .margin({ left: 50 }) | 341 | .margin({ left: 50 }) |
| 339 | .fontColor(Color.Black) | 342 | .fontColor(Color.Black) |
| @@ -363,19 +366,12 @@ export struct MorningEveningPaperComponent { | @@ -363,19 +366,12 @@ export struct MorningEveningPaperComponent { | ||
| 363 | console.log("TAG", "cj compInfoBean onClick2 = " + this.isAudioPlaying) | 366 | console.log("TAG", "cj compInfoBean onClick2 = " + this.isAudioPlaying) |
| 364 | }) | 367 | }) |
| 365 | } | 368 | } |
| 366 | - // .aspectRatio(7 / 4) | ||
| 367 | .height('100%') | 369 | .height('100%') |
| 368 | - // .justifyContent(FlexAlign.Center) | ||
| 369 | - // .width(94) | ||
| 370 | - // .width(140) | ||
| 371 | .width('20%') | 370 | .width('20%') |
| 372 | - // .height(56) | ||
| 373 | .onClick(() => { | 371 | .onClick(() => { |
| 374 | - // console.info(TAG, `onClick listen_right_bg`); | ||
| 375 | }) | 372 | }) |
| 376 | } | 373 | } |
| 377 | .margin({ left: 12, right: 12 }) | 374 | .margin({ left: 12, right: 12 }) |
| 378 | - // .width('100%') | ||
| 379 | .height(56) | 375 | .height(56) |
| 380 | .alignItems(VerticalAlign.Center) | 376 | .alignItems(VerticalAlign.Center) |
| 381 | .justifyContent(FlexAlign.SpaceBetween) | 377 | .justifyContent(FlexAlign.SpaceBetween) |
-
Please register or login to post a comment