developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
yumaochao
65f05a8c 2 parents e0e753e7 a267a712

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

Inline Side-by-side
Showing 1 changed file with 8 additions and 8 deletions
... ... @@ -50,7 +50,7 @@ export struct FeedBackActivity {
.fontSize($r('app.float.font_size_16'))
.fontWeight(FontWeight.Bold)
.width('100%')
.margin({ left: $r('app.float.vp_15'), top: $r('app.float.vp_14') })
.margin({ left: 24, top: $r('app.float.vp_14') })
GridRow({
columns:3,
}) {
... ... @@ -75,7 +75,7 @@ export struct FeedBackActivity {
}
})
}
.width('100%')
.width('94%')
.margin({top:$r('app.float.vp_16')})
Blank()
.height($r('app.float.margin_5'))
... ... @@ -85,7 +85,7 @@ export struct FeedBackActivity {
.fontSize($r('app.float.font_size_16'))
.fontWeight(FontWeight.Bold)
.width(CommonConstants.FULL_WIDTH)
.margin({ left: $r('app.float.vp_16'), top: $r('app.float.vp_12') })
.margin({ left: 24, top: $r('app.float.vp_12') })
Stack({ alignContent: Alignment.BottomEnd }) {
TextArea({ placeholder: $r('app.string.feedback_comments') })
.width(CommonConstants.FULL_WIDTH)
... ... @@ -165,7 +165,7 @@ export struct FeedBackActivity {
.margin({bottom: $r('app.float.vp_12'), right: $r('app.float.vp_11')})
}
.height(200)
.width('90%')
.width('94%')
.margin({ top: $r('app.float.vp_12') })
.backgroundColor($r('app.color.color_F5F5F5'))
.borderRadius(4)
... ... @@ -176,9 +176,8 @@ export struct FeedBackActivity {
Text($r('app.string.feedback_email'))
.fontColor($r('app.color.color_222222'))
.fontSize($r('app.float.font_size_14'))
.fontWeight(FontWeight.Bold)
.width('100%')
.margin({ left: $r('app.float.vp_16'), top: $r('app.float.margin_24') })
.width('94%')
.margin({ top: $r('app.float.margin_24') })
Row() {
Text($r('app.string.feedback_mail'))
.fontColor($r('app.color.color_222222'))
... ... @@ -187,6 +186,7 @@ export struct FeedBackActivity {
TextInput({ placeholder: $r('app.string.feedback_hideemail') })
.width(CommonConstants.FULL_WIDTH)
.height(CommonConstants.FULL_HEIGHT)
// .margin({left:15})
.backgroundColor($r('app.color.color_F5F5F5'))
.onChange((value) => {
// Logger.debug(TAG, "onChange" + value + "/" + this.passwordContent)
... ... @@ -194,7 +194,7 @@ export struct FeedBackActivity {
})
}
.height(44)
.width('90%')
.width('94%')
.backgroundColor($r('app.color.color_F5F5F5'))
.margin({top: $r('app.float.margin_16') })
.borderRadius(4)
... ...