developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
yanlu
7d3719c2 1 parent 4584570c

fix:17474 我的预约下的视频图标鸿蒙与安卓不一致

Inline Side-by-side
Showing 3 changed files with 16 additions and 8 deletions
@@ -127,7 +127,7 @@ struct ReserveMorePage { @@ -127,7 +127,7 @@ struct ReserveMorePage {
127 buildItem(item: ContentDTO, index: number) { 127 buildItem(item: ContentDTO, index: number) {
128 Column() { 128 Column() {
129 Stack() { 129 Stack() {
130 - Image(item.fullColumnImgUrls[0].url) 130 + Image(item.fullColumnImgUrls[0]?.url)
131 .width('100%') 131 .width('100%')
132 .height(196) 132 .height(196)
133 .borderRadius(4) 133 .borderRadius(4)
@@ -139,8 +139,9 @@ struct ReserveMorePage { @@ -139,8 +139,9 @@ struct ReserveMorePage {
139 Text(item.newsTitle) 139 Text(item.newsTitle)
140 .fontSize(17) 140 .fontSize(17)
141 .maxLines(2) 141 .maxLines(2)
  142 + .lineHeight(25)
142 .textOverflow({ overflow: TextOverflow.Ellipsis }) 143 .textOverflow({ overflow: TextOverflow.Ellipsis })
143 - .margin({ top: 16, left: 12, right: 12 }) 144 + .margin({ top: 8, left: 12, right: 12 })
144 .alignSelf(ItemAlign.Start) 145 .alignSelf(ItemAlign.Start)
145 Row() { 146 Row() {
146 Row() { 147 Row() {
@@ -148,6 +149,7 @@ struct ReserveMorePage { @@ -148,6 +149,7 @@ struct ReserveMorePage {
148 .width(20) 149 .width(20)
149 .height(20) 150 .height(20)
150 .margin({ left: 10, top: 2, bottom: 2, right: 6 }) 151 .margin({ left: 10, top: 2, bottom: 2, right: 6 })
  152 +
151 // Text(DateTimeUtils.formatDate(item.liveInfo.liveStartTime, "MM月dd日 HH:mm")) 153 // Text(DateTimeUtils.formatDate(item.liveInfo.liveStartTime, "MM月dd日 HH:mm"))
152 Text(this.getReserveDate(item.liveInfo.liveStartTime, 1)) 154 Text(this.getReserveDate(item.liveInfo.liveStartTime, 1))
153 .fontSize(12) 155 .fontSize(12)
@@ -256,6 +258,9 @@ struct ReserveMorePage { @@ -256,6 +258,9 @@ struct ReserveMorePage {
256 .height(24) 258 .height(24)
257 .objectFit(ImageFit.Auto) 259 .objectFit(ImageFit.Auto)
258 .id("back_icon") 260 .id("back_icon")
  261 + .margin({
  262 + left: '16vp'
  263 + })
259 .alignRules({ 264 .alignRules({
260 center: { anchor: "__container__", align: VerticalAlign.Center }, 265 center: { anchor: "__container__", align: VerticalAlign.Center },
261 left: { anchor: "__container__", align: HorizontalAlign.Start } 266 left: { anchor: "__container__", align: HorizontalAlign.Start }
@@ -267,10 +272,10 @@ struct ReserveMorePage { @@ -267,10 +272,10 @@ struct ReserveMorePage {
267 Text(this.title)// .height('42lpx') 272 Text(this.title)// .height('42lpx')
268 .maxLines(1) 273 .maxLines(1)
269 .id("title") 274 .id("title")
270 - .fontSize('35lpx') 275 + .fontSize('18vp')
271 .fontWeight(400) 276 .fontWeight(400)
272 .fontColor($r('app.color.color_222222')) 277 .fontColor($r('app.color.color_222222'))
273 - .lineHeight('42lpx') 278 + .lineHeight('22vp')
274 .alignRules({ 279 .alignRules({
275 center: { anchor: "__container__", align: VerticalAlign.Center }, 280 center: { anchor: "__container__", align: VerticalAlign.Center },
276 middle: { anchor: "__container__", align: HorizontalAlign.Center } 281 middle: { anchor: "__container__", align: HorizontalAlign.Center }
@@ -284,11 +289,14 @@ struct ReserveMorePage { @@ -284,11 +289,14 @@ struct ReserveMorePage {
284 @Builder 289 @Builder
285 LiveImage() { 290 LiveImage() {
286 Row() { 291 Row() {
287 - Image($r('app.media.reserve_icon'))  
288 - .width(22)  
289 - .height(18) 292 + Image($r('app.media.reserve_new_icon'))
  293 + .width(14)
  294 + .height(14)
  295 + .margin({
  296 + right: 3
  297 + })
290 Text('预约') 298 Text('预约')
291 - .fontSize('11fp') 299 + .fontSize('12vp')
292 .fontWeight(400) 300 .fontWeight(400)
293 .fontColor(Color.White) 301 .fontColor(Color.White)
294 } 302 }