Showing
2 changed files
with
11 additions
and
16 deletions
| @@ -28,7 +28,6 @@ export struct ENewspaperPageComponent { | @@ -28,7 +28,6 @@ export struct ENewspaperPageComponent { | ||
| 28 | @State newspaperListBean: NewspaperListBean = {} as NewspaperListBean | 28 | @State newspaperListBean: NewspaperListBean = {} as NewspaperListBean |
| 29 | @Provide @Watch('onCurrentPageNumUpdated') currentPageNum: string = '01' | 29 | @Provide @Watch('onCurrentPageNumUpdated') currentPageNum: string = '01' |
| 30 | @State pageDialogShow: boolean = false | 30 | @State pageDialogShow: boolean = false |
| 31 | - @State calendarDialogShow: boolean = false | ||
| 32 | @State calendarDate: string = '' | 31 | @State calendarDate: string = '' |
| 33 | private swiperController: SwiperController = new SwiperController() | 32 | private swiperController: SwiperController = new SwiperController() |
| 34 | @State swiperIndex: number = 0; | 33 | @State swiperIndex: number = 0; |
| @@ -225,13 +224,7 @@ export struct ENewspaperPageComponent { | @@ -225,13 +224,7 @@ export struct ENewspaperPageComponent { | ||
| 225 | }) | 224 | }) |
| 226 | .id('e_newspaper_date') | 225 | .id('e_newspaper_date') |
| 227 | .onClick(() => { | 226 | .onClick(() => { |
| 228 | - this.calendarDialogShow = !this.calendarDialogShow | ||
| 229 | - if (this.calendarDialogShow) { | ||
| 230 | - | ||
| 231 | - this.calendarDialogController.open() | ||
| 232 | - } else { | ||
| 233 | - this.calendarDialogController.close() | ||
| 234 | - } | 227 | + this.calendarDialogController.open() |
| 235 | }) | 228 | }) |
| 236 | 229 | ||
| 237 | if (this.newspaperListBean && this.newspaperListBean.list && this.newspaperListBean.list.length > 0) { | 230 | if (this.newspaperListBean && this.newspaperListBean.list && this.newspaperListBean.list.length > 0) { |
| @@ -194,11 +194,12 @@ export struct ENewspaperListDialog { | @@ -194,11 +194,12 @@ export struct ENewspaperListDialog { | ||
| 194 | Column() { | 194 | Column() { |
| 195 | if (positionItem.shortTitle) { | 195 | if (positionItem.shortTitle) { |
| 196 | Text(positionItem.shortTitle) | 196 | Text(positionItem.shortTitle) |
| 197 | - .fontSize($r('app.float.font_size_13')) | 197 | + .fontSize($r('app.float.font_size_17')) |
| 198 | + .lineHeight(25) | ||
| 198 | .fontColor($r('app.color.color_222222')) | 199 | .fontColor($r('app.color.color_222222')) |
| 199 | .fontWeight(600)// .maxLines(2) | 200 | .fontWeight(600)// .maxLines(2) |
| 200 | .margin({ | 201 | .margin({ |
| 201 | - bottom: 8 | 202 | + bottom: 12 |
| 202 | }) | 203 | }) |
| 203 | } | 204 | } |
| 204 | 205 | ||
| @@ -215,8 +216,9 @@ export struct ENewspaperListDialog { | @@ -215,8 +216,9 @@ export struct ENewspaperListDialog { | ||
| 215 | 216 | ||
| 216 | if (positionItem.downTitle) { | 217 | if (positionItem.downTitle) { |
| 217 | Text(positionItem.downTitle) | 218 | Text(positionItem.downTitle) |
| 218 | - .fontSize($r('app.float.font_size_13')) | ||
| 219 | - .fontColor($r('app.color.color_222222')) | 219 | + .fontSize($r('app.float.font_size_14')) |
| 220 | + // .fontColor($r('app.color.color_222222')) | ||
| 221 | + .lineHeight(20) | ||
| 220 | .fontWeight(600) | 222 | .fontWeight(600) |
| 221 | .margin({ | 223 | .margin({ |
| 222 | bottom: 8 | 224 | bottom: 8 |
| @@ -225,9 +227,9 @@ export struct ENewspaperListDialog { | @@ -225,9 +227,9 @@ export struct ENewspaperListDialog { | ||
| 225 | } | 227 | } |
| 226 | if (positionItem.newsTxt) { | 228 | if (positionItem.newsTxt) { |
| 227 | Text(positionItem.newsTxt) | 229 | Text(positionItem.newsTxt) |
| 228 | - .fontSize($r('app.float.font_size_13')) | 230 | + .fontSize($r('app.float.font_size_14')) |
| 229 | .fontColor($r('app.color.color_999999')) | 231 | .fontColor($r('app.color.color_999999')) |
| 230 | - .lineHeight(25) | 232 | + .lineHeight(21) |
| 231 | .margin({ | 233 | .margin({ |
| 232 | // bottom: 15 | 234 | // bottom: 15 |
| 233 | }) | 235 | }) |
| @@ -261,8 +263,8 @@ export struct ENewspaperListDialog { | @@ -261,8 +263,8 @@ export struct ENewspaperListDialog { | ||
| 261 | .strokeWidth(0.5) | 263 | .strokeWidth(0.5) |
| 262 | .color('#EDEDED') | 264 | .color('#EDEDED') |
| 263 | .padding({ | 265 | .padding({ |
| 264 | - top: 15, | ||
| 265 | - bottom: 15 | 266 | + top: 16, |
| 267 | + bottom: 16 | ||
| 266 | }) | 268 | }) |
| 267 | } | 269 | } |
| 268 | } | 270 | } |
-
Please register or login to post a comment