wangyong_wd

fix:修复人民号图集使用三图卡时右下角不展示图集logo及数量的问题

@@ -2,6 +2,7 @@ import { ContentDTO, FullColumnImgUrlDTO } from 'wdBean'; @@ -2,6 +2,7 @@ import { ContentDTO, FullColumnImgUrlDTO } from 'wdBean';
2 import { CommonConstants } from 'wdConstant/Index'; 2 import { CommonConstants } from 'wdConstant/Index';
3 import { ProcessUtils } from 'wdRouter'; 3 import { ProcessUtils } from 'wdRouter';
4 import { CardSourceInfo } from '../cardCommon/CardSourceInfo' 4 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
  5 +import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
5 const TAG: string = 'Card4Component'; 6 const TAG: string = 'Card4Component';
6 7
7 /** 8 /**
@@ -81,27 +82,34 @@ export struct Card4Component { @@ -81,27 +82,34 @@ export struct Card4Component {
81 .maxLines(3) 82 .maxLines(3)
82 .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。 83 .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
83 //三图 84 //三图
84 - Row() {  
85 - GridRow({ gutter: 2 }) {  
86 - ForEach(this.contentDTO.fullColumnImgUrls, (item: FullColumnImgUrlDTO, index: number) => {  
87 - if (index < 3) {  
88 - GridCol({ span: { xs: 4 } }) {  
89 - Image(item.url)  
90 - .width('100%')  
91 - .aspectRatio(113 / 75)  
92 - .borderRadius({  
93 - topLeft: index === 0 ? $r('app.float.image_border_radius') : 0,  
94 - topRight: index === 2 ? $r('app.float.image_border_radius') : 0,  
95 - bottomLeft: index === 0 ? $r('app.float.image_border_radius') : 0,  
96 - bottomRight: index === 2 ? $r('app.float.image_border_radius') : 0,  
97 - }) 85 + Stack(){
  86 + Row() {
  87 + GridRow({ gutter: 2 }) {
  88 + ForEach(this.contentDTO.fullColumnImgUrls, (item: FullColumnImgUrlDTO, index: number) => {
  89 + if (index < 3) {
  90 + GridCol({ span: { xs: 4 } }) {
  91 + Image(item.url)
  92 + .width('100%')
  93 + .aspectRatio(113 / 75)
  94 + .borderRadius({
  95 + topLeft: index === 0 ? $r('app.float.image_border_radius') : 0,
  96 + topRight: index === 2 ? $r('app.float.image_border_radius') : 0,
  97 + bottomLeft: index === 0 ? $r('app.float.image_border_radius') : 0,
  98 + bottomRight: index === 2 ? $r('app.float.image_border_radius') : 0,
  99 + })
  100 + }
98 } 101 }
99 - }  
100 - }) 102 + })
  103 + }
101 } 104 }
  105 + .width(CommonConstants.FULL_PARENT)
  106 + .margin({ top: 8 })
  107 + CardMediaInfo({
  108 + contentDTO: this.contentDTO
  109 + })
102 } 110 }
103 - .width('100%')  
104 - .margin({ top: 8 }) 111 + .width(CommonConstants.FULL_PARENT)
  112 + .alignContent(Alignment.BottomEnd)
105 } 113 }
106 .width('100%') 114 .width('100%')
107 .justifyContent(FlexAlign.Start) 115 .justifyContent(FlexAlign.Start)