陈剑华

Merge remote-tracking branch 'origin/main'

@@ -34,7 +34,7 @@ export struct ChildCommentComponent { @@ -34,7 +34,7 @@ export struct ChildCommentComponent {
34 .borderRadius(50) 34 .borderRadius(50)
35 }.width('89lpx') 35 }.width('89lpx')
36 .height('89lpx') 36 .height('89lpx')
37 - .margin({ right: '15lpx' }) 37 + .margin({ right: '3lpx' })
38 38
39 Column() { 39 Column() {
40 Text(this.data.fromUserName) 40 Text(this.data.fromUserName)
@@ -66,19 +66,19 @@ struct MineHomePage { @@ -66,19 +66,19 @@ struct MineHomePage {
66 Stack(){ 66 Stack(){
67 Image(this.headPhotoUrl) 67 Image(this.headPhotoUrl)
68 .alt($r('app.media.default_head')) 68 .alt($r('app.media.default_head'))
69 - .width('100lpx')  
70 - .height('100lpx') 69 + .width('115lpx')
  70 + .height('115lpx')
71 .objectFit(ImageFit.Auto) 71 .objectFit(ImageFit.Auto)
72 - .borderRadius(50) 72 + .clip(new Circle({ width: '115lpx', height: '115lpx' }))
73 Image(this.levelHead) 73 Image(this.levelHead)
74 - .width('130lpx')  
75 - .height('130lpx')  
76 - .objectFit(ImageFit.Cover) 74 + .width('165lpx')
  75 + .height('165lpx')
  76 + .objectFit(ImageFit.Auto)
77 }.onClick(()=>{ 77 }.onClick(()=>{
78 let params = {'headPhotoUrl': this.headPhotoUrl} as Record<string, string>; 78 let params = {'headPhotoUrl': this.headPhotoUrl} as Record<string, string>;
79 WDRouterRule.jumpWithPage(WDRouterPage.showUserHeaderPage,params) 79 WDRouterRule.jumpWithPage(WDRouterPage.showUserHeaderPage,params)
80 - }).width('135lpx')  
81 - .height('135lpx') 80 + }).width('165lpx')
  81 + .height('165lpx')
82 82
83 Column() { 83 Column() {
84 Row() { 84 Row() {
@@ -145,7 +145,7 @@ struct MineHomePage { @@ -145,7 +145,7 @@ struct MineHomePage {
145 }.margin({ left: '15lpx' }) 145 }.margin({ left: '15lpx' })
146 }.margin({ top: '23lpx' }) 146 }.margin({ top: '23lpx' })
147 }.alignItems(HorizontalAlign.Start) 147 }.alignItems(HorizontalAlign.Start)
148 - .margin({ left: '32lpx' }) 148 + .margin({ left: StringUtils.isEmpty(this.levelHead)?'32lpx':"3lpx" })
149 } 149 }
150 .onAreaChange((oldValue: Area, newValue: Area) => { 150 .onAreaChange((oldValue: Area, newValue: Area) => {
151 if (this.firstPositionY === 0) { 151 if (this.firstPositionY === 0) {
@@ -161,7 +161,9 @@ struct MineHomePage { @@ -161,7 +161,9 @@ struct MineHomePage {
161 .backgroundColor($r('app.color.color_transparent')) 161 .backgroundColor($r('app.color.color_transparent'))
162 .height('184lpx') 162 .height('184lpx')
163 .width('100%') 163 .width('100%')
164 - .padding({ left: '35lpx' }) 164 + .padding({ left: '6lpx' })
  165 +
  166 +
165 //用户简介区域 167 //用户简介区域
166 Column() { 168 Column() {
167 Row() { 169 Row() {
@@ -66,15 +66,14 @@ struct OtherNormalUserHomePage { @@ -66,15 +66,14 @@ struct OtherNormalUserHomePage {
66 Stack(){ 66 Stack(){
67 Image(this.headPhotoUrl) 67 Image(this.headPhotoUrl)
68 .alt($r('app.media.default_head')) 68 .alt($r('app.media.default_head'))
69 - .width('100lpx')  
70 - .height('100lpx') 69 + .width('115lpx')
  70 + .height('115lpx')
71 .objectFit(ImageFit.Cover) 71 .objectFit(ImageFit.Cover)
72 - .borderRadius(50) 72 + .clip(new Circle({ width: '115lpx', height: '115lpx' }))
73 Image(this.levelHead) 73 Image(this.levelHead)
74 - .width('130lpx')  
75 - .height('130lpx') 74 + .width('165lpx')
  75 + .height('165lpx')
76 .objectFit(ImageFit.Cover) 76 .objectFit(ImageFit.Cover)
77 - .borderRadius(50)  
78 } 77 }
79 78
80 Column() { 79 Column() {
@@ -134,7 +133,7 @@ struct OtherNormalUserHomePage { @@ -134,7 +133,7 @@ struct OtherNormalUserHomePage {
134 }.margin({ left: '15lpx' }) 133 }.margin({ left: '15lpx' })
135 }.margin({ top: '23lpx' }) 134 }.margin({ top: '23lpx' })
136 }.alignItems(HorizontalAlign.Start) 135 }.alignItems(HorizontalAlign.Start)
137 - .margin({ left: '32lpx' }) 136 + .margin({ left: StringUtils.isEmpty(this.levelHead)?'32lpx':"3lpx" })
138 } 137 }
139 .onAreaChange((oldValue: Area, newValue: Area) => { 138 .onAreaChange((oldValue: Area, newValue: Area) => {
140 if (this.firstPositionY === 0) { 139 if (this.firstPositionY === 0) {
@@ -150,7 +149,7 @@ struct OtherNormalUserHomePage { @@ -150,7 +149,7 @@ struct OtherNormalUserHomePage {
150 .backgroundColor($r('app.color.color_transparent')) 149 .backgroundColor($r('app.color.color_transparent'))
151 .height('184lpx') 150 .height('184lpx')
152 .width('100%') 151 .width('100%')
153 - .padding({ left: '35lpx' }) 152 + .padding({ left: '6lpx' })
154 153
155 //用户简介区域 154 //用户简介区域
156 if(StringUtils.isNotEmpty(this.desc)){ 155 if(StringUtils.isNotEmpty(this.desc)){