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

@@ -58,11 +58,11 @@ export struct ENewspaperItemComponent {
           let taskAction: Action = {
             type: 'JUMP_INNER_NEW_PAGE',
             params: {
-              contentID: '30001758346',
+              contentID: '' + this.itemBeanClicked.newsId,
               pageID: 'IMAGE_TEXT_DETAIL',
               extra: {
-                relType: '1',
-                relId: '500000001277',
+                relType: this.itemBeanClicked.relType ?? '',
+                relId: ''+this.itemBeanClicked.relId,
                 sourcePage: '5'
               } as ExtraDTO
             } as Params,

@@ -115,7 +115,7 @@ export struct ENewspaperPageComponent {
 
         Image($r('app.media.newspaper_shadow'))
           .height($r('app.float.vp_12'))
-          .margin({ left: 12, right: 12, top: -1 })
+          .margin({ left: 20, right: 20, top: -1 })
           .objectFit(ImageFit.Contain)
           .alignRules({ top: { anchor: "e_newspaper_content", align: VerticalAlign.Bottom },
             left: { anchor: 'e_newspaper_content', align: HorizontalAlign.Start },