陈剑华

Merge remote-tracking branch 'origin/main'

... ... @@ -34,7 +34,7 @@ export struct ChildCommentComponent {
.borderRadius(50)
}.width('89lpx')
.height('89lpx')
.margin({ right: '15lpx' })
.margin({ right: '3lpx' })
Column() {
Text(this.data.fromUserName)
... ...
... ... @@ -66,19 +66,19 @@ struct MineHomePage {
Stack(){
Image(this.headPhotoUrl)
.alt($r('app.media.default_head'))
.width('100lpx')
.height('100lpx')
.width('115lpx')
.height('115lpx')
.objectFit(ImageFit.Auto)
.borderRadius(50)
.clip(new Circle({ width: '115lpx', height: '115lpx' }))
Image(this.levelHead)
.width('130lpx')
.height('130lpx')
.objectFit(ImageFit.Cover)
.width('165lpx')
.height('165lpx')
.objectFit(ImageFit.Auto)
}.onClick(()=>{
let params = {'headPhotoUrl': this.headPhotoUrl} as Record<string, string>;
WDRouterRule.jumpWithPage(WDRouterPage.showUserHeaderPage,params)
}).width('135lpx')
.height('135lpx')
}).width('165lpx')
.height('165lpx')
Column() {
Row() {
... ... @@ -145,7 +145,7 @@ struct MineHomePage {
}.margin({ left: '15lpx' })
}.margin({ top: '23lpx' })
}.alignItems(HorizontalAlign.Start)
.margin({ left: '32lpx' })
.margin({ left: StringUtils.isEmpty(this.levelHead)?'32lpx':"3lpx" })
}
.onAreaChange((oldValue: Area, newValue: Area) => {
if (this.firstPositionY === 0) {
... ... @@ -161,7 +161,9 @@ struct MineHomePage {
.backgroundColor($r('app.color.color_transparent'))
.height('184lpx')
.width('100%')
.padding({ left: '35lpx' })
.padding({ left: '6lpx' })
//用户简介区域
Column() {
Row() {
... ...
... ... @@ -66,15 +66,14 @@ struct OtherNormalUserHomePage {
Stack(){
Image(this.headPhotoUrl)
.alt($r('app.media.default_head'))
.width('100lpx')
.height('100lpx')
.width('115lpx')
.height('115lpx')
.objectFit(ImageFit.Cover)
.borderRadius(50)
.clip(new Circle({ width: '115lpx', height: '115lpx' }))
Image(this.levelHead)
.width('130lpx')
.height('130lpx')
.width('165lpx')
.height('165lpx')
.objectFit(ImageFit.Cover)
.borderRadius(50)
}
Column() {
... ... @@ -134,7 +133,7 @@ struct OtherNormalUserHomePage {
}.margin({ left: '15lpx' })
}.margin({ top: '23lpx' })
}.alignItems(HorizontalAlign.Start)
.margin({ left: '32lpx' })
.margin({ left: StringUtils.isEmpty(this.levelHead)?'32lpx':"3lpx" })
}
.onAreaChange((oldValue: Area, newValue: Area) => {
if (this.firstPositionY === 0) {
... ... @@ -150,7 +149,7 @@ struct OtherNormalUserHomePage {
.backgroundColor($r('app.color.color_transparent'))
.height('184lpx')
.width('100%')
.padding({ left: '35lpx' })
.padding({ left: '6lpx' })
//用户简介区域
if(StringUtils.isNotEmpty(this.desc)){
... ...