zhenghy

Merge remote-tracking branch 'origin/main'

... ... @@ -229,7 +229,7 @@ export struct EmptyComponent {
this.emptyType === WDViewDefaultType.WDViewDefaultType_NoHistory) {
imageString = $r('app.media.icon_no_collection')
} else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoMessage) {
imageString = $r('app.media.icon_no_message')
imageString = $r('app.media.icon_no_message1')
} else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoComment ||
this.emptyType === WDViewDefaultType.WDViewDefaultType_NoComment1) {
imageString = $r('app.media.icon_no_comment1')
... ...
... ... @@ -44,7 +44,7 @@ export default struct CustomDialogComponent {
.fontSize(14)
.fontColor($r('app.color.dialog_private_text_color'))
}
.width('90%')
.width('90%').lineHeight(22)
Row(){
// Button(){
... ... @@ -135,6 +135,12 @@ export default struct CustomDialogComponent {
.width('90%')
.fontColor($r('app.color.dialog_text_color'))
.fontSize(14).margin({top:20})
Divider()
.color('#f5f5f5')
.width('100%')
.strokeWidth(1)
.padding({left:16,right:16,top:22})
Row() {
Text($r('app.string.dialog_button_disagree'))
.fancy()
... ... @@ -154,7 +160,7 @@ export default struct CustomDialogComponent {
})
}
.margin({ bottom: '21lpx',top:'42lpx' })
.margin({ bottom: '21lpx',top:'22lpx' })
}
.width('528lpx')
... ...