Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main
* 'main' of http://192.168.1.42/developOne/harmonyPool: fix: 地方精选卡ui修改 fix |> temp fix: 兴趣选择卡ui修改
Showing
3 changed files
with
9 additions
and
5 deletions
| @@ -78,7 +78,8 @@ export struct CompParser { | @@ -78,7 +78,8 @@ export struct CompParser { | ||
| 78 | } | 78 | } |
| 79 | .margin({ | 79 | .margin({ |
| 80 | left: 6, | 80 | left: 6, |
| 81 | - right: (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05 || this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) ? 0 : 6 | 81 | + right: (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05 || this.compDTO.compStyle === CompStyle.Zh_Single_Row_02 || |
| 82 | + this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) ? 0 : 6 | ||
| 82 | }) | 83 | }) |
| 83 | } | 84 | } |
| 84 | 85 |
| @@ -56,7 +56,7 @@ export struct Card5Component { | @@ -56,7 +56,7 @@ export struct Card5Component { | ||
| 56 | ) | 56 | ) |
| 57 | .height(this.loadImg ? '' : 114) | 57 | .height(this.loadImg ? '' : 114) |
| 58 | .autoResize(true) | 58 | .autoResize(true) |
| 59 | - if (!!this.titleShowPolicy || this.titleShowPolicy === null || this.titleShowPolicy == '' ) { | 59 | + if (!!this.titleShowPolicy || this.titleShowPolicy === null) { |
| 60 | Row() | 60 | Row() |
| 61 | .borderRadius( | 61 | .borderRadius( |
| 62 | { | 62 | { |
| @@ -132,15 +132,18 @@ export struct ZhSingleColumn09 { | @@ -132,15 +132,18 @@ export struct ZhSingleColumn09 { | ||
| 132 | .width('100%') | 132 | .width('100%') |
| 133 | .height('100%') | 133 | .height('100%') |
| 134 | .borderRadius(3) | 134 | .borderRadius(3) |
| 135 | + Row(){} | ||
| 136 | + .width('100%') | ||
| 137 | + .height('100%') | ||
| 138 | + .backgroundColor('rgba(0, 0, 0, 1)') | ||
| 139 | + .opacity(0.4) | ||
| 140 | + .borderRadius(3) | ||
| 135 | Text(item.newsTitle) | 141 | Text(item.newsTitle) |
| 136 | .width('100%') | 142 | .width('100%') |
| 137 | .height('100%') | 143 | .height('100%') |
| 138 | .fontSize(14) | 144 | .fontSize(14) |
| 139 | .textAlign(TextAlign.Center) | 145 | .textAlign(TextAlign.Center) |
| 140 | .fontColor(0xffffff) | 146 | .fontColor(0xffffff) |
| 141 | - .backgroundColor('rgba(0, 0, 0, 1)') | ||
| 142 | - .opacity(0.4) | ||
| 143 | - .borderRadius(3) | ||
| 144 | Image($r('app.media.icon_selected')) | 147 | Image($r('app.media.icon_selected')) |
| 145 | .width(14) | 148 | .width(14) |
| 146 | .height(14) | 149 | .height(14) |
-
Please register or login to post a comment