developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
guochunsong
a0303487 2 parents 07d40aeb 440deb9b

Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
@@ -58,11 +58,11 @@ export struct ENewspaperItemComponent { @@ -58,11 +58,11 @@ export struct ENewspaperItemComponent {
58 let taskAction: Action = { 58 let taskAction: Action = {
59 type: 'JUMP_INNER_NEW_PAGE', 59 type: 'JUMP_INNER_NEW_PAGE',
60 params: { 60 params: {
61 - contentID: '30001758346', 61 + contentID: '' + this.itemBeanClicked.newsId,
62 pageID: 'IMAGE_TEXT_DETAIL', 62 pageID: 'IMAGE_TEXT_DETAIL',
63 extra: { 63 extra: {
64 - relType: '1',  
65 - relId: '500000001277', 64 + relType: this.itemBeanClicked.relType ?? '',
  65 + relId: ''+this.itemBeanClicked.relId,
66 sourcePage: '5' 66 sourcePage: '5'
67 } as ExtraDTO 67 } as ExtraDTO
68 } as Params, 68 } as Params,
@@ -115,7 +115,7 @@ export struct ENewspaperPageComponent { @@ -115,7 +115,7 @@ export struct ENewspaperPageComponent {
115 115
116 Image($r('app.media.newspaper_shadow')) 116 Image($r('app.media.newspaper_shadow'))
117 .height($r('app.float.vp_12')) 117 .height($r('app.float.vp_12'))
118 - .margin({ left: 12, right: 12, top: -1 }) 118 + .margin({ left: 20, right: 20, top: -1 })
119 .objectFit(ImageFit.Contain) 119 .objectFit(ImageFit.Contain)
120 .alignRules({ top: { anchor: "e_newspaper_content", align: VerticalAlign.Bottom }, 120 .alignRules({ top: { anchor: "e_newspaper_content", align: VerticalAlign.Bottom },
121 left: { anchor: 'e_newspaper_content', align: HorizontalAlign.Start }, 121 left: { anchor: 'e_newspaper_content', align: HorizontalAlign.Start },