Toggle navigation
Toggle navigation
This project
Loading...
Sign in
developOne
/
harmonyPool
Go to a project
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
张善主
2024-05-29 16:12:10 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
238c896689274b7161b53166e2abe922ec864fe9
238c8966
1 parent
b4c7be73
fix(17811): UI还原问题-【uat】意见反馈-电话和邮箱显示和android不一致,看图
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
59 additions
and
18 deletions
sight_harmony/AppScope/resources/base/element/float.json
sight_harmony/features/wdComponent/src/main/ets/components/FeedBackActivity.ets
sight_harmony/features/wdComponent/src/main/ets/components/reusable/CustomTitleUI.ets
sight_harmony/features/wdComponent/src/main/resources/base/element/float.json
sight_harmony/AppScope/resources/base/element/float.json
View file @
238c896
...
...
@@ -29,6 +29,14 @@
"value"
:
"14fp"
},
{
"name"
:
"font_size_14_5"
,
"value"
:
"14.5fp"
},
{
"name"
:
"font_size_15"
,
"value"
:
"15fp"
},
{
"name"
:
"font_size_16"
,
"value"
:
"16fp"
},
...
...
sight_harmony/features/wdComponent/src/main/ets/components/FeedBackActivity.ets
View file @
238c896
...
...
@@ -49,10 +49,15 @@ export struct FeedBackActivity {
Column() {
Text($r('app.string.feedback_opinion_type'))
.fontColor($r('app.color.color_222222'))
.fontSize($r('app.float.font_size_16'))
.fontWeight(FontWeight.Bold)
.fontSize($r('app.float.font_size_14_5'))
.fontWeight(600)
.width('100%')
.margin({ left: 24, top: $r('app.float.vp_14') })
Blank()
.height(0.5)
.width('94%')
.margin({ top: $r('app.float.vp_12') })
.backgroundColor($r('app.color.color_EDEDED'))
GridRow({
columns:3,
}) {
...
...
@@ -89,8 +94,8 @@ export struct FeedBackActivity {
.backgroundColor($r('app.color.color_F5F5F5'))
Text($r('app.string.feedback_opinion_tv'))
.fontColor($r('app.color.color_222222'))
.fontSize($r('app.float.font_size_16'))
.fontWeight(FontWeight.Bold)
.fontSize($r('app.float.font_size_14_5'))
.fontWeight(600)
.width(CommonConstants.FULL_WIDTH)
.margin({ left: 24, top: $r('app.float.vp_12') })
Stack({ alignContent: Alignment.BottomEnd }) {
...
...
@@ -191,26 +196,46 @@ export struct FeedBackActivity {
.fontSize($r('app.float.font_size_13_2'))
.width('94%')
.margin({ top: $r('app.float.margin_24') })
Row() {
Blank().width('3%')
Text($r('app.string.feedback_mail'))
.height(CommonConstants.FULL_HEIGHT)
.fontColor($r('app.color.color_222222'))
.fontSize($r('app.float.font_size_14'))
.fontWeight(FontWeight.Bold)
.fontSize($r('app.float.font_size_13_2'))
.fontWeight(600)
.padding({left: $r('app.float.margin_12') })
.backgroundColor($r('app.color.color_F5F5F5'))
.borderRadius({
topLeft: 4,
topRight: 0,
bottomLeft: 4,
bottomRight: 0,
})
TextInput({ placeholder: $r('app.string.feedback_hideemail') })
.width(CommonConstants.FULL_WIDTH)
.width(0)
.layoutWeight(1)
.height(CommonConstants.FULL_HEIGHT)
// .margin({left:15})
.fontColor($r('app.color.color_222222'))
.fontSize($r('app.float.font_size_13_2'))
.placeholderColor($r('app.color.color_CCCCCC'))
.placeholderFont({size:$r('app.float.font_size_13_2')})
.backgroundColor($r('app.color.color_F5F5F5'))
.borderRadius({
topLeft: 0,
topRight: 4,
bottomLeft: 0,
bottomRight: 4,
})
.onChange((value) => {
// Logger.debug(TAG, "onChange" + value + "/" + this.passwordContent)
this.email = value
})
Blank().width('3%')
}
.height(44)
.width('94%')
.backgroundColor($r('app.color.color_F5F5F5'))
.margin({top: $r('app.float.margin_16') })
.borderRadius(4)
.height(42)
.width(CommonConstants.FULL_WIDTH)
.margin({top: $r('app.float.margin_16')})
Blank().layoutWeight(1)
}
}
...
...
@@ -222,8 +247,8 @@ export struct FeedBackActivity {
Column(){
Text($r('app.string.submit'))
.textAlign(TextAlign.Center)
.height(44)
.width('90%')
.height(42)
.width('94%')
.fontColor(this.canSubmit ? $r('app.color.color_fff') : $r('app.color.color_FFFFFF_40'))
.fontSize($r('app.float.font_size_18'))
.backgroundColor(this.canSubmit ? $r('app.color.color_ED2800') : $r('app.color.color_ED2800_99'))
...
...
sight_harmony/features/wdComponent/src/main/ets/components/reusable/CustomTitleUI.ets
View file @
238c896
...
...
@@ -28,10 +28,10 @@ export struct CustomTitleUI {
Text(this.titleName)
.maxLines(1)
.id("title")
.fontSize('3
5
lpx')
.fontSize('3
0
lpx')
.fontWeight(400)
.fontColor($r('app.color.color_222222'))
.lineHeight('4
2
lpx')
.lineHeight('4
3
lpx')
.alignRules({
center: {anchor: "__container__", align: VerticalAlign.Center},
middle: {anchor: "__container__", align: HorizontalAlign.Center}
...
...
sight_harmony/features/wdComponent/src/main/resources/base/element/float.json
View file @
238c896
...
...
@@ -29,6 +29,14 @@
"value"
:
"14fp"
},
{
"name"
:
"font_size_14_5"
,
"value"
:
"14.5fp"
},
{
"name"
:
"font_size_15"
,
"value"
:
"15fp"
},
{
"name"
:
"font_size_16"
,
"value"
:
"16fp"
},
...
...
Please
register
or
login
to post a comment