Showing
4 changed files
with
59 additions
and
18 deletions
| @@ -29,6 +29,14 @@ | @@ -29,6 +29,14 @@ | ||
| 29 | "value": "14fp" | 29 | "value": "14fp" |
| 30 | }, | 30 | }, |
| 31 | { | 31 | { |
| 32 | + "name": "font_size_14_5", | ||
| 33 | + "value": "14.5fp" | ||
| 34 | + }, | ||
| 35 | + { | ||
| 36 | + "name": "font_size_15", | ||
| 37 | + "value": "15fp" | ||
| 38 | + }, | ||
| 39 | + { | ||
| 32 | "name": "font_size_16", | 40 | "name": "font_size_16", |
| 33 | "value": "16fp" | 41 | "value": "16fp" |
| 34 | }, | 42 | }, |
| @@ -49,10 +49,15 @@ export struct FeedBackActivity { | @@ -49,10 +49,15 @@ export struct FeedBackActivity { | ||
| 49 | Column() { | 49 | Column() { |
| 50 | Text($r('app.string.feedback_opinion_type')) | 50 | Text($r('app.string.feedback_opinion_type')) |
| 51 | .fontColor($r('app.color.color_222222')) | 51 | .fontColor($r('app.color.color_222222')) |
| 52 | - .fontSize($r('app.float.font_size_16')) | ||
| 53 | - .fontWeight(FontWeight.Bold) | 52 | + .fontSize($r('app.float.font_size_14_5')) |
| 53 | + .fontWeight(600) | ||
| 54 | .width('100%') | 54 | .width('100%') |
| 55 | .margin({ left: 24, top: $r('app.float.vp_14') }) | 55 | .margin({ left: 24, top: $r('app.float.vp_14') }) |
| 56 | + Blank() | ||
| 57 | + .height(0.5) | ||
| 58 | + .width('94%') | ||
| 59 | + .margin({ top: $r('app.float.vp_12') }) | ||
| 60 | + .backgroundColor($r('app.color.color_EDEDED')) | ||
| 56 | GridRow({ | 61 | GridRow({ |
| 57 | columns:3, | 62 | columns:3, |
| 58 | }) { | 63 | }) { |
| @@ -89,8 +94,8 @@ export struct FeedBackActivity { | @@ -89,8 +94,8 @@ export struct FeedBackActivity { | ||
| 89 | .backgroundColor($r('app.color.color_F5F5F5')) | 94 | .backgroundColor($r('app.color.color_F5F5F5')) |
| 90 | Text($r('app.string.feedback_opinion_tv')) | 95 | Text($r('app.string.feedback_opinion_tv')) |
| 91 | .fontColor($r('app.color.color_222222')) | 96 | .fontColor($r('app.color.color_222222')) |
| 92 | - .fontSize($r('app.float.font_size_16')) | ||
| 93 | - .fontWeight(FontWeight.Bold) | 97 | + .fontSize($r('app.float.font_size_14_5')) |
| 98 | + .fontWeight(600) | ||
| 94 | .width(CommonConstants.FULL_WIDTH) | 99 | .width(CommonConstants.FULL_WIDTH) |
| 95 | .margin({ left: 24, top: $r('app.float.vp_12') }) | 100 | .margin({ left: 24, top: $r('app.float.vp_12') }) |
| 96 | Stack({ alignContent: Alignment.BottomEnd }) { | 101 | Stack({ alignContent: Alignment.BottomEnd }) { |
| @@ -191,26 +196,46 @@ export struct FeedBackActivity { | @@ -191,26 +196,46 @@ export struct FeedBackActivity { | ||
| 191 | .fontSize($r('app.float.font_size_13_2')) | 196 | .fontSize($r('app.float.font_size_13_2')) |
| 192 | .width('94%') | 197 | .width('94%') |
| 193 | .margin({ top: $r('app.float.margin_24') }) | 198 | .margin({ top: $r('app.float.margin_24') }) |
| 199 | + | ||
| 194 | Row() { | 200 | Row() { |
| 201 | + Blank().width('3%') | ||
| 195 | Text($r('app.string.feedback_mail')) | 202 | Text($r('app.string.feedback_mail')) |
| 203 | + .height(CommonConstants.FULL_HEIGHT) | ||
| 196 | .fontColor($r('app.color.color_222222')) | 204 | .fontColor($r('app.color.color_222222')) |
| 197 | - .fontSize($r('app.float.font_size_14')) | ||
| 198 | - .fontWeight(FontWeight.Bold) | 205 | + .fontSize($r('app.float.font_size_13_2')) |
| 206 | + .fontWeight(600) | ||
| 207 | + .padding({left: $r('app.float.margin_12') }) | ||
| 208 | + .backgroundColor($r('app.color.color_F5F5F5')) | ||
| 209 | + .borderRadius({ | ||
| 210 | + topLeft: 4, | ||
| 211 | + topRight: 0, | ||
| 212 | + bottomLeft: 4, | ||
| 213 | + bottomRight: 0, | ||
| 214 | + }) | ||
| 215 | + | ||
| 199 | TextInput({ placeholder: $r('app.string.feedback_hideemail') }) | 216 | TextInput({ placeholder: $r('app.string.feedback_hideemail') }) |
| 200 | - .width(CommonConstants.FULL_WIDTH) | 217 | + .width(0) |
| 218 | + .layoutWeight(1) | ||
| 201 | .height(CommonConstants.FULL_HEIGHT) | 219 | .height(CommonConstants.FULL_HEIGHT) |
| 202 | - // .margin({left:15}) | 220 | + .fontColor($r('app.color.color_222222')) |
| 221 | + .fontSize($r('app.float.font_size_13_2')) | ||
| 222 | + .placeholderColor($r('app.color.color_CCCCCC')) | ||
| 223 | + .placeholderFont({size:$r('app.float.font_size_13_2')}) | ||
| 203 | .backgroundColor($r('app.color.color_F5F5F5')) | 224 | .backgroundColor($r('app.color.color_F5F5F5')) |
| 225 | + .borderRadius({ | ||
| 226 | + topLeft: 0, | ||
| 227 | + topRight: 4, | ||
| 228 | + bottomLeft: 0, | ||
| 229 | + bottomRight: 4, | ||
| 230 | + }) | ||
| 204 | .onChange((value) => { | 231 | .onChange((value) => { |
| 205 | - // Logger.debug(TAG, "onChange" + value + "/" + this.passwordContent) | ||
| 206 | this.email = value | 232 | this.email = value |
| 207 | }) | 233 | }) |
| 234 | + Blank().width('3%') | ||
| 208 | } | 235 | } |
| 209 | - .height(44) | ||
| 210 | - .width('94%') | ||
| 211 | - .backgroundColor($r('app.color.color_F5F5F5')) | ||
| 212 | - .margin({top: $r('app.float.margin_16') }) | ||
| 213 | - .borderRadius(4) | 236 | + .height(42) |
| 237 | + .width(CommonConstants.FULL_WIDTH) | ||
| 238 | + .margin({top: $r('app.float.margin_16')}) | ||
| 214 | Blank().layoutWeight(1) | 239 | Blank().layoutWeight(1) |
| 215 | } | 240 | } |
| 216 | } | 241 | } |
| @@ -222,8 +247,8 @@ export struct FeedBackActivity { | @@ -222,8 +247,8 @@ export struct FeedBackActivity { | ||
| 222 | Column(){ | 247 | Column(){ |
| 223 | Text($r('app.string.submit')) | 248 | Text($r('app.string.submit')) |
| 224 | .textAlign(TextAlign.Center) | 249 | .textAlign(TextAlign.Center) |
| 225 | - .height(44) | ||
| 226 | - .width('90%') | 250 | + .height(42) |
| 251 | + .width('94%') | ||
| 227 | .fontColor(this.canSubmit ? $r('app.color.color_fff') : $r('app.color.color_FFFFFF_40')) | 252 | .fontColor(this.canSubmit ? $r('app.color.color_fff') : $r('app.color.color_FFFFFF_40')) |
| 228 | .fontSize($r('app.float.font_size_18')) | 253 | .fontSize($r('app.float.font_size_18')) |
| 229 | .backgroundColor(this.canSubmit ? $r('app.color.color_ED2800') : $r('app.color.color_ED2800_99')) | 254 | .backgroundColor(this.canSubmit ? $r('app.color.color_ED2800') : $r('app.color.color_ED2800_99')) |
| @@ -28,10 +28,10 @@ export struct CustomTitleUI { | @@ -28,10 +28,10 @@ export struct CustomTitleUI { | ||
| 28 | Text(this.titleName) | 28 | Text(this.titleName) |
| 29 | .maxLines(1) | 29 | .maxLines(1) |
| 30 | .id("title") | 30 | .id("title") |
| 31 | - .fontSize('35lpx') | 31 | + .fontSize('30lpx') |
| 32 | .fontWeight(400) | 32 | .fontWeight(400) |
| 33 | .fontColor($r('app.color.color_222222')) | 33 | .fontColor($r('app.color.color_222222')) |
| 34 | - .lineHeight('42lpx') | 34 | + .lineHeight('43lpx') |
| 35 | .alignRules({ | 35 | .alignRules({ |
| 36 | center: {anchor: "__container__", align: VerticalAlign.Center}, | 36 | center: {anchor: "__container__", align: VerticalAlign.Center}, |
| 37 | middle: {anchor: "__container__", align: HorizontalAlign.Center} | 37 | middle: {anchor: "__container__", align: HorizontalAlign.Center} |
| @@ -29,6 +29,14 @@ | @@ -29,6 +29,14 @@ | ||
| 29 | "value": "14fp" | 29 | "value": "14fp" |
| 30 | }, | 30 | }, |
| 31 | { | 31 | { |
| 32 | + "name": "font_size_14_5", | ||
| 33 | + "value": "14.5fp" | ||
| 34 | + }, | ||
| 35 | + { | ||
| 36 | + "name": "font_size_15", | ||
| 37 | + "value": "15fp" | ||
| 38 | + }, | ||
| 39 | + { | ||
| 32 | "name": "font_size_16", | 40 | "name": "font_size_16", |
| 33 | "value": "16fp" | 41 | "value": "16fp" |
| 34 | }, | 42 | }, |
-
Please register or login to post a comment