Showing
2 changed files
with
20 additions
and
6 deletions
| @@ -229,7 +229,7 @@ export struct DynamicDetailComponent { | @@ -229,7 +229,7 @@ export struct DynamicDetailComponent { | ||
| 229 | .margin({ right: $r('app.float.margin_6') }) | 229 | .margin({ right: $r('app.float.margin_6') }) |
| 230 | 230 | ||
| 231 | Blank() | 231 | Blank() |
| 232 | - if (!StringUtils.isEmpty(this.followStatus)) { | 232 | + if ((this.contentDetailData.rmhPlatform == 1 && this.contentDetailData?.rmhInfo?.userType != "5") && !StringUtils.isEmpty(this.followStatus)) { |
| 233 | if (this.followStatus == '0') { | 233 | if (this.followStatus == '0') { |
| 234 | Row() { | 234 | Row() { |
| 235 | Blank().layoutWeight(1) | 235 | Blank().layoutWeight(1) |
| @@ -685,10 +685,24 @@ export struct DynamicDetailComponent { | @@ -685,10 +685,24 @@ export struct DynamicDetailComponent { | ||
| 685 | @Builder topNav() { | 685 | @Builder topNav() { |
| 686 | //logo、日期 | 686 | //logo、日期 |
| 687 | Row() { | 687 | Row() { |
| 688 | - Image($r('app.media.ic_article_rmh')) | ||
| 689 | - .width($r('app.float.margin_80')) | ||
| 690 | - .height($r('app.float.margin_28')) | ||
| 691 | - .margin({ left: $r('app.float.margin_16') }) | 688 | + if (this.contentDetailData.rmhPlatform == 1) { // 人民号 |
| 689 | + if (this.contentDetailData?.rmhInfo?.userType == "5") { // 内容源账号 | ||
| 690 | + Blank().height(1) | ||
| 691 | + } else { | ||
| 692 | + Image($r('app.media.ic_article_rmh')) | ||
| 693 | + .width($r('app.float.margin_80')) | ||
| 694 | + .height($r('app.float.margin_28')) | ||
| 695 | + .margin({ left: $r('app.float.margin_16') }) | ||
| 696 | + } | ||
| 697 | + } else if (this.contentDetailData.rmhPlatform == 2) { // 普通用户 | ||
| 698 | + Blank().height(1) | ||
| 699 | + } else { | ||
| 700 | + Image($r('app.media.logo_rmrb')) | ||
| 701 | + .width($r('app.float.margin_80')) | ||
| 702 | + .height($r('app.float.margin_28')) | ||
| 703 | + .margin({ left: $r('app.float.margin_16') }) | ||
| 704 | + } | ||
| 705 | + | ||
| 692 | Blank() | 706 | Blank() |
| 693 | Text(this.publishTime) | 707 | Text(this.publishTime) |
| 694 | .fontColor($r('app.color.color_B0B0B0')) | 708 | .fontColor($r('app.color.color_B0B0B0')) |
| @@ -211,7 +211,7 @@ export struct RmhTitle { | @@ -211,7 +211,7 @@ export struct RmhTitle { | ||
| 211 | .width('100%') | 211 | .width('100%') |
| 212 | 212 | ||
| 213 | Blank() | 213 | Blank() |
| 214 | - if (this.rmhInfo?.cnIsAttention) { | 214 | + if (this.rmhInfo?.cnIsAttention && this.rmhInfo?.userType != "5") { |
| 215 | Column() { | 215 | Column() { |
| 216 | Row(){ | 216 | Row(){ |
| 217 | if (Number(this.followStatus) === 0) { | 217 | if (Number(this.followStatus) === 0) { |
-
Please register or login to post a comment