xugenyuan

fix |> 稿件详情页面,下方的推荐阅读和最新评论, 没有与内容左对齐

http://192.168.1.3:8080/zentao/bug-view-20414.html

Signed-off-by: xugenyuan <xugenyuan@wondertek.com.cn>
@@ -427,7 +427,7 @@ struct ChildCommentItem { @@ -427,7 +427,7 @@ struct ChildCommentItem {
427 @Link dialogController: CustomDialogController | null 427 @Link dialogController: CustomDialogController | null
428 @ObjectLink item: commentItemModel 428 @ObjectLink item: commentItemModel
429 @Consume contentDetailData: ContentDetailDTO 429 @Consume contentDetailData: ContentDetailDTO
430 - 430 + private leftGap: number = 95 + 4
431 @Consume inDialog: boolean 431 @Consume inDialog: boolean
432 private dialogBeforeJumpOtherPageAction: () => void = () => {} 432 private dialogBeforeJumpOtherPageAction: () => void = () => {}
433 433
@@ -490,14 +490,14 @@ struct ChildCommentItem { @@ -490,14 +490,14 @@ struct ChildCommentItem {
490 fontWeight: FontWeight.Regular, 490 fontWeight: FontWeight.Regular,
491 marginWidth: (95 + 16) 491 marginWidth: (95 + 16)
492 }) 492 })
493 - .margin({ left: 95, right: 16, top: -15 }) 493 + .margin({ left: this.leftGap, right: 16, top: -15 })
494 .onClick(() => { 494 .onClick(() => {
495 this.replyComment() 495 this.replyComment()
496 }) 496 })
497 if (this.item.commentPics.length > 0) { 497 if (this.item.commentPics.length > 0) {
498 Image(this.item.commentPics) 498 Image(this.item.commentPics)
499 .width(88).height(88) 499 .width(88).height(88)
500 - .margin({top: 6 + (this.item.commentContent.length > 0 ? 0 : 15), left: 95}) 500 + .margin({top: 6 + (this.item.commentContent.length > 0 ? 0 : 15), left: this.leftGap})
501 } 501 }
502 502
503 commentFooterView({ 503 commentFooterView({
@@ -505,7 +505,7 @@ struct ChildCommentItem { @@ -505,7 +505,7 @@ struct ChildCommentItem {
505 dialogController: this.dialogController, 505 dialogController: this.dialogController,
506 publishCommentModel: this.publishCommentModel, 506 publishCommentModel: this.publishCommentModel,
507 dialogBeforeJumpOtherPageAction: this.dialogBeforeJumpOtherPageAction 507 dialogBeforeJumpOtherPageAction: this.dialogBeforeJumpOtherPageAction
508 - }).margin({ left: 95, right: 16 }) 508 + }).margin({ left: this.leftGap, right: 16 })
509 }.alignItems(HorizontalAlign.Start) 509 }.alignItems(HorizontalAlign.Start)
510 .width('100%') 510 .width('100%')
511 } 511 }
@@ -540,7 +540,7 @@ struct ChildCommentItem { @@ -540,7 +540,7 @@ struct ChildCommentItem {
540 } 540 }
541 } 541 }
542 .width(48).height(48) 542 .width(48).height(48)
543 - .margin({ left: 47 }) 543 + .margin({ left: 47 + 4 })
544 .alignContent(Alignment.Center) 544 .alignContent(Alignment.Center)
545 .onClick(() => { 545 .onClick(() => {
546 546
@@ -628,6 +628,7 @@ struct footerExpandedView { @@ -628,6 +628,7 @@ struct footerExpandedView {
628 }.height(20) 628 }.height(20)
629 // .backgroundColor(Color.Green) 629 // .backgroundColor(Color.Green)
630 }.height(24) 630 }.height(24)
  631 + .padding({left: 4})
631 .alignItems(VerticalAlign.Top) 632 .alignItems(VerticalAlign.Top)
632 // .backgroundColor(Color.Gray) 633 // .backgroundColor(Color.Gray)
633 } 634 }
@@ -663,6 +664,7 @@ struct commentHeaderView { @@ -663,6 +664,7 @@ struct commentHeaderView {
663 664
664 @Consume inDialog: boolean 665 @Consume inDialog: boolean
665 private dialogBeforeJumpOtherPageAction: () => void = () => {} 666 private dialogBeforeJumpOtherPageAction: () => void = () => {}
  667 + private leftGap: number = 64
666 668
667 build() { 669 build() {
668 Column() { 670 Column() {
@@ -712,7 +714,7 @@ struct commentHeaderView { @@ -712,7 +714,7 @@ struct commentHeaderView {
712 fontWeight: FontWeight.Regular, 714 fontWeight: FontWeight.Regular,
713 marginWidth: (59 + 16) 715 marginWidth: (59 + 16)
714 }) 716 })
715 - .margin({ left: 60, right: 16,top:-15 }) 717 + .margin({ left: this.leftGap, right: 16,top:-12 })
716 .onClick(() => { 718 .onClick(() => {
717 this.replyComment() 719 this.replyComment()
718 }) 720 })
@@ -720,7 +722,7 @@ struct commentHeaderView { @@ -720,7 +722,7 @@ struct commentHeaderView {
720 if (this.item.commentPics.length > 0) { 722 if (this.item.commentPics.length > 0) {
721 Image(this.item.commentPics) 723 Image(this.item.commentPics)
722 .width(88).height(88) 724 .width(88).height(88)
723 - .margin({top: 6 + (this.item.commentContent.length > 0 ? 0 : 15), left: 60}) 725 + .margin({top: 6 + (this.item.commentContent.length > 0 ? 0 : 15), left: this.leftGap})
724 } 726 }
725 727
726 commentFooterView({ 728 commentFooterView({
@@ -728,7 +730,7 @@ struct commentHeaderView { @@ -728,7 +730,7 @@ struct commentHeaderView {
728 dialogController: this.dialogController, 730 dialogController: this.dialogController,
729 publishCommentModel: this.publishCommentModel, 731 publishCommentModel: this.publishCommentModel,
730 dialogBeforeJumpOtherPageAction: this.dialogBeforeJumpOtherPageAction 732 dialogBeforeJumpOtherPageAction: this.dialogBeforeJumpOtherPageAction
731 - }).margin({ left: 60, right: 16 }) 733 + }).margin({ left: this.leftGap, right: 16 })
732 }.alignItems(HorizontalAlign.Start) 734 }.alignItems(HorizontalAlign.Start)
733 .padding({bottom: 0}) 735 .padding({bottom: 0})
734 } 736 }
@@ -763,7 +765,7 @@ struct commentHeaderView { @@ -763,7 +765,7 @@ struct commentHeaderView {
763 } 765 }
764 } 766 }
765 .width(48).height(48) 767 .width(48).height(48)
766 - .margin({ left: 8 }) 768 + .margin({ left: 8 + 4 })
767 .alignContent(Alignment.Center) 769 .alignContent(Alignment.Center)
768 .onClick(() => { 770 .onClick(() => {
769 771
@@ -30,7 +30,7 @@ export struct RecommendList { @@ -30,7 +30,7 @@ export struct RecommendList {
30 ForEach(this.recommendList, (item: ContentDTO, index: number) => { 30 ForEach(this.recommendList, (item: ContentDTO, index: number) => {
31 Row() { 31 Row() {
32 CardParser({ compDTO:new CompDTO,contentDTO: item }); 32 CardParser({ compDTO:new CompDTO,contentDTO: item });
33 - } 33 + }.padding({ left: 6, right: 6 })
34 if (this.recommendList.length !== index + 1) { 34 if (this.recommendList.length !== index + 1) {
35 Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 35 Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
36 } 36 }