developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
王士厅
77ab3392 1 parent 8f7ba18d

fix: '我的'个人信息ui修改，更新版本号7.3.9.6

Inline Side-by-side
Showing 7 changed files with 211 additions and 420 deletions
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 "app": { 2 "app": {
3 "bundleName": "com.peopledailychina.hosactivity", 3 "bundleName": "com.peopledailychina.hosactivity",
4 "vendor": "$string:app_vendor", 4 "vendor": "$string:app_vendor",
5 - "versionCode": 7395,  
6 - "versionName": "7.3.9.5", 5 + "versionCode": 7396,
  6 + "versionName": "7.3.9.6",
7 "icon": "$media:app_icon", 7 "icon": "$media:app_icon",
8 "label": "$string:app_name" 8 "label": "$string:app_name"
9 } 9 }
@@ -31,62 +31,44 @@ export struct FollowChildComponent{ @@ -31,62 +31,44 @@ export struct FollowChildComponent{
31 Stack({alignContent: Alignment.Bottom}){ 31 Stack({alignContent: Alignment.Bottom}){
32 Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.icon_default_head_mater'):this.data.headPhotoUrl) 32 Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.icon_default_head_mater'):this.data.headPhotoUrl)
33 .objectFit(ImageFit.Auto) 33 .objectFit(ImageFit.Auto)
34 - // .width('92lpx')  
35 - .width(92)  
36 - // .height('92lpx')  
37 - .height(92) 34 + .width(48)
  35 + .height(48)
38 .borderRadius(50) 36 .borderRadius(50)
39 - // .borderWidth('1lpx')  
40 .borderWidth(1) 37 .borderWidth(1)
41 .borderColor($r('app.color.color_0D000000')) 38 .borderColor($r('app.color.color_0D000000'))
42 Row(){ 39 Row(){
43 Image(this.data.authIcon) 40 Image(this.data.authIcon)
44 - // .width('32lpx')  
45 - .width(32)  
46 - // .height('32lpx')  
47 - .height(32) 41 + .width(16.89)
  42 + .height(16.89)
48 .objectFit(ImageFit.Cover) 43 .objectFit(ImageFit.Cover)
49 } 44 }
50 - // .width('92lpx')  
51 - .width(92) 45 + .width(48)
52 .justifyContent(FlexAlign.End) 46 .justifyContent(FlexAlign.End)
53 } 47 }
54 - // .width('92lpx')  
55 - .width(92)  
56 - // .height('92lpx')  
57 - .height(92)  
58 - // .margin({right:'15lpx'})  
59 - .margin({right: 15}) 48 + .width(48)
  49 + .height(48)
  50 + .margin({right: 11})
60 51
61 52
62 Column(){ 53 Column(){
63 Text(this.data.cnUserName) 54 Text(this.data.cnUserName)
64 - // .fontWeight('400lpx')  
65 .fontWeight(400) 55 .fontWeight(400)
66 - // .fontSize('31lpx')  
67 - .fontSize(31)  
68 - // .lineHeight('38lpx')  
69 - .lineHeight(38) 56 + .fontSize(18)
  57 + .lineHeight(22)
70 .fontColor($r('app.color.color_222222')) 58 .fontColor($r('app.color.color_222222'))
71 .maxLines(1) 59 .maxLines(1)
72 - // .margin({bottom:'8lpx'})  
73 - .margin({bottom: 8}) 60 + .margin({bottom: 2})
74 61
75 Text(`粉丝${this.data.cnFansNum}`) 62 Text(`粉丝${this.data.cnFansNum}`)
76 .fontColor($r('app.color.color_B0B0B0')) 63 .fontColor($r('app.color.color_B0B0B0'))
77 - // .fontSize('23lpx')  
78 - .fontSize(23)  
79 - // .fontWeight('400lpx') 64 + .fontSize(12)
80 .fontWeight(400) 65 .fontWeight(400)
81 - // .lineHeight('31lpx')  
82 - .lineHeight(31)  
83 - // .margin({bottom:'8lpx'})  
84 - .margin({bottom: 8}) 66 + .lineHeight(16)
85 67
86 Text(`${this.data.introduction}`) 68 Text(`${this.data.introduction}`)
87 .fontColor($r('app.color.color_B0B0B0')) 69 .fontColor($r('app.color.color_B0B0B0'))
88 - // .fontSize('23lpx')  
89 - .fontSize(23) 70 + .fontSize(12)
  71 + .lineHeight(16)
90 .maxLines(2) 72 .maxLines(2)
91 .textAlign(TextAlign.Start) 73 .textAlign(TextAlign.Start)
92 .textOverflow({ overflow: TextOverflow.Ellipsis }) 74 .textOverflow({ overflow: TextOverflow.Ellipsis })
@@ -110,30 +92,23 @@ export struct FollowChildComponent{ @@ -110,30 +92,23 @@ export struct FollowChildComponent{
110 }else { 92 }else {
111 Text(`已关注`) 93 Text(`已关注`)
112 .fontColor($r('app.color.color_CCCCCC')) 94 .fontColor($r('app.color.color_CCCCCC'))
113 - // .fontSize('23lpx')  
114 - .fontSize(23)  
115 - // .fontWeight('500lpx') 95 + .fontSize(12)
116 .fontWeight(500) 96 .fontWeight(500)
117 - // .lineHeight('35lpx')  
118 - .lineHeight(35) 97 + .lineHeight(18)
119 } 98 }
120 } 99 }
121 .justifyContent(FlexAlign.Center) 100 .justifyContent(FlexAlign.Center)
122 - // .width('100lpx')  
123 - .width(100) 101 + .width(52)
124 .backgroundColor($r("app.color.color_F5F5F5")) 102 .backgroundColor($r("app.color.color_F5F5F5"))
125 - // .borderRadius("6lpx")  
126 - .borderRadius(6)  
127 - // .height('46lpx')  
128 - .height(46) 103 + .borderRadius(3)
  104 + .height(24)
129 .onClick(()=>{ 105 .onClick(()=>{
130 if (this.isLoadingAttention) return 106 if (this.isLoadingAttention) return
131 this.isLoadingAttention = true 107 this.isLoadingAttention = true
132 108
133 this.followOperation() 109 this.followOperation()
134 }) 110 })
135 - // .margin({top:'29lpx'})  
136 - .margin({top: 29}) 111 + .margin({top: 26})
137 }else{ 112 }else{
138 Row(){ 113 Row(){
139 if(this.isLoadingAttention) { 114 if(this.isLoadingAttention) {
@@ -141,36 +116,25 @@ export struct FollowChildComponent{ @@ -141,36 +116,25 @@ export struct FollowChildComponent{
141 .width(20) 116 .width(20)
142 .height(20) 117 .height(20)
143 .color($r('app.color.main_red')) 118 .color($r('app.color.main_red'))
144 - }else { 119 + } else {
145 Image($r('app.media.follow_icon')) 120 Image($r('app.media.follow_icon'))
146 - // .margin({right:'4lpx'})  
147 - .margin({right: 4})  
148 - // .width('23lpx')  
149 - .width(23)  
150 - // .height('23lpx')  
151 - .height(23) 121 + .margin({right: 2})
  122 + .width(12)
  123 + .height(12)
152 Text(`关注`) 124 Text(`关注`)
153 .fontColor($r('app.color.color_ED2800')) 125 .fontColor($r('app.color.color_ED2800'))
154 - // .fontSize('23lpx')  
155 - .fontSize(23)  
156 - // .fontWeight('500lpx') 126 + .fontSize(12)
157 .fontWeight(500) 127 .fontWeight(500)
158 - // .lineHeight('35lpx')  
159 - .lineHeight(35) 128 + .lineHeight(18)
160 } 129 }
161 130
162 }.borderColor($r('app.color.color_1AED2800')) 131 }.borderColor($r('app.color.color_1AED2800'))
163 - // .borderRadius('6lpx')  
164 - .borderRadius(6)  
165 - // .borderWidth('2lpx')  
166 - .borderWidth(2) 132 + .borderRadius(3)
  133 + .borderWidth(1)
167 .justifyContent(FlexAlign.Center) 134 .justifyContent(FlexAlign.Center)
168 - // .width('100lpx')  
169 - .width(100)  
170 - // .height('46lpx')  
171 - .height(46)  
172 - // .margin({top:'29lpx'})  
173 - .margin({top: 29}) 135 + .width(52)
  136 + .height(24)
  137 + .margin({top: 26})
174 .onClick(()=>{ 138 .onClick(()=>{
175 if (this.isLoadingAttention) return 139 if (this.isLoadingAttention) return
176 this.isLoadingAttention = true 140 this.isLoadingAttention = true
@@ -179,23 +143,19 @@ export struct FollowChildComponent{ @@ -179,23 +143,19 @@ export struct FollowChildComponent{
179 }) 143 })
180 } 144 }
181 } 145 }
182 - // .padding({top:'27lpx'})  
183 - .padding({top: 27}) 146 + .padding({top: 14})
184 .width('100%') 147 .width('100%')
185 .justifyContent(FlexAlign.SpaceBetween) 148 .justifyContent(FlexAlign.SpaceBetween)
186 .alignItems(VerticalAlign.Top) 149 .alignItems(VerticalAlign.Top)
187 150
188 } 151 }
189 - // .height(`${this.columnHeight}lpx`)  
190 .height(`${this.columnHeight}`) 152 .height(`${this.columnHeight}`)
191 .justifyContent(FlexAlign.Start) 153 .justifyContent(FlexAlign.Start)
192 154
193 Divider() 155 Divider()
194 .width('100%') 156 .width('100%')
195 - // .height('2lpx')  
196 - .height(2) 157 + .height(1)
197 .color($r('app.color.color_F5F5F5')) 158 .color($r('app.color.color_F5F5F5'))
198 - // .strokeWidth('1lpx')  
199 .strokeWidth(1) 159 .strokeWidth(1)
200 }.width('100%') 160 }.width('100%')
201 161
@@ -208,65 +168,51 @@ export struct FollowChildComponent{ @@ -208,65 +168,51 @@ export struct FollowChildComponent{
208 Stack({alignContent: Alignment.Bottom}){ 168 Stack({alignContent: Alignment.Bottom}){
209 Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.icon_default_head_mater'):this.data.headPhotoUrl) 169 Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.icon_default_head_mater'):this.data.headPhotoUrl)
210 .objectFit(ImageFit.Auto) 170 .objectFit(ImageFit.Auto)
211 - // .width('92lpx')  
212 - .width(92)  
213 - // .height('92lpx')  
214 - .height(92) 171 + .width(48)
  172 + .height(48)
215 .borderRadius(50) 173 .borderRadius(50)
216 - // .borderWidth('1lpx')  
217 .borderWidth(1) 174 .borderWidth(1)
218 .borderColor($r('app.color.color_0D000000')) 175 .borderColor($r('app.color.color_0D000000'))
219 Row(){ 176 Row(){
220 Image(this.data.authIcon) 177 Image(this.data.authIcon)
221 - // .width('32lpx')  
222 - .width(32)  
223 - // .height('32lpx')  
224 - .height(32) 178 + .width(16.89)
  179 + .height(16.89)
225 .objectFit(ImageFit.Cover) 180 .objectFit(ImageFit.Cover)
226 } 181 }
227 - // .width('92lpx')  
228 - .width(92) 182 + .width(48)
229 .justifyContent(FlexAlign.End) 183 .justifyContent(FlexAlign.End)
230 } 184 }
231 - // .width('92lpx')  
232 - .width(92)  
233 - // .height('92lpx')  
234 - .height(92)  
235 - // .margin({right:'15lpx'})  
236 - .margin({right: 15}) 185 + .width(48)
  186 + .height(48)
  187 + .margin({right: 11})
237 188
238 Column(){ 189 Column(){
239 Text(this.data.cnUserName) 190 Text(this.data.cnUserName)
240 - // .fontWeight('400lpx')  
241 .fontWeight(400) 191 .fontWeight(400)
242 - // .fontSize('31lpx')  
243 - .fontSize(31)  
244 - // .lineHeight('38lpx')  
245 - .lineHeight(38) 192 + .fontSize(18)
  193 + .lineHeight(22)
246 .fontColor($r('app.color.color_222222')) 194 .fontColor($r('app.color.color_222222'))
247 .maxLines(1) 195 .maxLines(1)
248 - // .margin({bottom:'12lpx'})  
249 - .margin({bottom: 12}) 196 + .margin({bottom: 2})
250 Row(){ 197 Row(){
251 if(this.data.cnFansNum!="0"){ 198 if(this.data.cnFansNum!="0"){
252 Text(`粉丝${this.data.cnFansNum}`) 199 Text(`粉丝${this.data.cnFansNum}`)
253 .fontColor($r('app.color.color_B0B0B0')) 200 .fontColor($r('app.color.color_B0B0B0'))
254 - // .fontSize('23lpx')  
255 - .fontSize(23) 201 + .fontSize(12)
  202 + .fontWeight(400)
  203 + .lineHeight(16)
256 } 204 }
257 if(this.data.cnFansNum!="0" && StringUtils.isNotEmpty(this.data.introduction)){ 205 if(this.data.cnFansNum!="0" && StringUtils.isNotEmpty(this.data.introduction)){
258 Image($r("app.media.point")) 206 Image($r("app.media.point"))
259 - // .width('31lpx')  
260 - .width(31)  
261 - // .height('31lpx')  
262 - .height(31) 207 + .width(16)
  208 + .height(16)
263 .objectFit(ImageFit.Auto) 209 .objectFit(ImageFit.Auto)
264 } 210 }
265 211
266 Text(`${this.data.introduction}`) 212 Text(`${this.data.introduction}`)
267 .fontColor($r('app.color.color_B0B0B0')) 213 .fontColor($r('app.color.color_B0B0B0'))
268 - // .fontSize('23lpx')  
269 - .fontSize(23) 214 + .fontSize(12)
  215 + .lineHeight(16)
270 .layoutWeight(1) 216 .layoutWeight(1)
271 .maxLines(1) 217 .maxLines(1)
272 .textOverflow({ overflow: TextOverflow.Ellipsis }) 218 .textOverflow({ overflow: TextOverflow.Ellipsis })
@@ -292,22 +238,16 @@ export struct FollowChildComponent{ @@ -292,22 +238,16 @@ export struct FollowChildComponent{
292 }else { 238 }else {
293 Text(`已关注`) 239 Text(`已关注`)
294 .fontColor($r('app.color.color_CCCCCC')) 240 .fontColor($r('app.color.color_CCCCCC'))
295 - // .fontSize('23lpx')  
296 - .fontSize(23)  
297 - // .fontWeight('500lpx') 241 + .fontSize(12)
298 .fontWeight(500) 242 .fontWeight(500)
299 - // .lineHeight('35lpx')  
300 - .lineHeight(35) 243 + .lineHeight(18)
301 } 244 }
302 } 245 }
303 .backgroundColor($r("app.color.color_F5F5F5")) 246 .backgroundColor($r("app.color.color_F5F5F5"))
304 .justifyContent(FlexAlign.Center) 247 .justifyContent(FlexAlign.Center)
305 - // .borderRadius("6lpx")  
306 - .borderRadius(6)  
307 - // .width('100lpx')  
308 - .width(100)  
309 - // .height('46lpx')  
310 - .height(46) 248 + .borderRadius(3)
  249 + .width(52)
  250 + .height(24)
311 .onClick(()=>{ 251 .onClick(()=>{
312 if (this.isLoadingAttention) return 252 if (this.isLoadingAttention) return
313 this.isLoadingAttention = true 253 this.isLoadingAttention = true
@@ -323,31 +263,21 @@ export struct FollowChildComponent{ @@ -323,31 +263,21 @@ export struct FollowChildComponent{
323 .color($r('app.color.main_red')) 263 .color($r('app.color.main_red'))
324 }else { 264 }else {
325 Image($r('app.media.follow_icon')) 265 Image($r('app.media.follow_icon'))
326 - // .margin({right:'4lpx'})  
327 - .margin({right: 4})  
328 - // .width('23lpx')  
329 - .width(23)  
330 - // .height('23lpx')  
331 - .height(23) 266 + .margin({right: 2})
  267 + .width(12)
  268 + .height(12)
332 Text(`关注`) 269 Text(`关注`)
333 .fontColor($r('app.color.color_ED2800')) 270 .fontColor($r('app.color.color_ED2800'))
334 - // .fontSize('23lpx')  
335 - .fontSize(23)  
336 - // .fontWeight('500lpx') 271 + .fontSize(12)
337 .fontWeight(500) 272 .fontWeight(500)
338 - // .lineHeight('35lpx')  
339 - .lineHeight(35) 273 + .lineHeight(18)
340 } 274 }
341 }.borderColor($r('app.color.color_1AED2800')) 275 }.borderColor($r('app.color.color_1AED2800'))
342 - // .borderRadius('6lpx')  
343 - .borderRadius(6)  
344 - // .borderWidth('2lpx')  
345 - .borderWidth(2) 276 + .borderRadius(3)
  277 + .borderWidth(1)
346 .justifyContent(FlexAlign.Center) 278 .justifyContent(FlexAlign.Center)
347 - // .width('100lpx')  
348 - .width(100)  
349 - // .height('46lpx')  
350 - .height(46) 279 + .width(52)
  280 + .height(24)
351 .onClick(()=>{ 281 .onClick(()=>{
352 if (this.isLoadingAttention) return 282 if (this.isLoadingAttention) return
353 this.isLoadingAttention = true 283 this.isLoadingAttention = true
@@ -358,21 +288,16 @@ export struct FollowChildComponent{ @@ -358,21 +288,16 @@ export struct FollowChildComponent{
358 } 288 }
359 } 289 }
360 .width('100%') 290 .width('100%')
361 - // .height('92lpx')  
362 - .height(92)  
363 .justifyContent(FlexAlign.SpaceBetween) 291 .justifyContent(FlexAlign.SpaceBetween)
364 292
365 } 293 }
366 - // .height('146lpx')  
367 - .height(146) 294 + .height(76)
368 .justifyContent(FlexAlign.Center) 295 .justifyContent(FlexAlign.Center)
369 296
370 Divider() 297 Divider()
371 .width('100%') 298 .width('100%')
372 - // .height('2lpx')  
373 - .height(2) 299 + .height(1)
374 .color($r('app.color.color_F5F5F5')) 300 .color($r('app.color.color_F5F5F5'))
375 - // .strokeWidth('1lpx')  
376 .strokeWidth(1) 301 .strokeWidth(1)
377 }.width('100%') 302 }.width('100%')
378 303
@@ -24,45 +24,31 @@ export struct ChildCommentComponent { @@ -24,45 +24,31 @@ export struct ChildCommentComponent {
24 Image(this.data.fromUserHeader&&this.data.fromUserHeader.length>0?this.data.fromUserHeader:(this.data.fromUserType === 1?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon'))) 24 Image(this.data.fromUserHeader&&this.data.fromUserHeader.length>0?this.data.fromUserHeader:(this.data.fromUserType === 1?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon')))
25 .alt($r('app.media.default_head')) 25 .alt($r('app.media.default_head'))
26 .objectFit(ImageFit.Auto) 26 .objectFit(ImageFit.Auto)
27 - // .width('69lpx')  
28 - .width(69)  
29 - // .height('69lpx')  
30 - .height(69) 27 + .width(35.47)
  28 + .height(35.47)
31 .borderRadius(50) 29 .borderRadius(50)
32 Image(this.levelHead) 30 Image(this.levelHead)
33 - // .width('89lpx')  
34 - .width(89)  
35 - // .height('89lpx')  
36 - .height(89) 31 + .width(54)
  32 + .height(54)
37 .objectFit(ImageFit.Cover) 33 .objectFit(ImageFit.Cover)
38 .borderRadius(50) 34 .borderRadius(50)
39 } 35 }
40 - // .width('89lpx')  
41 - .width(89)  
42 - // .height('89lpx')  
43 - .height(89)  
44 - // .margin({ right: '3lpx' })  
45 - .margin({ right: 3 }) 36 + .width(54)
  37 + .height(54)
  38 + .margin({ right: 5 })
46 39
47 Column() { 40 Column() {
48 Text(this.data.fromUserName) 41 Text(this.data.fromUserName)
49 - // .fontSize('25lpx')  
50 - .fontSize(25)  
51 - // .lineHeight('35lpx')  
52 - .lineHeight(35)  
53 - // .fontWeight('600lpx') 42 + .fontSize(15)
  43 + .lineHeight(21)
54 .fontWeight(600) 44 .fontWeight(600)
55 .fontColor($r('app.color.color_222222')) 45 .fontColor($r('app.color.color_222222'))
56 - // .margin({ bottom: '6lpx' })  
57 - .margin({ bottom: 6 }) 46 + .margin({ bottom: 1 })
58 .maxLines(1) 47 .maxLines(1)
59 Text(`${this.data.createTime}`) 48 Text(`${this.data.createTime}`)
60 .fontColor($r('app.color.color_B0B0B0')) 49 .fontColor($r('app.color.color_B0B0B0'))
61 - // .fontSize('23lpx')  
62 - .fontSize(23)  
63 - // .lineHeight('31lpx')  
64 - .lineHeight(31)  
65 - // .fontWeight('400lpx') 50 + .fontSize(12)
  51 + .lineHeight(16)
66 .fontWeight(400) 52 .fontWeight(400)
67 .maxLines(1) 53 .maxLines(1)
68 }.layoutWeight(1) 54 }.layoutWeight(1)
@@ -72,21 +58,15 @@ export struct ChildCommentComponent { @@ -72,21 +58,15 @@ export struct ChildCommentComponent {
72 if (this.data.checkStatus != 3) { 58 if (this.data.checkStatus != 3) {
73 Row() { 59 Row() {
74 Text(this.data.likeNum.toString()) 60 Text(this.data.likeNum.toString())
75 - // .fontWeight("500lpx")  
76 .fontWeight(500) 61 .fontWeight(500)
77 - // .fontSize("27lpx")  
78 - .fontSize(27)  
79 - // .lineHeight("31lpx")  
80 - .lineHeight(31) 62 + .fontSize(14)
  63 + .lineHeight(16)
81 .fontColor(this.data.like_status === 0 ? $r('app.color.color_666666') : $r('app.color.color_ED2800')) 64 .fontColor(this.data.like_status === 0 ? $r('app.color.color_666666') : $r('app.color.color_ED2800'))
82 - // .margin({ right: '8lpx' })  
83 - .margin({ right: 8 }) 65 + .margin({ right: 4 })
84 .visibility(this.data.likeNum <= 0||StringUtils.isEmpty(this.data.likeNum.toString()) ? Visibility.Hidden : Visibility.Visible) 66 .visibility(this.data.likeNum <= 0||StringUtils.isEmpty(this.data.likeNum.toString()) ? Visibility.Hidden : Visibility.Visible)
85 Image(this.data.like_status === 0 ? $r('app.media.like_default_status') : $r('app.media.liked_status')) 67 Image(this.data.like_status === 0 ? $r('app.media.like_default_status') : $r('app.media.liked_status'))
86 - // .width('31lpx')  
87 - .width(31)  
88 - // .height('31lpx')  
89 - .height(31) 68 + .width(16)
  69 + .height(16)
90 .objectFit(ImageFit.Auto) 70 .objectFit(ImageFit.Auto)
91 .interpolation(ImageInterpolation.Medium) 71 .interpolation(ImageInterpolation.Medium)
92 .borderRadius(50) 72 .borderRadius(50)
@@ -95,13 +75,10 @@ export struct ChildCommentComponent { @@ -95,13 +75,10 @@ export struct ChildCommentComponent {
95 }) 75 })
96 } 76 }
97 } 77 }
98 - // .margin({ bottom: '5lpx' })  
99 .margin({ bottom: 5 }) 78 .margin({ bottom: 5 })
100 .width('100%') 79 .width('100%')
101 - // .height('108lpx')  
102 - .height(108)  
103 - // .padding({ left: '31lpx', right: '31lpx' })  
104 - .padding({ left: 31, right: 31 }) 80 + .height(56)
  81 + .padding({ left: 11, right: 15 })
105 82
106 Row() { 83 Row() {
107 if (this.isExpand) { 84 if (this.isExpand) {
@@ -124,11 +101,11 @@ export struct ChildCommentComponent { @@ -124,11 +101,11 @@ export struct ChildCommentComponent {
124 .textStyle() 101 .textStyle()
125 } 102 }
126 } 103 }
127 - // .padding({ left: '31lpx', right: '31lpx' })  
128 - .padding({ left: 31, right: 31 }) 104 + .padding({ left: 15, right: 15 })
129 .width('100%') 105 .width('100%')
130 106
131 Column() { 107 Column() {
  108 + Column(){
132 if (StringUtils.isNotEmpty(this.data.parentCommentContent)) { 109 if (StringUtils.isNotEmpty(this.data.parentCommentContent)) {
133 //父评论 110 //父评论
134 Row() { 111 Row() {
@@ -136,20 +113,14 @@ export struct ChildCommentComponent { @@ -136,20 +113,14 @@ export struct ChildCommentComponent {
136 Text() { 113 Text() {
137 Span(`@${this.data.parentCommentUserName}：`) 114 Span(`@${this.data.parentCommentUserName}：`)
138 .fontColor($r('app.color.color_000000')) 115 .fontColor($r('app.color.color_000000'))
139 - // .fontWeight('500lpx')  
140 .fontWeight(500) 116 .fontWeight(500)
141 - // .fontSize('27lpx')  
142 - .fontSize(27)  
143 - // .lineHeight('40lpx')  
144 - .lineHeight(40) 117 + .fontSize(14)
  118 + .lineHeight(21)
145 Span(this.data.parentCommentContent) 119 Span(this.data.parentCommentContent)
146 .fontColor($r('app.color.color_000000')) 120 .fontColor($r('app.color.color_000000'))
147 - // .fontWeight('400lpx')  
148 .fontWeight(400) 121 .fontWeight(400)
149 - // .fontSize('27lpx')  
150 - .fontSize(27)  
151 - // .lineHeight('40lpx')  
152 - .lineHeight(40) 122 + .fontSize(14)
  123 + .lineHeight(21)
153 } 124 }
154 .width('100%') 125 .width('100%')
155 .textAlign(TextAlign.Start) 126 .textAlign(TextAlign.Start)
@@ -157,24 +128,21 @@ export struct ChildCommentComponent { @@ -157,24 +128,21 @@ export struct ChildCommentComponent {
157 Text() { 128 Text() {
158 Span(`@${this.data.parentCommentUserName}：`) 129 Span(`@${this.data.parentCommentUserName}：`)
159 .fontColor($r('app.color.color_000000')) 130 .fontColor($r('app.color.color_000000'))
160 - // .fontWeight('500lpx')  
161 - .fontWeight(500)  
162 - // .fontSize('27lpx')  
163 - .fontSize(27)  
164 - // .lineHeight('40lpx')  
165 - .lineHeight(40) 131 + .fontWeight(400)
  132 + .fontSize(14)
  133 + .lineHeight(21)
166 134
167 Span(this.clipText(this.data.parentCommentContent, 31, 5, 630, 1)) 135 Span(this.clipText(this.data.parentCommentContent, 31, 5, 630, 1))
168 .fontColor($r('app.color.color_000000')) 136 .fontColor($r('app.color.color_000000'))
169 - // .fontWeight('400lpx')  
170 .fontWeight(400) 137 .fontWeight(400)
171 - // .fontSize('27lpx')  
172 - .fontSize(27)  
173 - // .lineHeight('40lpx')  
174 - .lineHeight(40) 138 + .fontSize(14)
  139 + .lineHeight(21)
175 if (this.isOverLinesParent) { 140 if (this.isOverLinesParent) {
176 - Span('...展开') 141 + Span('... 展开')
177 .fontColor($r('app.color.color_999999')) 142 .fontColor($r('app.color.color_999999'))
  143 + .fontWeight(400)
  144 + .fontSize(14)
  145 + .lineHeight(21)
178 .onClick(() => { 146 .onClick(() => {
179 this.isExpandParent = true 147 this.isExpandParent = true
180 }) 148 })
@@ -186,18 +154,13 @@ export struct ChildCommentComponent { @@ -186,18 +154,13 @@ export struct ChildCommentComponent {
186 } 154 }
187 } 155 }
188 .width('100%') 156 .width('100%')
189 - // .padding({ top: '23lpx', bottom: '15lpx', right: '23lpx' })  
190 - .padding({ top: 23, bottom: 15, right: 23 })  
191 157
192 Divider() 158 Divider()
193 .width('100%') 159 .width('100%')
194 - // .height('1lpx')  
195 - .height(1)  
196 - // .strokeWidth('1lpx')  
197 - .strokeWidth(1) 160 + .height(0.5)
  161 + .strokeWidth(0.5)
198 .backgroundColor($r('app.color.color_EDEDED')) 162 .backgroundColor($r('app.color.color_EDEDED'))
199 - // .margin({ top: '4lpx', bottom: '4lpx' })  
200 - .margin({ top: 4, bottom: 4 }) 163 + .margin({ top: 10, bottom: 10 })
201 } 164 }
202 165
203 Column() { 166 Column() {
@@ -205,23 +168,17 @@ export struct ChildCommentComponent { @@ -205,23 +168,17 @@ export struct ChildCommentComponent {
205 Row() { 168 Row() {
206 Image($r('app.media.comment_link_icon')) 169 Image($r('app.media.comment_link_icon'))
207 .objectFit(ImageFit.Auto) 170 .objectFit(ImageFit.Auto)
208 - // .width('31lpx')  
209 - .width(31)  
210 - // .height('31lpx')  
211 - .height(31)  
212 - // .margin({ right: '10lpx' })  
213 - .margin({ right: 10 }) 171 + .width(16)
  172 + .height(16)
  173 + .margin({ right: 5 })
214 174
215 Column() { 175 Column() {
216 Row() { 176 Row() {
217 Text(`${this.data.targetTitle}`) 177 Text(`${this.data.targetTitle}`)
218 - // .fontWeight('400lpx')  
219 .fontWeight(400) 178 .fontWeight(400)
220 .fontColor($r('app.color.color_666666')) 179 .fontColor($r('app.color.color_666666'))
221 - // .lineHeight('38lpx')  
222 - .lineHeight(38)  
223 - // .fontSize('27lpx')  
224 - .fontSize(27) 180 + .lineHeight(20)
  181 + .fontSize(14)
225 .layoutWeight(1) 182 .layoutWeight(1)
226 .maxLines(1) 183 .maxLines(1)
227 .textOverflow({ overflow: TextOverflow.Ellipsis }) 184 .textOverflow({ overflow: TextOverflow.Ellipsis })
@@ -232,17 +189,10 @@ export struct ChildCommentComponent { @@ -232,17 +189,10 @@ export struct ChildCommentComponent {
232 }.layoutWeight(1) 189 }.layoutWeight(1)
233 190
234 Image($r('app.media.arrow_icon_right')) 191 Image($r('app.media.arrow_icon_right'))
235 - // .margin({ right: '4lpx' })  
236 - .margin({ right: 4 })  
237 - // .width('23lpx')  
238 - .width(23)  
239 - // .height('23lpx')  
240 - .height(23)  
241 - .margin({right: 23}) 192 + .width(12)
  193 + .height(12)
242 } 194 }
243 .width('100%') 195 .width('100%')
244 - // .height('69lpx')  
245 - .height(69)  
246 .justifyContent(FlexAlign.SpaceBetween) 196 .justifyContent(FlexAlign.SpaceBetween)
247 .onClick(()=>{ 197 .onClick(()=>{
248 let content = getParams(this.data) 198 let content = getParams(this.data)
@@ -251,24 +201,19 @@ export struct ChildCommentComponent { @@ -251,24 +201,19 @@ export struct ChildCommentComponent {
251 }) 201 })
252 202
253 } 203 }
254 - // .height('69lpx')  
255 - .height(69)  
256 .justifyContent(FlexAlign.Center) 204 .justifyContent(FlexAlign.Center)
257 } 205 }
258 - // .margin({ top: '19lpx', bottom: '31lpx', left: '31lpx', right: '31lpx' })  
259 - .margin({ top: 19, bottom: 31, left: 31, right: 31 })  
260 - // .padding({ left: '23lpx' })  
261 - .padding({ left: 23 })  
262 - // .width('662lpx')  
263 - .width(662)  
264 .backgroundColor($r('app.color.color_F5F5F5')) 206 .backgroundColor($r('app.color.color_F5F5F5'))
  207 + .padding(12)
  208 + .width("100%")
  209 + }
  210 + .width("100%")
  211 + .padding({ top: 10, bottom: 16, left: 15, right: 15 })
265 212
266 if (!this.isLastItem) { 213 if (!this.isLastItem) {
267 Divider().width('100%') 214 Divider().width('100%')
268 - // .height('12lpx')  
269 - .height(12)  
270 - // .strokeWidth('12lpx')  
271 - .strokeWidth(12) 215 + .height(6)
  216 + .strokeWidth(6)
272 .color($r('app.color.color_F5F5F5')) 217 .color($r('app.color.color_F5F5F5'))
273 } 218 }
274 } 219 }
@@ -334,15 +279,10 @@ export struct ChildCommentComponent { @@ -334,15 +279,10 @@ export struct ChildCommentComponent {
334 279
335 @Extend(Text) 280 @Extend(Text)
336 function textStyle() { 281 function textStyle() {
337 - // .width('630lpx')  
338 - .width(630)  
339 - // .fontSize('31lpx')  
340 - .fontSize(31)  
341 - // .fontWeight('400lpx') 282 + .fontSize(16)
342 .fontWeight(400) 283 .fontWeight(400)
343 .fontColor($r('app.color.color_222222')) 284 .fontColor($r('app.color.color_222222'))
344 - // .lineHeight('46lpx')  
345 - .lineHeight(46) 285 + .lineHeight(24)
346 } 286 }
347 287
348 function getParams(item: CommentListItem) : ContentDTO{ 288 function getParams(item: CommentListItem) : ContentDTO{
@@ -37,7 +37,6 @@ export struct HomePageBottomCommentComponent { @@ -37,7 +37,6 @@ export struct HomePageBottomCommentComponent {
37 if (this.isGetRequest == true) { 37 if (this.isGetRequest == true) {
38 Text().backgroundColor($r('app.color.color_EDEDED')) 38 Text().backgroundColor($r('app.color.color_EDEDED'))
39 .width('100%') 39 .width('100%')
40 - // .height('2lpx')  
41 .height(2) 40 .height(2)
42 } 41 }
43 if (this.count === 0) { 42 if (this.count === 0) {
@@ -45,7 +44,6 @@ export struct HomePageBottomCommentComponent { @@ -45,7 +44,6 @@ export struct HomePageBottomCommentComponent {
45 EmptyComponent({ emptyType: 11 }) 44 EmptyComponent({ emptyType: 11 })
46 .layoutWeight(1) 45 .layoutWeight(1)
47 .width('100%') 46 .width('100%')
48 - // .offset({ y: "-200lpx" })  
49 .offset({ y: -200 }) 47 .offset({ y: -200 })
50 } 48 }
51 } else { 49 } else {
@@ -67,7 +65,7 @@ export struct HomePageBottomCommentComponent { @@ -67,7 +65,7 @@ export struct HomePageBottomCommentComponent {
67 } 65 }
68 }, 66 },
69 onLoadMore:(resolve)=> { 67 onLoadMore:(resolve)=> {
70 - console.log(TAG, "触底了"); 68 + // console.log(TAG, "触底了");
71 if (!this.isLoading) { 69 if (!this.isLoading) {
72 this.isLoading = true 70 this.isLoading = true
73 //加载分页数据 71 //加载分页数据
@@ -138,7 +136,7 @@ export struct HomePageBottomCommentComponent { @@ -138,7 +136,7 @@ export struct HomePageBottomCommentComponent {
138 this.getCommentListStatus(value) 136 this.getCommentListStatus(value)
139 } 137 }
140 }).catch((err: Error) => { 138 }).catch((err: Error) => {
141 - console.log(TAG, "请求失败") 139 + // console.log(TAG, "请求失败")
142 this.isLoading = false 140 this.isLoading = false
143 this.isGetRequest = true 141 this.isGetRequest = true
144 }) 142 })
@@ -236,7 +234,7 @@ export struct HomePageBottomCommentComponent { @@ -236,7 +234,7 @@ export struct HomePageBottomCommentComponent {
236 this.isLoading = false 234 this.isLoading = false
237 this.isGetRequest = true 235 this.isGetRequest = true
238 }).catch((err: Error) => { 236 }).catch((err: Error) => {
239 - console.log(TAG, "请求失败") 237 + // console.log(TAG, "请求失败")
240 this.isLoading = false 238 this.isLoading = false
241 this.isGetRequest = true 239 this.isGetRequest = true
242 }) 240 })
@@ -71,7 +71,6 @@ export struct HomePageBottomFollowComponent { @@ -71,7 +71,6 @@ export struct HomePageBottomFollowComponent {
71 if (this.isGetRequest == true) { 71 if (this.isGetRequest == true) {
72 Text().backgroundColor($r('app.color.color_EDEDED')) 72 Text().backgroundColor($r('app.color.color_EDEDED'))
73 .width('100%') 73 .width('100%')
74 - // .height('2lpx')  
75 .height(2) 74 .height(2)
76 } 75 }
77 76
@@ -81,38 +80,28 @@ export struct HomePageBottomFollowComponent { @@ -81,38 +80,28 @@ export struct HomePageBottomFollowComponent {
81 EmptyComponent({ emptyType: 14 }) 80 EmptyComponent({ emptyType: 14 })
82 .layoutWeight(1) 81 .layoutWeight(1)
83 .width('100%') 82 .width('100%')
84 - // .offset({ y: "-200lpx" })  
85 .offset({ y: -200 }) 83 .offset({ y: -200 })
86 } 84 }
87 85
88 Row() { 86 Row() {
89 Text("关注更多人民号") 87 Text("关注更多人民号")
90 - // .fontWeight('400lpx')  
91 .fontWeight(400) 88 .fontWeight(400)
92 .fontColor($r('app.color.color_222222')) 89 .fontColor($r('app.color.color_222222'))
93 - // .lineHeight('38lpx')  
94 - .lineHeight(38)  
95 - // .fontSize('27lpx')  
96 - .fontSize(27) 90 + .lineHeight(20)
  91 + .fontSize(14)
97 .textAlign(TextAlign.Center) 92 .textAlign(TextAlign.Center)
98 - // .margin({ right: '4lpx' })  
99 - .margin({ right: 4 }) 93 + .margin({ right: 2 })
100 Image($r('app.media.arrow_icon_right')) 94 Image($r('app.media.arrow_icon_right'))
101 .objectFit(ImageFit.Auto) 95 .objectFit(ImageFit.Auto)
102 - // .width('27lpx')  
103 - .width(27)  
104 - // .height('27lpx')  
105 - .height(27) 96 + .width(14)
  97 + .height(14)
106 } 98 }
107 - // .height('69lpx')  
108 - .height(69)  
109 - // .width('659lpx')  
110 - .width(659) 99 + .height(36)
  100 + .width(343)
111 .alignItems(VerticalAlign.Center) 101 .alignItems(VerticalAlign.Center)
112 .justifyContent(FlexAlign.Center) 102 .justifyContent(FlexAlign.Center)
113 .backgroundColor($r('app.color.color_F5F5F5')) 103 .backgroundColor($r('app.color.color_F5F5F5'))
114 - // .margin({ top: '31lpx', bottom: '4lpx' })  
115 - .margin({ top: 31, bottom: 4 }) 104 + .margin({ top: 10, bottom: 2 })
116 .onClick(() => { 105 .onClick(() => {
117 let params = { 'index': "1" } as Record<string, string> 106 let params = { 'index': "1" } as Record<string, string>
118 WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params) 107 WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params)
@@ -137,7 +126,7 @@ export struct HomePageBottomFollowComponent { @@ -137,7 +126,7 @@ export struct HomePageBottomFollowComponent {
137 } 126 }
138 }, 127 },
139 onLoadMore:(resolve)=> { 128 onLoadMore:(resolve)=> {
140 - console.log(TAG, "触底了"); 129 + // console.log(TAG, "触底了");
141 if (!this.isLoading) { 130 if (!this.isLoading) {
142 this.isLoading = true 131 this.isLoading = true
143 //加载分页数据 132 //加载分页数据
@@ -157,32 +146,23 @@ export struct HomePageBottomFollowComponent { @@ -157,32 +146,23 @@ export struct HomePageBottomFollowComponent {
157 ListItem() { 146 ListItem() {
158 Row() { 147 Row() {
159 Text("关注更多人民号") 148 Text("关注更多人民号")
160 - // .fontWeight('400lpx')  
161 .fontWeight(400) 149 .fontWeight(400)
162 .fontColor($r('app.color.color_222222')) 150 .fontColor($r('app.color.color_222222'))
163 - // .lineHeight('38lpx')  
164 - .lineHeight(38)  
165 - // .fontSize('27lpx')  
166 - .fontSize(27) 151 + .lineHeight(20)
  152 + .fontSize(14)
167 .textAlign(TextAlign.Center) 153 .textAlign(TextAlign.Center)
168 - // .margin({ right: '4lpx' })  
169 - .margin({ right: 4 }) 154 + .margin({ right: 2 })
170 Image($r('app.media.arrow_icon_right')) 155 Image($r('app.media.arrow_icon_right'))
171 .objectFit(ImageFit.Auto) 156 .objectFit(ImageFit.Auto)
172 - // .width('27lpx')  
173 - .width(27)  
174 - // .height('27lpx')  
175 - .height(27) 157 + .width(14)
  158 + .height(14)
176 } 159 }
177 - // .height('69lpx')  
178 - .height(69)  
179 - // .width('659lpx')  
180 - .width(659) 160 + .height(36)
  161 + .width(343)
181 .alignItems(VerticalAlign.Center) 162 .alignItems(VerticalAlign.Center)
182 .justifyContent(FlexAlign.Center) 163 .justifyContent(FlexAlign.Center)
183 .backgroundColor($r('app.color.color_F5F5F5')) 164 .backgroundColor($r('app.color.color_F5F5F5'))
184 - // .margin({ top: '31lpx', bottom: '4lpx' })  
185 - .margin({ top: 31, bottom: 4 }) 165 + .margin({ top: 10, bottom: 2 })
186 }.onClick(() => { 166 }.onClick(() => {
187 let params = { 'index': "1" } as Record<string, string> 167 let params = { 'index': "1" } as Record<string, string>
188 WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params) 168 WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params)
@@ -202,8 +182,7 @@ export struct HomePageBottomFollowComponent { @@ -202,8 +182,7 @@ export struct HomePageBottomFollowComponent {
202 } 182 }
203 } 183 }
204 .cachedCount(5) 184 .cachedCount(5)
205 - // .padding({ left: '31lpx', right: '31lpx' })  
206 - .padding({ left: 31, right: 31 }) 185 + .padding({ left: 16, right: 16 })
207 .layoutWeight(1) 186 .layoutWeight(1)
208 .scrollBar(BarState.Off) 187 .scrollBar(BarState.Off)
209 .edgeEffect(EdgeEffect.None) 188 .edgeEffect(EdgeEffect.None)
@@ -7,29 +7,27 @@ export struct ListHasNoMoreDataUI{ @@ -7,29 +7,27 @@ export struct ListHasNoMoreDataUI{
7 Row(){ 7 Row(){
8 Text("已显示全部内容") 8 Text("已显示全部内容")
9 .fontColor($r('app.color.color_999999')) 9 .fontColor($r('app.color.color_999999'))
10 - // .fontWeight('500lpx')  
11 - .fontWeight(500)  
12 - // .fontSize('23lpx')  
13 - .fontSize(23) 10 + .fontWeight(400)
  11 + .fontSize(14)
  12 + .lineHeight(20)
14 }.justifyContent(FlexAlign.Center) 13 }.justifyContent(FlexAlign.Center)
15 .width('100%') 14 .width('100%')
16 - // .margin({top:'20lpx',bottom:'20lpx'})  
17 - .margin({top: 20,bottom: 20}) 15 + .margin({top: 24,bottom: 24})
18 }else if (this.style === 2){ 16 }else if (this.style === 2){
19 Column(){ 17 Column(){
20 Image($r('app.media.empty_icon')) 18 Image($r('app.media.empty_icon'))
21 - // .width('200lpx')  
22 - .width(200)  
23 - // .height('200lpx')  
24 - .height(200) 19 + .width(160)
  20 + .height(112)
25 .objectFit(ImageFit.Auto) 21 .objectFit(ImageFit.Auto)
26 .interpolation(ImageInterpolation.High) 22 .interpolation(ImageInterpolation.High)
27 Text("暂无内容") 23 Text("暂无内容")
28 .fontColor($r('app.color.color_999999')) 24 .fontColor($r('app.color.color_999999'))
29 - // .fontWeight('500lpx')  
30 - .fontWeight(500)  
31 - // .fontSize('23lpx')  
32 - .fontSize(23) 25 + .fontWeight(400)
  26 + .fontSize(14)
  27 + .lineHeight(20)
  28 + .margin({
  29 + top: 6
  30 + })
33 } 31 }
34 .justifyContent(FlexAlign.Center) 32 .justifyContent(FlexAlign.Center)
35 .width('100%') 33 .width('100%')
@@ -103,24 +103,20 @@ struct MineHomePage { @@ -103,24 +103,20 @@ struct MineHomePage {
103 Stack(){ 103 Stack(){
104 Image(this.headPhotoUrl&&this.headPhotoUrl.length>0?this.headPhotoUrl:(this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon'))) 104 Image(this.headPhotoUrl&&this.headPhotoUrl.length>0?this.headPhotoUrl:(this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon')))
105 .alt($r('app.media.default_head')) 105 .alt($r('app.media.default_head'))
106 - .width(60)  
107 - .height(60) 106 + .width(64)
  107 + .height(64)
108 .objectFit(ImageFit.Auto) 108 .objectFit(ImageFit.Auto)
109 - .clip(new Circle({ width: 60, height: 60 })) 109 + .clip(new Circle({ width: 64, height: 64 }))
110 Image(this.levelHead) 110 Image(this.levelHead)
111 - // .width('165lpx')  
112 - .width(165)  
113 - // .height('165lpx')  
114 - .height(165) 111 + .width(90)
  112 + .height(90)
115 .objectFit(ImageFit.Auto) 113 .objectFit(ImageFit.Auto)
116 }.onClick(()=>{ 114 }.onClick(()=>{
117 let params = {'headPhotoUrl': this.headPhotoUrl} as Record<string, string>; 115 let params = {'headPhotoUrl': this.headPhotoUrl} as Record<string, string>;
118 WDRouterRule.jumpWithPage(WDRouterPage.showUserHeaderPage,params) 116 WDRouterRule.jumpWithPage(WDRouterPage.showUserHeaderPage,params)
119 }) 117 })
120 - // .width('165lpx')  
121 - .width(165)  
122 - // .height('165lpx')  
123 - .height(165) 118 + .width(90)
  119 + .height(90)
124 120
125 Column() { 121 Column() {
126 Row() { 122 Row() {
@@ -128,11 +124,8 @@ struct MineHomePage { @@ -128,11 +124,8 @@ struct MineHomePage {
128 .fontColor($r('app.color.white')) 124 .fontColor($r('app.color.white'))
129 .maxLines(1) 125 .maxLines(1)
130 .textOverflow({ overflow: TextOverflow.Ellipsis }) 126 .textOverflow({ overflow: TextOverflow.Ellipsis })
131 - // .fontSize('38lpx')  
132 - .fontSize(38)  
133 - // .lineHeight('50lpx')  
134 - .lineHeight(50)  
135 - // .fontWeight('500lpx') 127 + .fontSize(20)
  128 + .lineHeight(26)
136 .fontWeight(500) 129 .fontWeight(500)
137 .onClick(()=>{ 130 .onClick(()=>{
138 let params: editModelParams = { 131 let params: editModelParams = {
@@ -144,24 +137,19 @@ struct MineHomePage { @@ -144,24 +137,19 @@ struct MineHomePage {
144 if(this.levelId>0){ 137 if(this.levelId>0){
145 Text(`等级${this.levelId}`) 138 Text(`等级${this.levelId}`)
146 .fontColor($r('app.color.color_ED2800')) 139 .fontColor($r('app.color.color_ED2800'))
147 - // .fontSize('23lpx')  
148 - .fontSize(23) 140 + .fontSize(12)
  141 + .lineHeight(18)
149 .fontWeight(500) 142 .fontWeight(500)
150 - // .margin({ left: '10lpx' })  
151 - .margin({ left: 10 }) 143 + .margin({ left: 6 })
152 .backgroundImage($r("app.media.my_grade_bg")) 144 .backgroundImage($r("app.media.my_grade_bg"))
153 .backgroundImageSize(ImageSize.Cover) 145 .backgroundImageSize(ImageSize.Cover)
154 - // .padding({left:"17lpx",right:"8lpx"})  
155 - .padding({left: 17,right: 8})  
156 - // .height('35lpx')  
157 - .height(35) 146 + .padding({left: 6,right: 6})
  147 + .height(18)
158 .borderRadius({topRight:2,bottomRight:2}) 148 .borderRadius({topRight:2,bottomRight:2})
159 } 149 }
160 150
161 Blank() 151 Blank()
162 } 152 }
163 - // .width('507lpx')  
164 - .width(507)  
165 153
166 Row() { 154 Row() {
167 Row() { 155 Row() {
@@ -170,14 +158,11 @@ struct MineHomePage { @@ -170,14 +158,11 @@ struct MineHomePage {
170 Text("阅读") 158 Text("阅读")
171 .textStyle2() 159 .textStyle2()
172 } 160 }
173 - // .margin({ right: '15lpx' })  
174 - .margin({ right: 15 }) 161 + .margin({ right: 8 })
175 162
176 Divider() 163 Divider()
177 - // .height('19lpx')  
178 - .height(19)  
179 - // .width('2lpx')  
180 - .width(2) 164 + .height(10)
  165 + .width(1)
181 .color($r('app.color.white')) 166 .color($r('app.color.white'))
182 .vertical(true) 167 .vertical(true)
183 .opacity(0.4) 168 .opacity(0.4)
@@ -187,14 +172,11 @@ struct MineHomePage { @@ -187,14 +172,11 @@ struct MineHomePage {
187 Text("评论") 172 Text("评论")
188 .textStyle2() 173 .textStyle2()
189 } 174 }
190 - // .margin({ right: '15lpx', left: '15lpx' })  
191 - .margin({ right: 15, left: 15 }) 175 + .margin({ right: 8, left: 8 })
192 176
193 Divider() 177 Divider()
194 - // .height('19lpx')  
195 - .height(19)  
196 - // .width('2lpx')  
197 - .width(2) 178 + .height(10)
  179 + .width(1)
198 .color($r('app.color.white')) 180 .color($r('app.color.white'))
199 .vertical(true) 181 .vertical(true)
200 .opacity(0.4) 182 .opacity(0.4)
@@ -204,14 +186,11 @@ struct MineHomePage { @@ -204,14 +186,11 @@ struct MineHomePage {
204 Text("关注") 186 Text("关注")
205 .textStyle2() 187 .textStyle2()
206 } 188 }
207 - // .margin({ left: '15lpx' })  
208 - .margin({ left: 15 }) 189 + .margin({ left: 8 })
209 } 190 }
210 - // .margin({ top: '23lpx' })  
211 - .margin({ top: 23 }) 191 + .margin({ top: 12 })
212 }.alignItems(HorizontalAlign.Start) 192 }.alignItems(HorizontalAlign.Start)
213 - // .margin({ left: StringUtils.isEmpty(this.levelHead)?'32lpx':"3lpx" })  
214 - .margin({ left: StringUtils.isEmpty(this.levelHead) ? 32 : 3 }) 193 + .margin({ left: StringUtils.isEmpty(this.levelHead) ? 16 : 3 })
215 } 194 }
216 .onAreaChange((oldValue: Area, newValue: Area) => { 195 .onAreaChange((oldValue: Area, newValue: Area) => {
217 if (this.firstPositionY === 0) { 196 if (this.firstPositionY === 0) {
@@ -225,36 +204,32 @@ struct MineHomePage { @@ -225,36 +204,32 @@ struct MineHomePage {
225 } 204 }
226 }) 205 })
227 .backgroundColor($r('app.color.color_transparent')) 206 .backgroundColor($r('app.color.color_transparent'))
228 - // .height('184lpx')  
229 - .height(184) 207 + .height(86)
230 .width('100%') 208 .width('100%')
231 - // .padding({ left: '6lpx' })  
232 - .padding({ left: 6 }) 209 + .padding({ left: 16 })
233 210
234 211
235 //用户简介区域 212 //用户简介区域
236 Column() { 213 Column() {
237 Row() { 214 Row() {
238 Text(this.isHasIntroduction?"简介："+this.desc:this.desc) 215 Text(this.isHasIntroduction?"简介："+this.desc:this.desc)
239 - // .fontSize('27lpx')  
240 - .fontSize(27) 216 + .fontSize(14)
241 .maxLines(3) 217 .maxLines(3)
242 .textOverflow({ overflow: TextOverflow.Ellipsis }) 218 .textOverflow({ overflow: TextOverflow.Ellipsis })
243 - // .lineHeight('40lpx')  
244 - .lineHeight(40)  
245 - // .fontWeight('400lpx') 219 + .lineHeight(21)
246 .fontWeight(400) 220 .fontWeight(400)
247 .fontColor(this.isHasIntroduction?$r('app.color.color_222222'):$r('app.color.color_999999')) 221 .fontColor(this.isHasIntroduction?$r('app.color.color_222222'):$r('app.color.color_999999'))
248 .textAlign(TextAlign.Start) 222 .textAlign(TextAlign.Start)
249 223
250 if(!this.isHasIntroduction){ 224 if(!this.isHasIntroduction){
251 Image($r('app.media.user_info_edit_icon')) 225 Image($r('app.media.user_info_edit_icon'))
252 - // .width('27lpx')  
253 - .width(27)  
254 - // .height('27lpx')  
255 - .height(27) 226 + .width(14)
  227 + .height(14)
256 .interpolation(ImageInterpolation.High) 228 .interpolation(ImageInterpolation.High)
257 .objectFit(ImageFit.Auto) 229 .objectFit(ImageFit.Auto)
  230 + .margin({
  231 + left: 6
  232 + })
258 } 233 }
259 }.onClick(()=>{ 234 }.onClick(()=>{
260 let params: editModelParams = { 235 let params: editModelParams = {
@@ -265,28 +240,22 @@ struct MineHomePage { @@ -265,28 +240,22 @@ struct MineHomePage {
265 240
266 241
267 Text(`来到人民日报${this.registerTimeForDay}天`) 242 Text(`来到人民日报${this.registerTimeForDay}天`)
268 - // .fontSize('23lpx')  
269 - .fontSize(23)  
270 - // .lineHeight('25lpx')  
271 - .lineHeight(25)  
272 - // .fontWeight('400lpx') 243 + .fontSize(12)
  244 + .lineHeight(13)
273 .fontWeight(400) 245 .fontWeight(400)
274 .fontColor($r('app.color.color_999999')) 246 .fontColor($r('app.color.color_999999'))
275 .textAlign(TextAlign.Start) 247 .textAlign(TextAlign.Start)
276 - // .margin({ top: '15lpx' })  
277 - .margin({ top: 15 }) 248 + .margin({ top: 10 })
278 249
279 } 250 }
280 - // .padding({ left: '31lpx',right:'31lpx',top:'19lpx',bottom:'31lpx'})  
281 - .padding({ left: 31,right: 31,top: 19,bottom: 31}) 251 + .padding({ left: 16,right: 16,top: 12,bottom: 12})
282 .alignItems(HorizontalAlign.Start) 252 .alignItems(HorizontalAlign.Start)
283 .justifyContent(FlexAlign.Center) 253 .justifyContent(FlexAlign.Center)
284 .width('100%') 254 .width('100%')
285 .backgroundColor($r('app.color.white')) 255 .backgroundColor($r('app.color.white'))
286 //间隔符 256 //间隔符
287 257
288 - // Divider().width('100%').height('12lpx').color($r('app.color.color_F5F5F5')).strokeWidth('12lpx')  
289 - Divider().width('100%').height(12).color($r('app.color.color_F5F5F5')).strokeWidth(12) 258 + Divider().width('100%').height(6).color($r('app.color.color_F5F5F5')).strokeWidth(6)
290 259
291 //tab 页面 260 //tab 页面
292 Stack({ alignContent: Alignment.Top }){ 261 Stack({ alignContent: Alignment.Top }){
@@ -305,12 +274,11 @@ struct MineHomePage { @@ -305,12 +274,11 @@ struct MineHomePage {
305 trackTabFirstClick(index === 0 ? "评论":"关注") 274 trackTabFirstClick(index === 0 ? "评论":"关注")
306 }) 275 })
307 .vertical(false) 276 .vertical(false)
308 - // .barHeight("77lpx")  
309 - .barHeight(77) 277 + .barHeight(44)
310 278
311 Column() { 279 Column() {
312 // 页签 280 // 页签
313 - Row({ space: 7 }) { 281 + Row({ space: 30 }) {
314 Scroll() { 282 Scroll() {
315 Row() { 283 Row() {
316 this.TabBuilder(0,"评论") 284 this.TabBuilder(0,"评论")
@@ -322,8 +290,7 @@ struct MineHomePage { @@ -322,8 +290,7 @@ struct MineHomePage {
322 .scrollable(ScrollDirection.Horizontal) 290 .scrollable(ScrollDirection.Horizontal)
323 .scrollBar(BarState.Off) 291 .scrollBar(BarState.Off)
324 .width('100%') 292 .width('100%')
325 - // .padding({left:'31lpx'})  
326 - .padding({left: 31}) 293 + .padding({left: 16})
327 } 294 }
328 .alignItems(VerticalAlign.Bottom) 295 .alignItems(VerticalAlign.Bottom)
329 .width('100%') 296 .width('100%')
@@ -331,8 +298,7 @@ struct MineHomePage { @@ -331,8 +298,7 @@ struct MineHomePage {
331 .backgroundColor($r('app.color.white')) 298 .backgroundColor($r('app.color.white'))
332 .alignItems(HorizontalAlign.Start) 299 .alignItems(HorizontalAlign.Start)
333 .width('100%') 300 .width('100%')
334 - // .height('77lpx')  
335 - .height(77) 301 + .height(44)
336 } 302 }
337 }.width("100%") 303 }.width("100%")
338 } 304 }
@@ -343,7 +309,6 @@ struct MineHomePage { @@ -343,7 +309,6 @@ struct MineHomePage {
343 } 309 }
344 .margin({top:px2vp(this.topSafeHeight)}) 310 .margin({top:px2vp(this.topSafeHeight)})
345 }.width('100%') 311 }.width('100%')
346 - // .padding({bottom:px2vp(this.bottomSafeHeight)})  
347 .layoutWeight(1) 312 .layoutWeight(1)
348 } else { 313 } else {
349 Column(){ 314 Column(){
@@ -477,26 +442,19 @@ struct MineHomePage { @@ -477,26 +442,19 @@ struct MineHomePage {
477 @Builder TabBuilder(index: number, title: string) { 442 @Builder TabBuilder(index: number, title: string) {
478 Stack(){ 443 Stack(){
479 Text(title) 444 Text(title)
480 - // .height('38lpx')  
481 - .height(38)  
482 - // .fontSize('33lpx')  
483 - .fontSize(33)  
484 - .fontWeight(this.currentIndex === index ? 600 : 400) 445 + .height(20)
  446 + .fontSize(18)
  447 + .fontWeight(this.currentIndex === index ? 500 : 400)
485 .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor) 448 .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
486 - // .lineHeight('38lpx')  
487 - .lineHeight(38) 449 + .lineHeight(20)
488 450
489 if(this.currentIndex === index){ 451 if(this.currentIndex === index){
490 Divider() 452 Divider()
491 - // .width('31lpx')  
492 - .width(31)  
493 - // .height('4lpx')  
494 - .height(4) 453 + .width(14.2)
  454 + .height(2)
495 .color('#ED2800') 455 .color('#ED2800')
496 - // .strokeWidth('4lpx')  
497 - .strokeWidth(4)  
498 - // .margin({top:'50lpx'})  
499 - .margin({top: 50}) 456 + .strokeWidth(2)
  457 + .margin({top: 35})
500 .id("divTag") 458 .id("divTag")
501 } 459 }
502 }.onClick(()=>{ 460 }.onClick(()=>{
@@ -504,12 +462,9 @@ struct MineHomePage { @@ -504,12 +462,9 @@ struct MineHomePage {
504 this.controller.changeIndex(this.currentIndex) 462 this.controller.changeIndex(this.currentIndex)
505 trackTabFirstClick(index === 0 ? "评论":"关注") 463 trackTabFirstClick(index === 0 ? "评论":"关注")
506 }) 464 })
507 - // .height('77lpx')  
508 - .height(77)  
509 - // .width('70lpx')  
510 - .width(70)  
511 - // .margin({right:'29lpx'})  
512 - .margin({right: 29}) 465 + .height(35)
  466 + .width(36)
  467 + .margin({right: 30})
513 } 468 }
514 469
515 /** 470 /**
@@ -589,8 +544,7 @@ struct MineHomePage { @@ -589,8 +544,7 @@ struct MineHomePage {
589 @Extend(Text) function textStyle() { 544 @Extend(Text) function textStyle() {
590 .fontColor($r('app.color.white')) 545 .fontColor($r('app.color.white'))
591 .textStyleDefault() 546 .textStyleDefault()
592 - // .margin({ right: '10lpx' })  
593 - .margin({ right: 10 }) 547 + .margin({ right: 6 })
594 } 548 }
595 549
596 @Extend(Text) function textStyle2() { 550 @Extend(Text) function textStyle2() {
@@ -600,12 +554,9 @@ struct MineHomePage { @@ -600,12 +554,9 @@ struct MineHomePage {
600 554
601 @Extend(Text) function textStyleDefault() { 555 @Extend(Text) function textStyleDefault() {
602 .textAlign(TextAlign.Start) 556 .textAlign(TextAlign.Start)
603 - // .fontSize('23lpx')  
604 - .fontSize(23)  
605 - // .fontWeight('400lpx') 557 + .fontSize(12)
606 .fontWeight(400) 558 .fontWeight(400)
607 - // .lineHeight('31lpx')  
608 - .lineHeight(31) 559 + .lineHeight(16)
609 } 560 }
610 561
611 function trackTabFirstClick(firstLevelTabName: string){ 562 function trackTabFirstClick(firstLevelTabName: string){