Showing
4 changed files
with
27 additions
and
14 deletions
| @@ -88,7 +88,8 @@ export struct MorningEveningPaperComponent { | @@ -88,7 +88,8 @@ export struct MorningEveningPaperComponent { | ||
| 88 | // .backgroundColor('#FFF1F3F5') | 88 | // .backgroundColor('#FFF1F3F5') |
| 89 | // .backgroundColor(Color.Blue) | 89 | // .backgroundColor(Color.Blue) |
| 90 | .height('100%') | 90 | .height('100%') |
| 91 | - .margin({ left: 14, right: 14 }) | 91 | + |
| 92 | + // .margin({ left: 12, right: 12 }) | ||
| 92 | 93 | ||
| 93 | PaperTitleComponent()// PaperTitleComponent({ | 94 | PaperTitleComponent()// PaperTitleComponent({ |
| 94 | // // title: this.morningEveningPaperDTO?.topicInfo?.title ?? "", | 95 | // // title: this.morningEveningPaperDTO?.topicInfo?.title ?? "", |
| @@ -100,6 +101,7 @@ export struct MorningEveningPaperComponent { | @@ -100,6 +101,7 @@ export struct MorningEveningPaperComponent { | ||
| 100 | } | 101 | } |
| 101 | .width('100%') | 102 | .width('100%') |
| 102 | // .backgroundColor('#000080') | 103 | // .backgroundColor('#000080') |
| 103 | - .backgroundColor(Color.Black) | 104 | + // .backgroundColor(Color.Black) |
| 105 | + .backgroundColor(this.pageInfoBean?.backgroundColor ?? Color.Black) | ||
| 104 | } | 106 | } |
| 105 | } | 107 | } |
| @@ -61,6 +61,7 @@ export struct PaperTitleComponent { | @@ -61,6 +61,7 @@ export struct PaperTitleComponent { | ||
| 61 | // console.info(TAG, "img_close") | 61 | // console.info(TAG, "img_close") |
| 62 | router.back() | 62 | router.back() |
| 63 | }) | 63 | }) |
| 64 | + .margin({ right: 16 }) | ||
| 64 | 65 | ||
| 65 | Image($r('app.media.icon_share')) | 66 | Image($r('app.media.icon_share')) |
| 66 | .height($r('app.float.top_arrow_size')) | 67 | .height($r('app.float.top_arrow_size')) |
| @@ -69,9 +70,11 @@ export struct PaperTitleComponent { | @@ -69,9 +70,11 @@ export struct PaperTitleComponent { | ||
| 69 | right: { anchor: "img_close", align: HorizontalAlign.Start }, | 70 | right: { anchor: "img_close", align: HorizontalAlign.Start }, |
| 70 | center: { anchor: "__container__", align: VerticalAlign.Center } }) | 71 | center: { anchor: "__container__", align: VerticalAlign.Center } }) |
| 71 | .id('img_share') | 72 | .id('img_share') |
| 73 | + .margin({ right: 13 }) | ||
| 72 | } | 74 | } |
| 73 | // .margin({ left: 14, right: 14 }) | 75 | // .margin({ left: 14, right: 14 }) |
| 74 | .height($r('app.float.top_bar_height')) | 76 | .height($r('app.float.top_bar_height')) |
| 75 | - .backgroundColor(Color.Black) | 77 | + |
| 78 | + // .backgroundColor(Color.Black) | ||
| 76 | } | 79 | } |
| 77 | } | 80 | } |
| @@ -3,7 +3,6 @@ import { CommonConstants, ConfigConstants, ScreenType } from 'wdConstant'; | @@ -3,7 +3,6 @@ import { CommonConstants, ConfigConstants, ScreenType } from 'wdConstant'; | ||
| 3 | import { Logger } from 'wdKit'; | 3 | import { Logger } from 'wdKit'; |
| 4 | import { CompUtils } from '../../utils/CompUtils'; | 4 | import { CompUtils } from '../../utils/CompUtils'; |
| 5 | import { WDRouterRule } from 'wdRouter'; | 5 | import { WDRouterRule } from 'wdRouter'; |
| 6 | -import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'; | ||
| 7 | import { ProcessUtils } from '../../utils/ProcessUtils'; | 6 | import { ProcessUtils } from '../../utils/ProcessUtils'; |
| 8 | 7 | ||
| 9 | const TAG: string = 'CardView'; | 8 | const TAG: string = 'CardView'; |
| @@ -400,7 +399,8 @@ export struct PaperSingleColumn999CardView { | @@ -400,7 +399,8 @@ export struct PaperSingleColumn999CardView { | ||
| 400 | .fontWeight(FontWeight.Bold) | 399 | .fontWeight(FontWeight.Bold) |
| 401 | .alignSelf(ItemAlign.Start) | 400 | .alignSelf(ItemAlign.Start) |
| 402 | .maxLines(3) | 401 | .maxLines(3) |
| 403 | - .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。 | 402 | + .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。 |
| 403 | + .margin({ left: 22, right: 22, top: 28 }) | ||
| 404 | if (this.item?.coverUrl) { | 404 | if (this.item?.coverUrl) { |
| 405 | Stack({ alignContent: Alignment.BottomEnd }) { | 405 | Stack({ alignContent: Alignment.BottomEnd }) { |
| 406 | Image(this.item?.coverUrl) | 406 | Image(this.item?.coverUrl) |
| @@ -418,7 +418,7 @@ export struct PaperSingleColumn999CardView { | @@ -418,7 +418,7 @@ export struct PaperSingleColumn999CardView { | ||
| 418 | .fitOriginalSize(true) | 418 | .fitOriginalSize(true) |
| 419 | }.width(CommonConstants.FULL_PARENT) | 419 | }.width(CommonConstants.FULL_PARENT) |
| 420 | } | 420 | } |
| 421 | - } | 421 | + }.margin({ left: 22, right: 22 }) |
| 422 | } | 422 | } |
| 423 | if (this.item?.newsSummary) { | 423 | if (this.item?.newsSummary) { |
| 424 | Text(this.item?.newsSummary) | 424 | Text(this.item?.newsSummary) |
| @@ -426,23 +426,26 @@ export struct PaperSingleColumn999CardView { | @@ -426,23 +426,26 @@ export struct PaperSingleColumn999CardView { | ||
| 426 | .padding({ top: 10 }) | 426 | .padding({ top: 10 }) |
| 427 | .alignSelf(ItemAlign.Start) | 427 | .alignSelf(ItemAlign.Start) |
| 428 | .maxLines(3) | 428 | .maxLines(3) |
| 429 | - .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。 | 429 | + .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。 |
| 430 | + .margin({ left: 22, right: 22 }) | ||
| 430 | } | 431 | } |
| 431 | if (this.item?.visitorComment) { | 432 | if (this.item?.visitorComment) { |
| 432 | Row() { | 433 | Row() { |
| 433 | Text(this.item?.visitorComment + "评") | 434 | Text(this.item?.visitorComment + "评") |
| 434 | .fontSize(12) | 435 | .fontSize(12) |
| 435 | .fontColor(Color.Gray) | 436 | .fontColor(Color.Gray) |
| 437 | + .margin({ left: 22 }) | ||
| 436 | Image($r('app.media.icon_share')) | 438 | Image($r('app.media.icon_share')) |
| 437 | .width(16) | 439 | .width(16) |
| 438 | .height(16) | 440 | .height(16) |
| 439 | - .margin(10) | 441 | + .margin({ left: 10, right: 22, top: 10, bottom: 10 }) |
| 440 | .backgroundColor(Color.Brown) | 442 | .backgroundColor(Color.Brown) |
| 441 | }.width(CommonConstants.FULL_PARENT) | 443 | }.width(CommonConstants.FULL_PARENT) |
| 442 | .justifyContent(FlexAlign.SpaceBetween) | 444 | .justifyContent(FlexAlign.SpaceBetween) |
| 443 | } | 445 | } |
| 444 | } | 446 | } |
| 445 | .backgroundColor(Color.White) | 447 | .backgroundColor(Color.White) |
| 446 | - .margin({ bottom: 5 }) | 448 | + .margin({ bottom: 5, left: 12, right: 12 }) |
| 449 | + .borderRadius(4) | ||
| 447 | } | 450 | } |
| 448 | } | 451 | } |
| @@ -81,22 +81,23 @@ | @@ -81,22 +81,23 @@ | ||
| 81 | "value": "#994D00" | 81 | "value": "#994D00" |
| 82 | }, | 82 | }, |
| 83 | { | 83 | { |
| 84 | - "name":"color_B15900", | 84 | + "name": "color_B15900", |
| 85 | "value": "#B15900" | 85 | "value": "#B15900" |
| 86 | }, | 86 | }, |
| 87 | { | 87 | { |
| 88 | "name": "main_red", | 88 | "name": "main_red", |
| 89 | "value": "#E84026" | 89 | "value": "#E84026" |
| 90 | - }, { | ||
| 91 | - "name":"color_4D000000", | 90 | + }, |
| 91 | + { | ||
| 92 | + "name": "color_4D000000", | ||
| 92 | "value": "#4D000000" | 93 | "value": "#4D000000" |
| 93 | }, | 94 | }, |
| 94 | { | 95 | { |
| 95 | - "name":"color_CCCCCC", | 96 | + "name": "color_CCCCCC", |
| 96 | "value": "#CCCCCC" | 97 | "value": "#CCCCCC" |
| 97 | }, | 98 | }, |
| 98 | { | 99 | { |
| 99 | - "name":"color_EDEDED", | 100 | + "name": "color_EDEDED", |
| 100 | "value": "#EDEDED" | 101 | "value": "#EDEDED" |
| 101 | }, | 102 | }, |
| 102 | { | 103 | { |
| @@ -106,6 +107,10 @@ | @@ -106,6 +107,10 @@ | ||
| 106 | { | 107 | { |
| 107 | "name": "color_B2FFFFFF", | 108 | "name": "color_B2FFFFFF", |
| 108 | "value": "#B2FFFFFF" | 109 | "value": "#B2FFFFFF" |
| 110 | + }, | ||
| 111 | + { | ||
| 112 | + "name": "color_00304c", | ||
| 113 | + "value": "#00304c" | ||
| 109 | } | 114 | } |
| 110 | ] | 115 | ] |
| 111 | } | 116 | } |
-
Please register or login to post a comment