developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
wangliang_wd
13e3e5fb 2 parents 49272bcf 3d18e4d9

Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main 

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  ref |> 调整直播详情直播间tab布局UI走查问题
  fix: '我的'模块ui调整
  fix: '我的'模块ui调整
  fix: 信息流卡片分割线逻辑优化
  fix: card19图片地址优化
Inline Side-by-side
Showing 40 changed files with 1313 additions and 836 deletions
@@ -8,8 +8,8 @@ export struct CustomToast { @@ -8,8 +8,8 @@ export struct CustomToast {
8 @State bgBorderRadius: number = 10 8 @State bgBorderRadius: number = 10
9 opacityValue: number = 0.7 9 opacityValue: number = 0.7
10 bgColor: ResourceColor = $r("app.color.black") 10 bgColor: ResourceColor = $r("app.color.black")
11 - fontSizeValue :number | string | Resource = "27lpx"  
12 - lineHeightValue :number | string | Resource = "38lpx" 11 + fontSizeValue :number | string | Resource = 27
  12 + lineHeightValue :number | string | Resource = 38
13 controller: CustomDialogController 13 controller: CustomDialogController
14 marginTop :number | string | Resource = 0 14 marginTop :number | string | Resource = 0
15 15
@@ -34,9 +34,9 @@ export struct CustomToast { @@ -34,9 +34,9 @@ export struct CustomToast {
34 .fontSize(this.fontSizeValue) 34 .fontSize(this.fontSizeValue)
35 .lineHeight(this.lineHeightValue) 35 .lineHeight(this.lineHeightValue)
36 .textAlign(TextAlign.Center) 36 .textAlign(TextAlign.Center)
37 - }.borderRadius(`${this.bgBorderRadius}lpx`) 37 + }.borderRadius(`${this.bgBorderRadius}`)
38 .constraintSize({maxWidth:"86%"}) 38 .constraintSize({maxWidth:"86%"})
39 - .padding({top:"23lpx",bottom:'23lpx',left:"35lpx",right:"35lpx"}) 39 + .padding({top:23,bottom:23,left:35,right:35})
40 .backgroundColor(this.bgColor) 40 .backgroundColor(this.bgColor)
41 .opacity(this.opacityValue) 41 .opacity(this.opacityValue)
42 .margin({top:this.marginTop}) 42 .margin({top:this.marginTop})
@@ -83,21 +83,21 @@ export struct CompParser { @@ -83,21 +83,21 @@ export struct CompParser {
83 }) 83 })
84 } 84 }
85 85
86 - @Builder  
87 - beforeDevider() {  
88 - if (  
89 - this.compDTO.compStyle === CompStyle.Card_09 ||  
90 - this.compDTO.compStyle === CompStyle.Zh_Single_Column_09 ||  
91 - this.compDTO.compStyle === CompStyle.Zh_Single_Row_04 ||  
92 - this.compDTO.compStyle === CompStyle.Zh_Single_Row_06  
93 - ) {  
94 - if (this.compDTO.compStyle === this.nextCompDTO.compStyle) {  
95 - Divider().strokeWidth(1).color('#f5f5f5').width(CommonConstants.FULL_WIDTH).padding({ left: 10, right: 10 })  
96 - } else {  
97 - Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6})  
98 - }  
99 - }  
100 - } 86 + // @Builder
  87 + // beforeDevider() {
  88 + // if (
  89 + // this.compDTO.compStyle === CompStyle.Card_09 ||
  90 + // this.compDTO.compStyle === CompStyle.Zh_Single_Column_09 ||
  91 + // this.compDTO.compStyle === CompStyle.Zh_Single_Row_04 ||
  92 + // this.compDTO.compStyle === CompStyle.Zh_Single_Row_06
  93 + // ) {
  94 + // if (this.compDTO.compStyle === this.nextCompDTO.compStyle) {
  95 + // Divider().strokeWidth(1).color('#f5f5f5').width(CommonConstants.FULL_WIDTH).padding({ left: 10, right: 10 })
  96 + // } else {
  97 + // Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6})
  98 + // }
  99 + // }
  100 + // }
101 101
102 @Builder 102 @Builder
103 behindDevider() { 103 behindDevider() {
@@ -113,7 +113,11 @@ export struct CompParser { @@ -113,7 +113,11 @@ export struct CompParser {
113 Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6}) 113 Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6})
114 } 114 }
115 } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) { 115 } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
  116 + if (this.compIndex === 0) {
116 Divider().strokeWidth(1).color('#f5f5f5').width('120%').margin({left: -6}) 117 Divider().strokeWidth(1).color('#f5f5f5').width('120%').margin({left: -6})
  118 + } else {
  119 + Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6})
  120 + }
117 } else if (this.compDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) { 121 } else if (this.compDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) {
118 // 大专题 122 // 大专题
119 if (this.nextCompDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) { 123 if (this.nextCompDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) {
@@ -141,7 +145,7 @@ export struct CompParser { @@ -141,7 +145,7 @@ export struct CompParser {
141 145
142 @Builder 146 @Builder
143 componentBuilder() { 147 componentBuilder() {
144 - this.beforeDevider(); 148 + // this.beforeDevider();
145 149
146 if (this.compDTO.operDataList[0]?.objectType !== '3' && 150 if (this.compDTO.operDataList[0]?.objectType !== '3' &&
147 this.compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口 151 this.compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口
@@ -49,8 +49,8 @@ export struct FeedBackActivity { @@ -49,8 +49,8 @@ export struct FeedBackActivity {
49 builder: CustomToast({ 49 builder: CustomToast({
50 bgColor:$r("app.color.color_B3000000"), 50 bgColor:$r("app.color.color_B3000000"),
51 opacityValue:1, 51 opacityValue:1,
52 - fontSizeValue:"25lpx",  
53 - lineHeightValue:"36lpx", 52 + fontSizeValue:12,
  53 + lineHeightValue:18,
54 msg: this.toastText, 54 msg: this.toastText,
55 }), 55 }),
56 autoCancel: false, 56 autoCancel: false,
@@ -242,7 +242,7 @@ struct createImg { @@ -242,7 +242,7 @@ struct createImg {
242 GridCol({ 242 GridCol({
243 span: this.onePicW > this.onePicH ? 12 : 8 243 span: this.onePicW > this.onePicH ? 12 : 8
244 }) { 244 }) {
245 - Image(this.loadImg ? item.fullUrl : '') 245 + Image(this.loadImg ? item.url || item.fullUrl : '')
246 .backgroundColor(0xf5f5f5) 246 .backgroundColor(0xf5f5f5)
247 // .aspectRatio(this.onePicW > this.onePicH ? 343 / 198 : 228 / 305) 247 // .aspectRatio(this.onePicW > this.onePicH ? 343 / 198 : 228 / 305)
248 .width('100%') 248 .width('100%')
@@ -261,7 +261,7 @@ struct createImg { @@ -261,7 +261,7 @@ struct createImg {
261 GridCol({ 261 GridCol({
262 span: this.onePicW > this.onePicH ? 12 : 8 262 span: this.onePicW > this.onePicH ? 12 : 8
263 }) { 263 }) {
264 - Image(this.loadImg ? item.fullUrl : '') 264 + Image(this.loadImg ? item.url || item.fullUrl : '')
265 .backgroundColor(0xf5f5f5) 265 .backgroundColor(0xf5f5f5)
266 // .aspectRatio(this.onePicW > this.onePicH ? 343 / 198 : 228 / 305) 266 // .aspectRatio(this.onePicW > this.onePicH ? 343 / 198 : 228 / 305)
267 .width('100%') 267 .width('100%')
@@ -283,7 +283,7 @@ struct createImg { @@ -283,7 +283,7 @@ struct createImg {
283 span: { xs: 4 } 283 span: { xs: 4 }
284 }) { 284 }) {
285 Stack({alignContent: Alignment.BottomEnd}) { 285 Stack({alignContent: Alignment.BottomEnd}) {
286 - Image(this.loadImg ? item.fullUrl : '') 286 + Image(this.loadImg ? item.url || item.fullUrl : '')
287 .backgroundColor(index === 2 ? 0xffffff : 0xf5f5f5) 287 .backgroundColor(index === 2 ? 0xffffff : 0xf5f5f5)
288 .aspectRatio(1) 288 .aspectRatio(1)
289 .width('226lvp') 289 .width('226lvp')
@@ -322,7 +322,7 @@ struct createImg { @@ -322,7 +322,7 @@ struct createImg {
322 span: { sm: 4, lg: 3 } 322 span: { sm: 4, lg: 3 }
323 }) { 323 }) {
324 Stack({ alignContent: Alignment.BottomEnd }) { 324 Stack({ alignContent: Alignment.BottomEnd }) {
325 - Image(this.loadImg ? item.fullUrl : '') 325 + Image(this.loadImg ? item.url || item.fullUrl : '')
326 .backgroundColor(0xf5f5f5) 326 .backgroundColor(0xf5f5f5)
327 .aspectRatio(1) 327 .aspectRatio(1)
328 .borderRadius(this.caclImageRadius(index)) 328 .borderRadius(this.caclImageRadius(index))
@@ -360,7 +360,7 @@ struct createImg { @@ -360,7 +360,7 @@ struct createImg {
360 const photo: PhotoListBean = { 360 const photo: PhotoListBean = {
361 width: item.weight, 361 width: item.weight,
362 height: item.height, 362 height: item.height,
363 - picPath: item.fullUrl||item.url, 363 + picPath: item.url || item.fullUrl,
364 picDesc: '', 364 picDesc: '',
365 itemType:2, 365 itemType:2,
366 id:0 366 id:0
@@ -12,67 +12,73 @@ export default struct MinePageMoreFunctionUI { @@ -12,67 +12,73 @@ export default struct MinePageMoreFunctionUI {
12 Column() { 12 Column() {
13 Column() { 13 Column() {
14 Text("更多功能") 14 Text("更多功能")
  15 + .fontFamily('PingFang SC-Semibold')
15 .fontColor($r('app.color.color_222222')) 16 .fontColor($r('app.color.color_222222'))
16 - .fontSize(`${this.calcHeight(29)}lpx`)  
17 - .margin({ left: `${this.calcHeight(31)}lpx` })  
18 - .lineHeight(`${this.calcHeight(46)}lpx`) 17 + .fontSize(15)
  18 + .margin({ left: 16 })
  19 + // .lineHeight(`${this.calcHeight(46)}lpx`)
  20 + .lineHeight(24)
19 .fontWeight(FontWeight.Bold) 21 .fontWeight(FontWeight.Bold)
20 - }.height(`${this.calcHeight(92)}lpx`) 22 + }
  23 + .height(48)
21 .width('100%') 24 .width('100%')
22 .justifyContent(FlexAlign.Center) 25 .justifyContent(FlexAlign.Center)
23 .alignItems(HorizontalAlign.Start) 26 .alignItems(HorizontalAlign.Start)
24 27
25 Text().backgroundColor($r('app.color.color_F5F5F5')) 28 Text().backgroundColor($r('app.color.color_F5F5F5'))
26 .width('100%') 29 .width('100%')
27 - .height(`${this.calcHeight(1)}lpx`) 30 + .height(1)
28 31
29 List() { 32 List() {
30 ForEach(this.moreData, (item: MinePageMoreFunctionModel, index: number) => { 33 ForEach(this.moreData, (item: MinePageMoreFunctionModel, index: number) => {
31 ListItem() { 34 ListItem() {
32 - Column() { 35 + Column(){
33 Column() { 36 Column() {
34 Row() { 37 Row() {
35 Row(){ 38 Row(){
36 if (item.imgSrc) { 39 if (item.imgSrc) {
37 Image(item.imgSrc) 40 Image(item.imgSrc)
38 - .width(`${this.calcHeight(38)}lpx`)  
39 - .height(`${this.calcHeight(38)}lpx`)  
40 - .margin({ right: `${this.calcHeight(15)}lpx` }) 41 + .width(20)
  42 + .height(20)
  43 + .margin({ right: 14 })
41 .objectFit(ImageFit.Auto) 44 .objectFit(ImageFit.Auto)
42 .interpolation(ImageInterpolation.High) 45 .interpolation(ImageInterpolation.High)
43 } 46 }
44 Text(`${item.msg}`) 47 Text(`${item.msg}`)
45 - .height(`${this.calcHeight(38)}lpx`) 48 + .fontFamily('PingFang SC-Regular')
  49 + .lineHeight(20)
46 .fontColor($r('app.color.color_666666')) 50 .fontColor($r('app.color.color_666666'))
47 - .fontSize(`${this.calcHeight(29)}lpx`) 51 + .fontSize(15)
48 .fontWeight(400) 52 .fontWeight(400)
49 - }.alignItems(VerticalAlign.Center) 53 + }
  54 + .alignItems(VerticalAlign.Center)
50 .justifyContent(FlexAlign.Start) 55 .justifyContent(FlexAlign.Start)
51 56
52 Image($r('app.media.mine_user_arrow_2')) 57 Image($r('app.media.mine_user_arrow_2'))
53 - .width(`${this.calcHeight(27)}lpx`)  
54 - .height(`${this.calcHeight(27)}lpx`) 58 + .width(14)
  59 + .height(14)
55 .objectFit(ImageFit.Auto) 60 .objectFit(ImageFit.Auto)
56 .interpolation(ImageInterpolation.High) 61 .interpolation(ImageInterpolation.High)
57 - .margin({ left: `${this.calcHeight(81)}lpx`, right: `${this.calcHeight(29)}lpx` }) 62 + .margin({ left:42, right: 15 })
58 }.alignItems(VerticalAlign.Center) 63 }.alignItems(VerticalAlign.Center)
59 .justifyContent(FlexAlign.SpaceBetween) 64 .justifyContent(FlexAlign.SpaceBetween)
60 .width("100%") 65 .width("100%")
61 66
62 - }.height(`${this.calcHeight(108)}lpx`) 67 + }
  68 + .height(55)
63 .justifyContent(FlexAlign.Center) 69 .justifyContent(FlexAlign.Center)
64 - .padding({ left: `${this.calcHeight(27)}lpx` }) 70 + .padding({ left: 14 })
65 .width("100%") 71 .width("100%")
66 72
67 if (index != this.moreData.length - 1) { 73 if (index != this.moreData.length - 1) {
68 Text().backgroundColor($r('app.color.color_F5F5F5')) 74 Text().backgroundColor($r('app.color.color_F5F5F5'))
69 - .width(`612lpx`)  
70 - .height(`${this.calcHeight(1)}lpx`) 75 + .width('100%')
  76 + .height(1)
71 } 77 }
72 } 78 }
73 } 79 }
74 .onClick(() => { 80 .onClick(() => {
75 - console.log(index + "") 81 + // console.log(index + "")
76 if (item.msg == "设置") { //设置 82 if (item.msg == "设置") { //设置
77 trackButtonClick("myPageUserSetting") 83 trackButtonClick("myPageUserSetting")
78 let params: Params = { 84 let params: Params = {
@@ -82,12 +88,12 @@ export default struct MinePageMoreFunctionUI { @@ -82,12 +88,12 @@ export default struct MinePageMoreFunctionUI {
82 }else if (item.msg == "关于") { // 关于 88 }else if (item.msg == "关于") { // 关于
83 trackButtonClick("myPageUserAbout") 89 trackButtonClick("myPageUserAbout")
84 WDRouterRule.jumpWithPage(WDRouterPage.aboutPage) 90 WDRouterRule.jumpWithPage(WDRouterPage.aboutPage)
85 - }else if (item.msg == "意见反馈") { // 关于 91 + }else if (item.msg == "意见反馈") { // 意见反馈
86 trackButtonClick("myPageUserFeedBack") 92 trackButtonClick("myPageUserFeedBack")
87 ProcessUtils.gotoFeedBackActivity() 93 ProcessUtils.gotoFeedBackActivity()
88 } 94 }
89 }) 95 })
90 - .height(`${this.calcHeight(117)}lpx`) 96 + .height(56)
91 .width("100%") 97 .width("100%")
92 }) 98 })
93 }.onScrollFrameBegin((offset, state) => { 99 }.onScrollFrameBegin((offset, state) => {
@@ -96,8 +102,8 @@ export default struct MinePageMoreFunctionUI { @@ -96,8 +102,8 @@ export default struct MinePageMoreFunctionUI {
96 .width("100%") 102 .width("100%")
97 } 103 }
98 .backgroundColor($r('app.color.white')) 104 .backgroundColor($r('app.color.white'))
99 - .borderRadius(8)  
100 - .margin({ left: `${this.calcHeight(23)}lpx`, right: `${this.calcHeight(23)}lpx`, top: `${this.calcHeight(19)}lpx` }) 105 + .borderRadius(4)
  106 + .margin({ left: 11, right: 13, top: 10 })
101 } 107 }
102 108
103 calcHeight(value:number): number{ 109 calcHeight(value:number): number{
@@ -21,7 +21,7 @@ export default struct MinePagePersonFunctionUI { @@ -21,7 +21,7 @@ export default struct MinePagePersonFunctionUI {
21 GridItem(){ 21 GridItem(){
22 PagePersonFunction({ item: item, noDivider : (index % 5 < 4 && index != this.personalData.length-1) ? false : true,percent:$percent,navItem:this.navItem}) 22 PagePersonFunction({ item: item, noDivider : (index % 5 < 4 && index != this.personalData.length-1) ? false : true,percent:$percent,navItem:this.navItem})
23 }.onClick(()=>{ 23 }.onClick(()=>{
24 - console.log(index+"") 24 + // console.log(index+"")
25 switch (item.msg){ 25 switch (item.msg){
26 case "评论":{ 26 case "评论":{
27 if(!this.isLogin){ 27 if(!this.isLogin){
@@ -80,22 +80,18 @@ export default struct MinePagePersonFunctionUI { @@ -80,22 +80,18 @@ export default struct MinePagePersonFunctionUI {
80 break; 80 break;
81 } 81 }
82 } 82 }
83 - })/*.width(`${this.calcHeight(142)}lpx`)*/  
84 - .height(`${this.calcHeight(117)}lpx`) 83 + })
  84 + .height(61)
85 }) 85 })
86 } 86 }
87 .rowsTemplate('1fr') 87 .rowsTemplate('1fr')
88 .columnsTemplate('1fr 1fr 1fr 1fr 1fr') 88 .columnsTemplate('1fr 1fr 1fr 1fr 1fr')
89 - .height(`${this.calcHeight(117)}lpx`)  
90 - .margin({top:`${this.calcHeight(31)}lpx`}) 89 + .height(61)
  90 + .margin({top: 10})
91 } 91 }
92 92
93 messageClick(){ 93 messageClick(){
94 - MinePageDatasModel.sendClickMessageData().then((value) => {  
95 - console.log(TAG, "进入消息页面")  
96 - }).catch((err: Error) => {  
97 - console.log(TAG, JSON.stringify(err))  
98 - }) 94 + MinePageDatasModel.sendClickMessageData()
99 } 95 }
100 96
101 calcHeight(value:number): number{ 97 calcHeight(value:number): number{
@@ -48,20 +48,21 @@ export default struct MinePageUserSimpleInfoUI { @@ -48,20 +48,21 @@ export default struct MinePageUserSimpleInfoUI {
48 48
49 Image(this.isLogin?(this.headPhotoUrl?this.headPhotoUrl:this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon')):$r('app.media.default_head_userPage')) 49 Image(this.isLogin?(this.headPhotoUrl?this.headPhotoUrl:this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon')):$r('app.media.default_head_userPage'))
50 .alt(this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon')) 50 .alt(this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon'))
51 - .width(`${this.calcHeight(120)}lpx`)  
52 - .height(`${this.calcHeight(120)}lpx`) 51 + .width(63.21)
  52 + .height(63.21)
53 .objectFit(ImageFit.Cover) 53 .objectFit(ImageFit.Cover)
54 .borderRadius(50) 54 .borderRadius(50)
55 55
56 if(StringUtils.isNotEmpty(this.levelHead)){ 56 if(StringUtils.isNotEmpty(this.levelHead)){
57 Image(this.levelHead) 57 Image(this.levelHead)
58 - .width(`${this.calcHeight(155)}lpx`)  
59 - .height(`${this.calcHeight(155)}lpx`) 58 + .width(72.86)
  59 + .height(72.86)
60 .objectFit(ImageFit.Cover) 60 .objectFit(ImageFit.Cover)
61 .borderRadius(50) 61 .borderRadius(50)
62 } 62 }
63 - }.width(`${this.calcHeight(140)}lpx`)  
64 - .height(`${this.calcHeight(140)}lpx`) 63 + }
  64 + .width(86)
  65 + .height(86)
65 .alignContent(Alignment.Center) 66 .alignContent(Alignment.Center)
66 .onClick(()=>{ 67 .onClick(()=>{
67 this.jumpLogin() 68 this.jumpLogin()
@@ -77,17 +78,18 @@ export default struct MinePageUserSimpleInfoUI { @@ -77,17 +78,18 @@ export default struct MinePageUserSimpleInfoUI {
77 .maxLines(1) 78 .maxLines(1)
78 .fontWeight(FontWeight.Medium) 79 .fontWeight(FontWeight.Medium)
79 .textOverflow({ overflow: TextOverflow.Ellipsis }) 80 .textOverflow({ overflow: TextOverflow.Ellipsis })
80 - .fontSize(`${this.calcHeight(33)}lpx`)  
81 - .lineHeight(`${this.calcHeight(46)}lpx`) 81 + .fontSize(20)
  82 + .lineHeight(24)
82 83
83 Image($r('app.media.mine_user_edit')) 84 Image($r('app.media.mine_user_edit'))
84 - .width(`${this.calcHeight(27)}lpx`)  
85 - .height(`${this.calcHeight(27)}lpx`) 85 + .width(14)
  86 + .height(14)
86 .colorFilter(ColorUtils.getDrawingColorFilter(this.navItem?.homePageColor.length > 0?this.navItem?.homePageColor:'')) 87 .colorFilter(ColorUtils.getDrawingColorFilter(this.navItem?.homePageColor.length > 0?this.navItem?.homePageColor:''))
87 - .margin({left:`${this.calcHeight(15)}lpx`}) 88 + .margin({left:11})
88 .objectFit(ImageFit.Cover) 89 .objectFit(ImageFit.Cover)
89 Blank() 90 Blank()
90 - }.width('100%') 91 + }
  92 + .width('100%')
91 .onClick(()=>{ 93 .onClick(()=>{
92 this.jumpLogin() 94 this.jumpLogin()
93 trackButtonClick("myPageUserName") 95 trackButtonClick("myPageUserName")
@@ -96,40 +98,42 @@ export default struct MinePageUserSimpleInfoUI { @@ -96,40 +98,42 @@ export default struct MinePageUserSimpleInfoUI {
96 if (this.levelId !== 0){ 98 if (this.levelId !== 0){
97 Stack(){ 99 Stack(){
98 Image($r('app.media.mine_grade_bg')) 100 Image($r('app.media.mine_grade_bg'))
99 - .width(`${this.calcHeight(84)}lpx`)  
100 - .height(`${this.calcHeight(29)}lpx`) 101 + .width(44)
  102 + .height(15)
101 .objectFit(ImageFit.Auto) 103 .objectFit(ImageFit.Auto)
102 Text(`等级${this.levelId}`) 104 Text(`等级${this.levelId}`)
  105 + .fontFamily('PingFang SC-Semibold')
  106 + .fontWeight(600)
103 .textAlign(TextAlign.Center) 107 .textAlign(TextAlign.Center)
104 .fontColor($r('app.color.white')) 108 .fontColor($r('app.color.white'))
105 - .fontSize(`${this.calcHeight(19)}lpx`)  
106 - .width(this.levelId>9?`${this.calcHeight(69)}lpx`:`${this.calcHeight(50)}lpx`)  
107 - .height(`${this.calcHeight(29)}lpx`)  
108 - }.margin({top:`${this.calcHeight(15)}lpx`})  
109 - }  
110 - }.alignItems(HorizontalAlign.Start)  
111 - .margin({top:`${this.calcHeight(5)}lpx`,left:`${this.calcHeight(4)}lpx`})  
112 - .width(`${this.calcHeight(352)}lpx`) 109 + .fontSize(10)
  110 + .width(this.levelId > 9 ? 35: 26)
  111 + .lineHeight(15)
  112 + }
  113 + .margin({top: 10})
  114 + }
  115 + }
  116 + .alignItems(HorizontalAlign.Start)
  117 + .width(180)
113 }else{ 118 }else{
114 Row(){ 119 Row(){
115 Text("登录注册") 120 Text("登录注册")
116 .fontColor($r('app.color.color_222222')) 121 .fontColor($r('app.color.color_222222'))
117 - .fontSize(`${this.calcHeight(38)}lpx`)  
118 - .lineHeight(`${this.calcHeight(46)}lpx`) 122 + .fontSize(20)
  123 + .lineHeight(24)
119 .fontWeight(600) 124 .fontWeight(600)
120 125
121 Image($r('app.media.mine_user_edit')) 126 Image($r('app.media.mine_user_edit'))
122 - .width(`${this.calcHeight(11)}lpx`)  
123 - .height(`${this.calcHeight(20)}lpx`)  
124 - .margin({left:`${this.calcHeight(15)}lpx`}) 127 + .width(14)
  128 + .height(14)
  129 + .margin({left: 11})
125 .objectFit(ImageFit.Cover) 130 .objectFit(ImageFit.Cover)
126 Blank() 131 Blank()
127 }.onClick(()=>{ 132 }.onClick(()=>{
128 this.jumpLogin() 133 this.jumpLogin()
129 trackButtonClick("myPageUserLogin") 134 trackButtonClick("myPageUserLogin")
130 }) 135 })
131 - .margin({top:`${this.calcHeight(11)}lpx`,left:`${this.calcHeight(4)}lpx`})  
132 - .width(`${this.calcHeight(352)}lpx`) 136 + .width(180)
133 } 137 }
134 138
135 Blank() 139 Blank()
@@ -137,21 +141,22 @@ export default struct MinePageUserSimpleInfoUI { @@ -137,21 +141,22 @@ export default struct MinePageUserSimpleInfoUI {
137 Stack({alignContent:Alignment.Start}){ 141 Stack({alignContent:Alignment.Start}){
138 Text("签到") 142 Text("签到")
139 .textAlign(TextAlign.Start) 143 .textAlign(TextAlign.Start)
140 - .width('108lpx')  
141 - .height(`${this.calcHeight(46)}lpx`) 144 + .width(56)
  145 + .height(24)
142 .fontColor($r('app.color.color_AD6000')) 146 .fontColor($r('app.color.color_AD6000'))
143 .backgroundColor($r('app.color.color_FFC460')) 147 .backgroundColor($r('app.color.color_FFC460'))
144 .fontWeight(500) 148 .fontWeight(500)
145 - .position({x:'23lpx'})  
146 - .padding({left:'35lpx'}) 149 + .position({x: 16})
  150 + .padding({left: 12})
147 Image($r("app.media.mine_sign_icon")) 151 Image($r("app.media.mine_sign_icon"))
148 - .width(`${this.calcHeight(50)}lpx`)  
149 - .height(`${this.calcHeight(50)}lpx`)  
150 - }.width('131lpx') 152 + .width(26)
  153 + .height(26)
  154 + }
  155 + .width(68)
151 .visibility(Visibility.Hidden) 156 .visibility(Visibility.Hidden)
152 } 157 }
153 .setFullWidth() 158 .setFullWidth()
154 - .padding({top:'31lpx',left:'46lpx'}) 159 + .padding({top: 11,left: 11})
155 } 160 }
156 161
157 @Styles setFullWidthAndHeight(){ 162 @Styles setFullWidthAndHeight(){
@@ -188,8 +193,6 @@ export default struct MinePageUserSimpleInfoUI { @@ -188,8 +193,6 @@ export default struct MinePageUserSimpleInfoUI {
188 } 193 }
189 } 194 }
190 this.getUserLevel() 195 this.getUserLevel()
191 - }).catch((err:Error)=>{  
192 - console.log(TAG,JSON.stringify(err))  
193 }) 196 })
194 } 197 }
195 getUserLevel(){ 198 getUserLevel(){
@@ -213,8 +216,6 @@ export default struct MinePageUserSimpleInfoUI { @@ -213,8 +216,6 @@ export default struct MinePageUserSimpleInfoUI {
213 UserDataLocal.setUserLevelHeaderUrl("") 216 UserDataLocal.setUserLevelHeaderUrl("")
214 } 217 }
215 } 218 }
216 - }).catch((err:Error)=>{  
217 - console.log(TAG,JSON.stringify(err))  
218 }) 219 })
219 } 220 }
220 221
@@ -19,18 +19,19 @@ export struct PagePersonFunction{ @@ -19,18 +19,19 @@ export struct PagePersonFunction{
19 if (this.item.isShowRedPoint) { 19 if (this.item.isShowRedPoint) {
20 Button() 20 Button()
21 .type(ButtonType.Circle) 21 .type(ButtonType.Circle)
22 - .width(`${this.calcHeight(12)}lpx`)  
23 - .height(`${this.calcHeight(12)}lpx`) 22 + .width(6)
  23 + .height(6)
24 .backgroundColor(this.navItem?.noticeColor.length > 0?this.navItem?.noticeColor:$r('app.color.color_ED2800')) 24 .backgroundColor(this.navItem?.noticeColor.length > 0?this.navItem?.noticeColor:$r('app.color.color_ED2800'))
25 } 25 }
26 - }.width(`${this.calcHeight(46)}lpx`)  
27 - .height(`${this.calcHeight(46)}lpx`) 26 + }
  27 + .width(24)
  28 + .height(24)
28 29
29 Text(`${this.item.msg}`) 30 Text(`${this.item.msg}`)
30 - .margin({top:`${this.calcHeight(8)}lpx`})  
31 - .height(`${this.calcHeight(23)}lpx`) 31 + .margin({top:4})
  32 + .lineHeight(12)
32 .fontColor(this.navItem?.homePageColor.length > 0?this.navItem.homePageColor:$r('app.color.color_222222')) 33 .fontColor(this.navItem?.homePageColor.length > 0?this.navItem.homePageColor:$r('app.color.color_222222'))
33 - .fontSize(`${this.calcHeight(23)}lpx`) 34 + .fontSize(12)
34 } 35 }
35 .alignItems(HorizontalAlign.Center) 36 .alignItems(HorizontalAlign.Center)
36 .width('100%') 37 .width('100%')
@@ -39,8 +40,8 @@ export struct PagePersonFunction{ @@ -39,8 +40,8 @@ export struct PagePersonFunction{
39 if(!this.noDivider){ 40 if(!this.noDivider){
40 Text().backgroundColor($r('app.color.color_222222')) 41 Text().backgroundColor($r('app.color.color_222222'))
41 .opacity(0.1) 42 .opacity(0.1)
42 - .width(`${this.calcHeight(2)}lpx`)  
43 - .height(`${this.calcHeight(29)}lpx`) 43 + .width(1)
  44 + .height(15)
44 } 45 }
45 } 46 }
46 } 47 }
@@ -46,15 +46,19 @@ export struct AppointmentListChildComponent { @@ -46,15 +46,19 @@ export struct AppointmentListChildComponent {
46 Row() { 46 Row() {
47 Row() { 47 Row() {
48 Image($r('app.media.reserve_icon')) 48 Image($r('app.media.reserve_icon'))
49 - .width('27lpx')  
50 - .height('27lpx') 49 + // .width('27lpx')
  50 + .width(27)
  51 + // .height('27lpx')
  52 + .height(27)
51 .objectFit(ImageFit.Auto) 53 .objectFit(ImageFit.Auto)
52 .interpolation(ImageInterpolation.High) 54 .interpolation(ImageInterpolation.High)
53 - .margin({right:"6lpx"}) 55 + // .margin({right:"6lpx"})
  56 + .margin({right: 6})
54 57
55 Text("预约") 58 Text("预约")
56 .fontWeight(400) 59 .fontWeight(400)
57 - .fontSize('23lpx') 60 + // .fontSize('23lpx')
  61 + .fontSize(23)
58 .textShadow({ 62 .textShadow({
59 radius: 2, 63 radius: 2,
60 color: `rgba(0,0,0,0.3)`, 64 color: `rgba(0,0,0,0.3)`,
@@ -62,11 +66,15 @@ export struct AppointmentListChildComponent { @@ -62,11 +66,15 @@ export struct AppointmentListChildComponent {
62 offsetX:0 66 offsetX:0
63 }) 67 })
64 .fontColor($r('app.color.white')) 68 .fontColor($r('app.color.white'))
65 - .lineHeight('31lpx') 69 + // .lineHeight('31lpx')
  70 + .lineHeight(31)
66 .layoutWeight(1) 71 .layoutWeight(1)
67 .textAlign(TextAlign.Start) 72 .textAlign(TextAlign.Start)
68 - }.width('94lpx')  
69 - .margin({ bottom: '15lpx', right: '15lpx' }) 73 + }
  74 + // .width('94lpx')
  75 + .width(94)
  76 + // .margin({ bottom: '15lpx', right: '15lpx' })
  77 + .margin({ bottom: 15, right: 15 })
70 .alignItems(VerticalAlign.Center) 78 .alignItems(VerticalAlign.Center)
71 }.width('100%') 79 }.width('100%')
72 .height('100%') 80 .height('100%')
@@ -74,17 +82,22 @@ export struct AppointmentListChildComponent { @@ -74,17 +82,22 @@ export struct AppointmentListChildComponent {
74 .justifyContent(FlexAlign.End) 82 .justifyContent(FlexAlign.End)
75 } 83 }
76 }.width('100%') 84 }.width('100%')
77 - .height('376lpx') 85 + // .height('376lpx')
  86 + .height(376)
78 87
79 Column() { 88 Column() {
80 Text(this.item.title) 89 Text(this.item.title)
81 - .fontWeight('400lpx')  
82 - .fontSize('33lpx') 90 + // .fontWeight('400lpx')
  91 + .fontWeight(400)
  92 + // .fontSize('33lpx')
  93 + .fontSize(33)
83 .fontColor($r('app.color.color_222222')) 94 .fontColor($r('app.color.color_222222'))
84 - .lineHeight('48lpx') 95 + // .lineHeight('48lpx')
  96 + .lineHeight(48)
85 .maxLines(2) 97 .maxLines(2)
86 .textOverflow({ overflow: TextOverflow.Ellipsis }) 98 .textOverflow({ overflow: TextOverflow.Ellipsis })
87 - .margin({ bottom: '23lpx' }) 99 + // .margin({ bottom: '23lpx' })
  100 + .margin({ bottom: 23 })
88 .textAlign(TextAlign.Start) 101 .textAlign(TextAlign.Start)
89 .width('100%') 102 .width('100%')
90 Row() { 103 Row() {
@@ -93,109 +106,153 @@ export struct AppointmentListChildComponent { @@ -93,109 +106,153 @@ export struct AppointmentListChildComponent {
93 Image($r('app.media.play_status_history_icon')) 106 Image($r('app.media.play_status_history_icon'))
94 .objectFit(ImageFit.Auto) 107 .objectFit(ImageFit.Auto)
95 .interpolation(ImageInterpolation.High) 108 .interpolation(ImageInterpolation.High)
96 - .width('38lpx')  
97 - .height('38lpx')  
98 - .margin({ right: '12lpx' }) 109 + // .width('38lpx')
  110 + .width(38)
  111 + // .height('38lpx')
  112 + .height(38)
  113 + // .margin({ right: '12lpx' })
  114 + .margin({ right: 12 })
99 Text('已结束').fontColor($r('app.color.color_999999')) 115 Text('已结束').fontColor($r('app.color.color_999999'))
100 - .fontWeight('500lpx')  
101 - .fontSize('23lpx') 116 + // .fontWeight('500lpx')
  117 + .fontWeight(500)
  118 + // .fontSize('23lpx')
  119 + .fontSize(23)
102 }else if(this.item.status == "running"){ 120 }else if(this.item.status == "running"){
103 Image($r('app.media.play_status_icon')) 121 Image($r('app.media.play_status_icon'))
104 .objectFit(ImageFit.Auto) 122 .objectFit(ImageFit.Auto)
105 .interpolation(ImageInterpolation.High) 123 .interpolation(ImageInterpolation.High)
106 - .width('38lpx')  
107 - .height('38lpx')  
108 - .margin({ right: '12lpx' }) 124 + // .width('38lpx')
  125 + .width(38)
  126 + // .height('38lpx')
  127 + .height(38)
  128 + // .margin({ right: '12lpx' })
  129 + .margin({ right: 12 })
109 Text('已开始').fontColor($r('app.color.color_999999')) 130 Text('已开始').fontColor($r('app.color.color_999999'))
110 - .fontWeight('500lpx')  
111 - .fontSize('23lpx') 131 + // .fontWeight('500lpx')
  132 + .fontWeight(500)
  133 + // .fontSize('23lpx')
  134 + .fontSize(23)
112 } else { 135 } else {
113 Image($r('app.media.play_status_icon')) 136 Image($r('app.media.play_status_icon'))
114 .objectFit(ImageFit.Auto) 137 .objectFit(ImageFit.Auto)
115 .interpolation(ImageInterpolation.High) 138 .interpolation(ImageInterpolation.High)
116 - .width('38lpx')  
117 - .height('38lpx')  
118 - .margin({ right: '12lpx' }) 139 + // .width('38lpx')
  140 + .width(38)
  141 + // .height('38lpx')
  142 + .height(38)
  143 + // .margin({ right: '12lpx' })
  144 + .margin({ right: 12 })
119 Text(this.item.timePre).fontColor($r('app.color.color_ED2800')) 145 Text(this.item.timePre).fontColor($r('app.color.color_ED2800'))
120 - .fontWeight('500lpx')  
121 - .fontSize('23lpx') 146 + // .fontWeight('500lpx')
  147 + .fontWeight(500)
  148 + // .fontSize('23lpx')
  149 + .fontSize(23)
122 Image($r('app.media.point_icon')) 150 Image($r('app.media.point_icon'))
123 .objectFit(ImageFit.Auto) 151 .objectFit(ImageFit.Auto)
124 .interpolation(ImageInterpolation.High) 152 .interpolation(ImageInterpolation.High)
125 - .width('12lpx')  
126 - .height('31lpx')  
127 - .margin({ right: '4lpx' }) 153 + // .width('12lpx')
  154 + .width(12)
  155 + // .height('31lpx')
  156 + .height(31)
  157 + // .margin({ right: '4lpx' })
  158 + .margin({ right: 4 })
128 Text(`${this.item.timeBack}开始`).fontColor($r('app.color.color_ED2800')) 159 Text(`${this.item.timeBack}开始`).fontColor($r('app.color.color_ED2800'))
129 - .fontWeight('500lpx')  
130 - .fontSize('23lpx')  
131 - .lineHeight('31lpx') 160 + // .fontWeight('500lpx')
  161 + .fontWeight(500)
  162 + // .fontSize('23lpx')
  163 + .fontSize(23)
  164 + // .lineHeight('31lpx')
  165 + .lineHeight(31)
132 } 166 }
133 } 167 }
134 - .padding({ left: '19lpx', right: '19lpx' })  
135 - .height('46lpx') 168 + // .padding({ left: '19lpx', right: '19lpx' })
  169 + .padding({ left: 19, right: 19 })
  170 + // .height('46lpx')
  171 + .height(46)
136 .alignItems(VerticalAlign.Center) 172 .alignItems(VerticalAlign.Center)
137 .backgroundColor($r('app.color.color_F5F5F5')) 173 .backgroundColor($r('app.color.color_F5F5F5'))
138 - .borderRadius('4lpx') 174 + // .borderRadius('4lpx')
  175 + .borderRadius(4)
139 176
140 Blank() 177 Blank()
141 .layoutWeight(1) 178 .layoutWeight(1)
142 if (this.item.status === "wait") { 179 if (this.item.status === "wait") {
143 Text(this.item.isAppointment ? "已预约" : "预约") 180 Text(this.item.isAppointment ? "已预约" : "预约")
144 .fontWeight(400) 181 .fontWeight(400)
145 - .fontSize('23lpx') 182 + // .fontSize('23lpx')
  183 + .fontSize(23)
146 .backgroundColor(this.item.isAppointment ? $r('app.color.color_F5F5F5') : $r('app.color.color_ED2800')) 184 .backgroundColor(this.item.isAppointment ? $r('app.color.color_F5F5F5') : $r('app.color.color_ED2800'))
147 .fontColor(this.item.isAppointment ? $r('app.color.color_CCCCCC') : $r('app.color.white')) 185 .fontColor(this.item.isAppointment ? $r('app.color.color_CCCCCC') : $r('app.color.white'))
148 - .lineHeight('31lpx') 186 + // .lineHeight('31lpx')
  187 + .lineHeight(31)
149 .textAlign(TextAlign.Center) 188 .textAlign(TextAlign.Center)
150 - .width('100lpx')  
151 - .height('46lpx')  
152 - .borderRadius('6lpx') 189 + // .width('100lpx')
  190 + .width(100)
  191 + // .height('46lpx')
  192 + .height(46)
  193 + // .borderRadius('6lpx')
  194 + .borderRadius(6)
153 .onClick(() => { 195 .onClick(() => {
154 this.dialogController.open() 196 this.dialogController.open()
155 }) 197 })
156 }else if(this.item.status == "running"){ 198 }else if(this.item.status == "running"){
157 Text("去观看" ) 199 Text("去观看" )
158 .fontWeight(400) 200 .fontWeight(400)
159 - .fontSize('23lpx') 201 + // .fontSize('23lpx')
  202 + .fontSize(23)
160 .backgroundColor($r('app.color.color_ED2800')) 203 .backgroundColor($r('app.color.color_ED2800'))
161 .fontColor($r('app.color.white')) 204 .fontColor($r('app.color.white'))
162 - .lineHeight('31lpx') 205 + // .lineHeight('31lpx')
  206 + .lineHeight(31)
163 .textAlign(TextAlign.Center) 207 .textAlign(TextAlign.Center)
164 - .width('100lpx')  
165 - .height('46lpx')  
166 - .borderRadius('6lpx') 208 + // .width('100lpx')
  209 + .width(100)
  210 + // .height('46lpx')
  211 + .height(46)
  212 + // .borderRadius('6lpx')
  213 + .borderRadius(6)
167 } else { 214 } else {
168 Text("看回放") 215 Text("看回放")
169 .fontWeight(400) 216 .fontWeight(400)
170 - .fontSize('23lpx') 217 + // .fontSize('23lpx')
  218 + .fontSize(23)
171 .backgroundColor($r('app.color.color_ED2800')) 219 .backgroundColor($r('app.color.color_ED2800'))
172 .fontColor($r('app.color.white')) 220 .fontColor($r('app.color.white'))
173 - .lineHeight('31lpx') 221 + // .lineHeight('31lpx')
  222 + .lineHeight(31)
174 .textAlign(TextAlign.Center) 223 .textAlign(TextAlign.Center)
175 - .width('100lpx')  
176 - .height('46lpx')  
177 - .borderRadius('6lpx') 224 + // .width('100lpx')
  225 + .width(100)
  226 + // .height('46lpx')
  227 + .height(46)
  228 + // .borderRadius('6lpx')
  229 + .borderRadius(6)
178 } 230 }
179 } 231 }
180 } 232 }
181 .padding({ 233 .padding({
182 - left: '23lpx',  
183 - right: '23lpx',  
184 - top: '15lpx',  
185 - bottom: '23lpx' 234 + // left: '23lpx',
  235 + left: 23,
  236 + // right: '23lpx',
  237 + right: 23,
  238 + // top: '15lpx',
  239 + top: 15,
  240 + // bottom: '23lpx'
  241 + bottom: 23
186 }) 242 })
187 }.margin({ left: 10, right: 10 }) 243 }.margin({ left: 10, right: 10 })
188 .backgroundColor($r('app.color.white')) 244 .backgroundColor($r('app.color.white'))
189 - .borderRadius('8lpx') 245 + // .borderRadius('8lpx')
  246 + .borderRadius(8)
190 // } 247 // }
191 } 248 }
192 249
193 onCancel() { 250 onCancel() {
194 - console.info('Callback when the first button is clicked') 251 + // console.info('Callback when the first button is clicked')
195 } 252 }
196 253
197 onAccept() { 254 onAccept() {
198 - console.info('Callback when the second button is clicked') 255 + // console.info('Callback when the second button is clicked')
199 this.appointmentOperation() 256 this.appointmentOperation()
200 } 257 }
201 258
@@ -140,7 +140,8 @@ export struct AppointmentListUI { @@ -140,7 +140,8 @@ export struct AppointmentListUI {
140 .cachedCount(4) 140 .cachedCount(4)
141 .scrollBar(BarState.Off) 141 .scrollBar(BarState.Off)
142 .edgeEffect(EdgeEffect.None) 142 .edgeEffect(EdgeEffect.None)
143 - .margin({ top: '23lpx', left: '23lpx', right: '23lpx'}) 143 + // .margin({ top: '23lpx', left: '23lpx', right: '23lpx'})
  144 + .margin({ top: 23, left: 23, right: 23})
144 .layoutWeight(1) 145 .layoutWeight(1)
145 } 146 }
146 147
@@ -176,7 +177,7 @@ export struct AppointmentListUI { @@ -176,7 +177,7 @@ export struct AppointmentListUI {
176 this.isGetRequest = true 177 this.isGetRequest = true
177 this.isLoading = false 178 this.isLoading = false
178 }).catch((err: Error) => { 179 }).catch((err: Error) => {
179 - console.log(TAG, JSON.stringify(err)) 180 + // console.log(TAG, JSON.stringify(err))
180 this.isGetRequest = true 181 this.isGetRequest = true
181 this.isLoading = false 182 this.isLoading = false
182 }) 183 })
@@ -187,12 +188,12 @@ export struct AppointmentListUI { @@ -187,12 +188,12 @@ export struct AppointmentListUI {
187 let dealData: string[] = [] 188 let dealData: string[] = []
188 189
189 if (!StringUtils.isNotEmpty(planStartTime)) { 190 if (!StringUtils.isNotEmpty(planStartTime)) {
190 - console.log(TAG, "格式有误") 191 + // console.log(TAG, "格式有误")
191 return dealData 192 return dealData
192 } 193 }
193 194
194 if (planStartTime.indexOf(" ") === -1) { 195 if (planStartTime.indexOf(" ") === -1) {
195 - console.log(TAG, "格式有误") 196 + // console.log(TAG, "格式有误")
196 return dealData 197 return dealData
197 } 198 }
198 let arr = planStartTime.split(" ") 199 let arr = planStartTime.split(" ")
@@ -217,7 +218,7 @@ export struct AppointmentListUI { @@ -217,7 +218,7 @@ export struct AppointmentListUI {
217 dealData[1] = `${time[0]}:${time[1]}` 218 dealData[1] = `${time[0]}:${time[1]}`
218 } 219 }
219 } 220 }
220 - console.log(TAG, JSON.stringify(dealData)) 221 + // console.log(TAG, JSON.stringify(dealData))
221 return dealData 222 return dealData
222 } 223 }
223 } 224 }
@@ -31,42 +31,62 @@ export struct FollowChildComponent{ @@ -31,42 +31,62 @@ 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 - .height('92lpx') 34 + // .width('92lpx')
  35 + .width(92)
  36 + // .height('92lpx')
  37 + .height(92)
36 .borderRadius(50) 38 .borderRadius(50)
37 - .borderWidth('1lpx') 39 + // .borderWidth('1lpx')
  40 + .borderWidth(1)
38 .borderColor($r('app.color.color_0D000000')) 41 .borderColor($r('app.color.color_0D000000'))
39 Row(){ 42 Row(){
40 Image(this.data.authIcon) 43 Image(this.data.authIcon)
41 - .width('32lpx')  
42 - .height('32lpx') 44 + // .width('32lpx')
  45 + .width(32)
  46 + // .height('32lpx')
  47 + .height(32)
43 .objectFit(ImageFit.Cover) 48 .objectFit(ImageFit.Cover)
44 - }.width('92lpx') 49 + }
  50 + // .width('92lpx')
  51 + .width(92)
45 .justifyContent(FlexAlign.End) 52 .justifyContent(FlexAlign.End)
46 - }.width('92lpx')  
47 - .height('92lpx')  
48 - .margin({right:'15lpx'}) 53 + }
  54 + // .width('92lpx')
  55 + .width(92)
  56 + // .height('92lpx')
  57 + .height(92)
  58 + // .margin({right:'15lpx'})
  59 + .margin({right: 15})
49 60
50 61
51 Column(){ 62 Column(){
52 Text(this.data.cnUserName) 63 Text(this.data.cnUserName)
53 - .fontWeight('400lpx')  
54 - .fontSize('31lpx')  
55 - .lineHeight('38lpx') 64 + // .fontWeight('400lpx')
  65 + .fontWeight(400)
  66 + // .fontSize('31lpx')
  67 + .fontSize(31)
  68 + // .lineHeight('38lpx')
  69 + .lineHeight(38)
56 .fontColor($r('app.color.color_222222')) 70 .fontColor($r('app.color.color_222222'))
57 .maxLines(1) 71 .maxLines(1)
58 - .margin({bottom:'8lpx'}) 72 + // .margin({bottom:'8lpx'})
  73 + .margin({bottom: 8})
59 74
60 Text(`粉丝${this.data.cnFansNum}`) 75 Text(`粉丝${this.data.cnFansNum}`)
61 .fontColor($r('app.color.color_B0B0B0')) 76 .fontColor($r('app.color.color_B0B0B0'))
62 - .fontSize('23lpx')  
63 - .fontWeight('400lpx')  
64 - .lineHeight('31lpx')  
65 - .margin({bottom:'8lpx'}) 77 + // .fontSize('23lpx')
  78 + .fontSize(23)
  79 + // .fontWeight('400lpx')
  80 + .fontWeight(400)
  81 + // .lineHeight('31lpx')
  82 + .lineHeight(31)
  83 + // .margin({bottom:'8lpx'})
  84 + .margin({bottom: 8})
66 85
67 Text(`${this.data.introduction}`) 86 Text(`${this.data.introduction}`)
68 .fontColor($r('app.color.color_B0B0B0')) 87 .fontColor($r('app.color.color_B0B0B0'))
69 - .fontSize('23lpx') 88 + // .fontSize('23lpx')
  89 + .fontSize(23)
70 .maxLines(2) 90 .maxLines(2)
71 .textAlign(TextAlign.Start) 91 .textAlign(TextAlign.Start)
72 .textOverflow({ overflow: TextOverflow.Ellipsis }) 92 .textOverflow({ overflow: TextOverflow.Ellipsis })
@@ -90,22 +110,30 @@ export struct FollowChildComponent{ @@ -90,22 +110,30 @@ export struct FollowChildComponent{
90 }else { 110 }else {
91 Text(`已关注`) 111 Text(`已关注`)
92 .fontColor($r('app.color.color_CCCCCC')) 112 .fontColor($r('app.color.color_CCCCCC'))
93 - .fontSize('23lpx')  
94 - .fontWeight('500lpx')  
95 - .lineHeight('35lpx') 113 + // .fontSize('23lpx')
  114 + .fontSize(23)
  115 + // .fontWeight('500lpx')
  116 + .fontWeight(500)
  117 + // .lineHeight('35lpx')
  118 + .lineHeight(35)
96 } 119 }
97 } 120 }
98 .justifyContent(FlexAlign.Center) 121 .justifyContent(FlexAlign.Center)
99 - .width('100lpx') 122 + // .width('100lpx')
  123 + .width(100)
100 .backgroundColor($r("app.color.color_F5F5F5")) 124 .backgroundColor($r("app.color.color_F5F5F5"))
101 - .borderRadius("6lpx")  
102 - .height('46lpx') 125 + // .borderRadius("6lpx")
  126 + .borderRadius(6)
  127 + // .height('46lpx')
  128 + .height(46)
103 .onClick(()=>{ 129 .onClick(()=>{
104 if (this.isLoadingAttention) return 130 if (this.isLoadingAttention) return
105 this.isLoadingAttention = true 131 this.isLoadingAttention = true
106 132
107 this.followOperation() 133 this.followOperation()
108 - }).margin({top:'29lpx'}) 134 + })
  135 + // .margin({top:'29lpx'})
  136 + .margin({top: 29})
109 }else{ 137 }else{
110 Row(){ 138 Row(){
111 if(this.isLoadingAttention) { 139 if(this.isLoadingAttention) {
@@ -115,23 +143,34 @@ export struct FollowChildComponent{ @@ -115,23 +143,34 @@ export struct FollowChildComponent{
115 .color($r('app.color.main_red')) 143 .color($r('app.color.main_red'))
116 }else { 144 }else {
117 Image($r('app.media.follow_icon')) 145 Image($r('app.media.follow_icon'))
118 - .margin({right:'4lpx'})  
119 - .width('23lpx')  
120 - .height('23lpx') 146 + // .margin({right:'4lpx'})
  147 + .margin({right: 4})
  148 + // .width('23lpx')
  149 + .width(23)
  150 + // .height('23lpx')
  151 + .height(23)
121 Text(`关注`) 152 Text(`关注`)
122 .fontColor($r('app.color.color_ED2800')) 153 .fontColor($r('app.color.color_ED2800'))
123 - .fontSize('23lpx')  
124 - .fontWeight('500lpx')  
125 - .lineHeight('35lpx') 154 + // .fontSize('23lpx')
  155 + .fontSize(23)
  156 + // .fontWeight('500lpx')
  157 + .fontWeight(500)
  158 + // .lineHeight('35lpx')
  159 + .lineHeight(35)
126 } 160 }
127 161
128 }.borderColor($r('app.color.color_1AED2800')) 162 }.borderColor($r('app.color.color_1AED2800'))
129 - .borderRadius('6lpx')  
130 - .borderWidth('2lpx') 163 + // .borderRadius('6lpx')
  164 + .borderRadius(6)
  165 + // .borderWidth('2lpx')
  166 + .borderWidth(2)
131 .justifyContent(FlexAlign.Center) 167 .justifyContent(FlexAlign.Center)
132 - .width('100lpx')  
133 - .height('46lpx')  
134 - .margin({top:'29lpx'}) 168 + // .width('100lpx')
  169 + .width(100)
  170 + // .height('46lpx')
  171 + .height(46)
  172 + // .margin({top:'29lpx'})
  173 + .margin({top: 29})
135 .onClick(()=>{ 174 .onClick(()=>{
136 if (this.isLoadingAttention) return 175 if (this.isLoadingAttention) return
137 this.isLoadingAttention = true 176 this.isLoadingAttention = true
@@ -140,19 +179,24 @@ export struct FollowChildComponent{ @@ -140,19 +179,24 @@ export struct FollowChildComponent{
140 }) 179 })
141 } 180 }
142 } 181 }
143 - .padding({top:'27lpx'}) 182 + // .padding({top:'27lpx'})
  183 + .padding({top: 27})
144 .width('100%') 184 .width('100%')
145 .justifyContent(FlexAlign.SpaceBetween) 185 .justifyContent(FlexAlign.SpaceBetween)
146 .alignItems(VerticalAlign.Top) 186 .alignItems(VerticalAlign.Top)
147 187
148 - }.height(`${this.columnHeight}lpx`) 188 + }
  189 + // .height(`${this.columnHeight}lpx`)
  190 + .height(`${this.columnHeight}`)
149 .justifyContent(FlexAlign.Start) 191 .justifyContent(FlexAlign.Start)
150 192
151 Divider() 193 Divider()
152 .width('100%') 194 .width('100%')
153 - .height('2lpx') 195 + // .height('2lpx')
  196 + .height(2)
154 .color($r('app.color.color_F5F5F5')) 197 .color($r('app.color.color_F5F5F5'))
155 - .strokeWidth('1lpx') 198 + // .strokeWidth('1lpx')
  199 + .strokeWidth(1)
156 }.width('100%') 200 }.width('100%')
157 201
158 }else { 202 }else {
@@ -164,46 +208,65 @@ export struct FollowChildComponent{ @@ -164,46 +208,65 @@ export struct FollowChildComponent{
164 Stack({alignContent: Alignment.Bottom}){ 208 Stack({alignContent: Alignment.Bottom}){
165 Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.icon_default_head_mater'):this.data.headPhotoUrl) 209 Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.icon_default_head_mater'):this.data.headPhotoUrl)
166 .objectFit(ImageFit.Auto) 210 .objectFit(ImageFit.Auto)
167 - .width('92lpx')  
168 - .height('92lpx') 211 + // .width('92lpx')
  212 + .width(92)
  213 + // .height('92lpx')
  214 + .height(92)
169 .borderRadius(50) 215 .borderRadius(50)
170 - .borderWidth('1lpx') 216 + // .borderWidth('1lpx')
  217 + .borderWidth(1)
171 .borderColor($r('app.color.color_0D000000')) 218 .borderColor($r('app.color.color_0D000000'))
172 Row(){ 219 Row(){
173 Image(this.data.authIcon) 220 Image(this.data.authIcon)
174 - .width('32lpx')  
175 - .height('32lpx') 221 + // .width('32lpx')
  222 + .width(32)
  223 + // .height('32lpx')
  224 + .height(32)
176 .objectFit(ImageFit.Cover) 225 .objectFit(ImageFit.Cover)
177 - }.width('92lpx') 226 + }
  227 + // .width('92lpx')
  228 + .width(92)
178 .justifyContent(FlexAlign.End) 229 .justifyContent(FlexAlign.End)
179 - }.width('92lpx')  
180 - .height('92lpx')  
181 - .margin({right:'15lpx'}) 230 + }
  231 + // .width('92lpx')
  232 + .width(92)
  233 + // .height('92lpx')
  234 + .height(92)
  235 + // .margin({right:'15lpx'})
  236 + .margin({right: 15})
182 237
183 Column(){ 238 Column(){
184 Text(this.data.cnUserName) 239 Text(this.data.cnUserName)
185 - .fontWeight('400lpx')  
186 - .fontSize('31lpx')  
187 - .lineHeight('38lpx') 240 + // .fontWeight('400lpx')
  241 + .fontWeight(400)
  242 + // .fontSize('31lpx')
  243 + .fontSize(31)
  244 + // .lineHeight('38lpx')
  245 + .lineHeight(38)
188 .fontColor($r('app.color.color_222222')) 246 .fontColor($r('app.color.color_222222'))
189 .maxLines(1) 247 .maxLines(1)
190 - .margin({bottom:'12lpx'}) 248 + // .margin({bottom:'12lpx'})
  249 + .margin({bottom: 12})
191 Row(){ 250 Row(){
192 if(this.data.cnFansNum!="0"){ 251 if(this.data.cnFansNum!="0"){
193 Text(`粉丝${this.data.cnFansNum}`) 252 Text(`粉丝${this.data.cnFansNum}`)
194 .fontColor($r('app.color.color_B0B0B0')) 253 .fontColor($r('app.color.color_B0B0B0'))
195 - .fontSize('23lpx') 254 + // .fontSize('23lpx')
  255 + .fontSize(23)
196 } 256 }
197 if(this.data.cnFansNum!="0" && StringUtils.isNotEmpty(this.data.introduction)){ 257 if(this.data.cnFansNum!="0" && StringUtils.isNotEmpty(this.data.introduction)){
198 Image($r("app.media.point")) 258 Image($r("app.media.point"))
199 - .width('31lpx')  
200 - .height('31lpx') 259 + // .width('31lpx')
  260 + .width(31)
  261 + // .height('31lpx')
  262 + .height(31)
201 .objectFit(ImageFit.Auto) 263 .objectFit(ImageFit.Auto)
202 } 264 }
203 265
204 Text(`${this.data.introduction}`) 266 Text(`${this.data.introduction}`)
205 .fontColor($r('app.color.color_B0B0B0')) 267 .fontColor($r('app.color.color_B0B0B0'))
206 - .fontSize('23lpx') 268 + // .fontSize('23lpx')
  269 + .fontSize(23)
207 .layoutWeight(1) 270 .layoutWeight(1)
208 .maxLines(1) 271 .maxLines(1)
209 .textOverflow({ overflow: TextOverflow.Ellipsis }) 272 .textOverflow({ overflow: TextOverflow.Ellipsis })
@@ -229,16 +292,22 @@ export struct FollowChildComponent{ @@ -229,16 +292,22 @@ export struct FollowChildComponent{
229 }else { 292 }else {
230 Text(`已关注`) 293 Text(`已关注`)
231 .fontColor($r('app.color.color_CCCCCC')) 294 .fontColor($r('app.color.color_CCCCCC'))
232 - .fontSize('23lpx')  
233 - .fontWeight('500lpx')  
234 - .lineHeight('35lpx') 295 + // .fontSize('23lpx')
  296 + .fontSize(23)
  297 + // .fontWeight('500lpx')
  298 + .fontWeight(500)
  299 + // .lineHeight('35lpx')
  300 + .lineHeight(35)
235 } 301 }
236 } 302 }
237 .backgroundColor($r("app.color.color_F5F5F5")) 303 .backgroundColor($r("app.color.color_F5F5F5"))
238 .justifyContent(FlexAlign.Center) 304 .justifyContent(FlexAlign.Center)
239 - .borderRadius("6lpx")  
240 - .width('100lpx')  
241 - .height('46lpx') 305 + // .borderRadius("6lpx")
  306 + .borderRadius(6)
  307 + // .width('100lpx')
  308 + .width(100)
  309 + // .height('46lpx')
  310 + .height(46)
242 .onClick(()=>{ 311 .onClick(()=>{
243 if (this.isLoadingAttention) return 312 if (this.isLoadingAttention) return
244 this.isLoadingAttention = true 313 this.isLoadingAttention = true
@@ -254,21 +323,31 @@ export struct FollowChildComponent{ @@ -254,21 +323,31 @@ export struct FollowChildComponent{
254 .color($r('app.color.main_red')) 323 .color($r('app.color.main_red'))
255 }else { 324 }else {
256 Image($r('app.media.follow_icon')) 325 Image($r('app.media.follow_icon'))
257 - .margin({right:'4lpx'})  
258 - .width('23lpx')  
259 - .height('23lpx') 326 + // .margin({right:'4lpx'})
  327 + .margin({right: 4})
  328 + // .width('23lpx')
  329 + .width(23)
  330 + // .height('23lpx')
  331 + .height(23)
260 Text(`关注`) 332 Text(`关注`)
261 .fontColor($r('app.color.color_ED2800')) 333 .fontColor($r('app.color.color_ED2800'))
262 - .fontSize('23lpx')  
263 - .fontWeight('500lpx')  
264 - .lineHeight('35lpx') 334 + // .fontSize('23lpx')
  335 + .fontSize(23)
  336 + // .fontWeight('500lpx')
  337 + .fontWeight(500)
  338 + // .lineHeight('35lpx')
  339 + .lineHeight(35)
265 } 340 }
266 }.borderColor($r('app.color.color_1AED2800')) 341 }.borderColor($r('app.color.color_1AED2800'))
267 - .borderRadius('6lpx')  
268 - .borderWidth('2lpx') 342 + // .borderRadius('6lpx')
  343 + .borderRadius(6)
  344 + // .borderWidth('2lpx')
  345 + .borderWidth(2)
269 .justifyContent(FlexAlign.Center) 346 .justifyContent(FlexAlign.Center)
270 - .width('100lpx')  
271 - .height('46lpx') 347 + // .width('100lpx')
  348 + .width(100)
  349 + // .height('46lpx')
  350 + .height(46)
272 .onClick(()=>{ 351 .onClick(()=>{
273 if (this.isLoadingAttention) return 352 if (this.isLoadingAttention) return
274 this.isLoadingAttention = true 353 this.isLoadingAttention = true
@@ -279,17 +358,22 @@ export struct FollowChildComponent{ @@ -279,17 +358,22 @@ export struct FollowChildComponent{
279 } 358 }
280 } 359 }
281 .width('100%') 360 .width('100%')
282 - .height('92lpx') 361 + // .height('92lpx')
  362 + .height(92)
283 .justifyContent(FlexAlign.SpaceBetween) 363 .justifyContent(FlexAlign.SpaceBetween)
284 364
285 - }.height('146lpx') 365 + }
  366 + // .height('146lpx')
  367 + .height(146)
286 .justifyContent(FlexAlign.Center) 368 .justifyContent(FlexAlign.Center)
287 369
288 Divider() 370 Divider()
289 .width('100%') 371 .width('100%')
290 - .height('2lpx') 372 + // .height('2lpx')
  373 + .height(2)
291 .color($r('app.color.color_F5F5F5')) 374 .color($r('app.color.color_F5F5F5'))
292 - .strokeWidth('1lpx') 375 + // .strokeWidth('1lpx')
  376 + .strokeWidth(1)
293 }.width('100%') 377 }.width('100%')
294 378
295 } 379 }
@@ -39,8 +39,6 @@ export struct FollowFirstTabsComponent{ @@ -39,8 +39,6 @@ export struct FollowFirstTabsComponent{
39 if(this.swiperController != null && this.data.length>1 && this.changeIndex === 1){ 39 if(this.swiperController != null && this.data.length>1 && this.changeIndex === 1){
40 this.jumpFollowNextPage() 40 this.jumpFollowNextPage()
41 } 41 }
42 - }).catch((err:Error)=>{  
43 - console.log(TAG,JSON.stringify(err))  
44 }) 42 })
45 } 43 }
46 44
@@ -56,19 +54,26 @@ export struct FollowFirstTabsComponent{ @@ -56,19 +54,26 @@ export struct FollowFirstTabsComponent{
56 @Builder TabBuilder(index: number, item: FollowListItem) { 54 @Builder TabBuilder(index: number, item: FollowListItem) {
57 Stack(){ 55 Stack(){
58 Text(item.directoryName) 56 Text(item.directoryName)
59 - .height('38lpx')  
60 - .fontSize('33lpx') 57 + // .height('38lpx')
  58 + .height(38)
  59 + // .fontSize('33lpx')
  60 + .fontSize(33)
61 .fontWeight(this.currentIndex === index ? 600 : 400) 61 .fontWeight(this.currentIndex === index ? 600 : 400)
62 .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor) 62 .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
63 - .lineHeight('38lpx') 63 + // .lineHeight('38lpx')
  64 + .lineHeight(38)
64 65
65 if(this.currentIndex === index){ 66 if(this.currentIndex === index){
66 Divider() 67 Divider()
67 - .width('31lpx')  
68 - .height('4lpx') 68 + // .width('31lpx')
  69 + .width(31)
  70 + // .height('4lpx')
  71 + .height(4)
69 .color('#ED2800') 72 .color('#ED2800')
70 - .strokeWidth('4lpx')  
71 - .margin({top:'50lpx'}) 73 + // .strokeWidth('4lpx')
  74 + .strokeWidth(4)
  75 + // .margin({top:'50lpx'})
  76 + .margin({top: 50})
72 .id("divTag") 77 .id("divTag")
73 } 78 }
74 }.onClick(()=>{ 79 }.onClick(()=>{
@@ -78,8 +83,10 @@ export struct FollowFirstTabsComponent{ @@ -78,8 +83,10 @@ export struct FollowFirstTabsComponent{
78 trackTabFirstClick(item.directoryName) 83 trackTabFirstClick(item.directoryName)
79 }) 84 })
80 .height('100%') 85 .height('100%')
81 - .margin({right:'9lpx'})  
82 - .padding({left:'31lpx',right:index === this.data.length-1?"31lpx":"0lpx"}) 86 + // .margin({right:'9lpx'})
  87 + .margin({right: 9})
  88 + // .padding({left:'31lpx',right:index === this.data.length-1?"31lpx":"0lpx"})
  89 + .padding({left: 31,right:index === this.data.length-1 ? 31 : 0})
83 } 90 }
84 91
85 build() { 92 build() {
@@ -104,7 +111,8 @@ export struct FollowFirstTabsComponent{ @@ -104,7 +111,8 @@ export struct FollowFirstTabsComponent{
104 }.listDirection(Axis.Horizontal) 111 }.listDirection(Axis.Horizontal)
105 .backgroundColor($r('app.color.white')) 112 .backgroundColor($r('app.color.white'))
106 .width("100%") 113 .width("100%")
107 - .height("84lpx") 114 + .height(84)
  115 + // .height("84lpx")
108 .edgeEffect(EdgeEffect.None) 116 .edgeEffect(EdgeEffect.None)
109 .scrollBar(BarState.Off) 117 .scrollBar(BarState.Off)
110 118
@@ -99,16 +99,18 @@ export struct FollowListDetailUI { @@ -99,16 +99,18 @@ export struct FollowListDetailUI {
99 ListItem() { 99 ListItem() {
100 ListHasNoMoreDataUI() 100 ListHasNoMoreDataUI()
101 } 101 }
102 - .margin({bottom:"40lpx"}) 102 + // .margin({bottom:"40lpx"})
  103 + .margin({bottom: 40})
103 } 104 }
104 } 105 }
105 .edgeEffect(EdgeEffect.None) 106 .edgeEffect(EdgeEffect.None)
106 .cachedCount(5) 107 .cachedCount(5)
107 - .padding({ left: '31lpx', right: '31lpx' }) 108 + // .padding({ left: '31lpx', right: '31lpx' })
  109 + .padding({ left: 31, right: 31 })
108 .layoutWeight(1) 110 .layoutWeight(1)
109 .scrollBar(BarState.Off) 111 .scrollBar(BarState.Off)
110 .onReachEnd(() => { 112 .onReachEnd(() => {
111 - console.log(TAG, "触底了"); 113 + // console.log(TAG, "触底了");
112 if (!this.isLoading) { 114 if (!this.isLoading) {
113 this.isLoading = true 115 this.isLoading = true
114 //加载分页数据 116 //加载分页数据
@@ -173,7 +175,7 @@ export struct FollowListDetailUI { @@ -173,7 +175,7 @@ export struct FollowListDetailUI {
173 this.isGetRequest = true 175 this.isGetRequest = true
174 this.sendFollowMessage() 176 this.sendFollowMessage()
175 }).catch((err: Error) => { 177 }).catch((err: Error) => {
176 - console.log(TAG, "请求失败") 178 + // console.log(TAG, "请求失败")
177 this.isGetRequest = true 179 this.isGetRequest = true
178 this.isLoading = false 180 this.isLoading = false
179 this.sendFollowMessage() 181 this.sendFollowMessage()
@@ -207,7 +209,7 @@ export struct FollowListDetailUI { @@ -207,7 +209,7 @@ export struct FollowListDetailUI {
207 this.getFollowListStatus(value) 209 this.getFollowListStatus(value)
208 } 210 }
209 }).catch((err: Error) => { 211 }).catch((err: Error) => {
210 - console.log(TAG, "请求失败") 212 + // console.log(TAG, "请求失败")
211 this.isLoading = false 213 this.isLoading = false
212 this.isGetRequest = true 214 this.isGetRequest = true
213 }) 215 })
@@ -276,7 +278,7 @@ export struct FollowListDetailUI { @@ -276,7 +278,7 @@ export struct FollowListDetailUI {
276 this.isGetRequest = true 278 this.isGetRequest = true
277 } 279 }
278 }).catch((err: Error) => { 280 }).catch((err: Error) => {
279 - console.log(TAG, JSON.stringify(err)) 281 + // console.log(TAG, JSON.stringify(err))
280 this.isLoading = false 282 this.isLoading = false
281 this.count = this.count === -1 ? 0 : this.count 283 this.count = this.count === -1 ? 0 : this.count
282 this.isGetRequest = true 284 this.isGetRequest = true
@@ -319,7 +321,7 @@ export struct FollowListDetailUI { @@ -319,7 +321,7 @@ export struct FollowListDetailUI {
319 this.isLoading = false 321 this.isLoading = false
320 this.isGetRequest = true 322 this.isGetRequest = true
321 }).catch((err: Error) => { 323 }).catch((err: Error) => {
322 - console.log(TAG, "请求失败") 324 + // console.log(TAG, "请求失败")
323 this.isLoading = false 325 this.isLoading = false
324 this.isGetRequest = true 326 this.isGetRequest = true
325 }) 327 })
@@ -18,7 +18,8 @@ export struct FollowSecondTabsComponent{ @@ -18,7 +18,8 @@ export struct FollowSecondTabsComponent{
18 Column(){ 18 Column(){
19 Text().backgroundColor($r('app.color.color_EDEDED')) 19 Text().backgroundColor($r('app.color.color_EDEDED'))
20 .width('100%') 20 .width('100%')
21 - .height('2lpx') 21 + // .height('2lpx')
  22 + .height(2)
22 23
23 if(this.data != null){ 24 if(this.data != null){
24 if(this.data[this.firstIndex].children == null || this.data[this.firstIndex].children.length == 0){ 25 if(this.data[this.firstIndex].children == null || this.data[this.firstIndex].children.length == 0){
@@ -93,20 +94,25 @@ export struct FollowSecondTabsComponent{ @@ -93,20 +94,25 @@ export struct FollowSecondTabsComponent{
93 Column(){ 94 Column(){
94 Text(item.directoryName) 95 Text(item.directoryName)
95 .width('100%') 96 .width('100%')
96 - .height('38lpx')  
97 - .fontSize('30lpx') 97 + // .height('38lpx')
  98 + .height(38)
  99 + // .fontSize('30lpx')
  100 + .fontSize(30)
98 .textAlign(TextAlign.Center) 101 .textAlign(TextAlign.Center)
99 .fontWeight(this.currentIndex === index ? 600 : 400) 102 .fontWeight(this.currentIndex === index ? 600 : 400)
100 .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor) 103 .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
101 - .lineHeight('38lpx') 104 + // .lineHeight('38lpx')
  105 + .lineHeight(38)
102 } 106 }
103 .onClick(()=>{ 107 .onClick(()=>{
104 this.currentIndex = index 108 this.currentIndex = index
105 this.swiperController.changeIndex(this.currentIndex) 109 this.swiperController.changeIndex(this.currentIndex)
106 }) 110 })
107 .justifyContent(FlexAlign.Center) 111 .justifyContent(FlexAlign.Center)
108 - .height('84lpx')  
109 - .width('140lpx') 112 + // .height('84lpx')
  113 + .height(84)
  114 + // .width('140lpx')
  115 + .width(140)
110 .backgroundColor(this.currentIndex === index?$r('app.color.white'):$r('app.color.color_F9F9F9')) 116 .backgroundColor(this.currentIndex === index?$r('app.color.white'):$r('app.color.color_F9F9F9'))
111 } 117 }
112 118
@@ -76,8 +76,10 @@ export struct FollowThirdTabsComponent{ @@ -76,8 +76,10 @@ export struct FollowThirdTabsComponent{
76 .scrollBar(BarState.Off) 76 .scrollBar(BarState.Off)
77 .listDirection(Axis.Horizontal) 77 .listDirection(Axis.Horizontal)
78 .width('100%') 78 .width('100%')
79 - .height("84lpx")  
80 - .padding({left:'31lpx',right:'48lpx'}) 79 + // .height("84lpx")
  80 + .height(84)
  81 + // .padding({left:'31lpx',right:'48lpx'})
  82 + .padding({left: 31,right: 48})
81 83
82 // Column() { 84 // Column() {
83 // // 页签 85 // // 页签
@@ -24,31 +24,46 @@ export struct ChildCommentComponent { @@ -24,31 +24,46 @@ 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 - .height('69lpx') 27 + // .width('69lpx')
  28 + .width(69)
  29 + // .height('69lpx')
  30 + .height(69)
29 .borderRadius(50) 31 .borderRadius(50)
30 Image(this.levelHead) 32 Image(this.levelHead)
31 - .width('89lpx')  
32 - .height('89lpx') 33 + // .width('89lpx')
  34 + .width(89)
  35 + // .height('89lpx')
  36 + .height(89)
33 .objectFit(ImageFit.Cover) 37 .objectFit(ImageFit.Cover)
34 .borderRadius(50) 38 .borderRadius(50)
35 - }.width('89lpx')  
36 - .height('89lpx')  
37 - .margin({ right: '3lpx' }) 39 + }
  40 + // .width('89lpx')
  41 + .width(89)
  42 + // .height('89lpx')
  43 + .height(89)
  44 + // .margin({ right: '3lpx' })
  45 + .margin({ right: 3 })
38 46
39 Column() { 47 Column() {
40 Text(this.data.fromUserName) 48 Text(this.data.fromUserName)
41 - .fontSize('25lpx')  
42 - .lineHeight('35lpx')  
43 - .fontWeight('600lpx') 49 + // .fontSize('25lpx')
  50 + .fontSize(25)
  51 + // .lineHeight('35lpx')
  52 + .lineHeight(35)
  53 + // .fontWeight('600lpx')
  54 + .fontWeight(600)
44 .fontColor($r('app.color.color_222222')) 55 .fontColor($r('app.color.color_222222'))
45 - .margin({ bottom: '6lpx' }) 56 + // .margin({ bottom: '6lpx' })
  57 + .margin({ bottom: 6 })
46 .maxLines(1) 58 .maxLines(1)
47 Text(`${this.data.createTime}`) 59 Text(`${this.data.createTime}`)
48 .fontColor($r('app.color.color_B0B0B0')) 60 .fontColor($r('app.color.color_B0B0B0'))
49 - .fontSize('23lpx')  
50 - .lineHeight('31lpx')  
51 - .fontWeight('400lpx') 61 + // .fontSize('23lpx')
  62 + .fontSize(23)
  63 + // .lineHeight('31lpx')
  64 + .lineHeight(31)
  65 + // .fontWeight('400lpx')
  66 + .fontWeight(400)
52 .maxLines(1) 67 .maxLines(1)
53 }.layoutWeight(1) 68 }.layoutWeight(1)
54 .alignItems(HorizontalAlign.Start) 69 .alignItems(HorizontalAlign.Start)
@@ -57,15 +72,21 @@ export struct ChildCommentComponent { @@ -57,15 +72,21 @@ export struct ChildCommentComponent {
57 if (this.data.checkStatus != 3) { 72 if (this.data.checkStatus != 3) {
58 Row() { 73 Row() {
59 Text(this.data.likeNum.toString()) 74 Text(this.data.likeNum.toString())
60 - .fontWeight("500lpx")  
61 - .fontSize("27lpx")  
62 - .lineHeight("31lpx") 75 + // .fontWeight("500lpx")
  76 + .fontWeight(500)
  77 + // .fontSize("27lpx")
  78 + .fontSize(27)
  79 + // .lineHeight("31lpx")
  80 + .lineHeight(31)
63 .fontColor(this.data.like_status === 0 ? $r('app.color.color_666666') : $r('app.color.color_ED2800')) 81 .fontColor(this.data.like_status === 0 ? $r('app.color.color_666666') : $r('app.color.color_ED2800'))
64 - .margin({ right: '8lpx' }) 82 + // .margin({ right: '8lpx' })
  83 + .margin({ right: 8 })
65 .visibility(this.data.likeNum <= 0||StringUtils.isEmpty(this.data.likeNum.toString()) ? Visibility.Hidden : Visibility.Visible) 84 .visibility(this.data.likeNum <= 0||StringUtils.isEmpty(this.data.likeNum.toString()) ? Visibility.Hidden : Visibility.Visible)
66 Image(this.data.like_status === 0 ? $r('app.media.like_default_status') : $r('app.media.liked_status')) 85 Image(this.data.like_status === 0 ? $r('app.media.like_default_status') : $r('app.media.liked_status'))
67 - .width('31lpx')  
68 - .height('31lpx') 86 + // .width('31lpx')
  87 + .width(31)
  88 + // .height('31lpx')
  89 + .height(31)
69 .objectFit(ImageFit.Auto) 90 .objectFit(ImageFit.Auto)
70 .interpolation(ImageInterpolation.Medium) 91 .interpolation(ImageInterpolation.Medium)
71 .borderRadius(50) 92 .borderRadius(50)
@@ -74,10 +95,13 @@ export struct ChildCommentComponent { @@ -74,10 +95,13 @@ export struct ChildCommentComponent {
74 }) 95 })
75 } 96 }
76 } 97 }
77 - .margin({ bottom: '5lpx' }) 98 + // .margin({ bottom: '5lpx' })
  99 + .margin({ bottom: 5 })
78 .width('100%') 100 .width('100%')
79 - .height('108lpx')  
80 - .padding({ left: '31lpx', right: '31lpx' }) 101 + // .height('108lpx')
  102 + .height(108)
  103 + // .padding({ left: '31lpx', right: '31lpx' })
  104 + .padding({ left: 31, right: 31 })
81 105
82 Row() { 106 Row() {
83 if (this.isExpand) { 107 if (this.isExpand) {
@@ -99,7 +123,9 @@ export struct ChildCommentComponent { @@ -99,7 +123,9 @@ export struct ChildCommentComponent {
99 .wordBreak(WordBreak.BREAK_ALL) 123 .wordBreak(WordBreak.BREAK_ALL)
100 .textStyle() 124 .textStyle()
101 } 125 }
102 - }.padding({ left: '31lpx', right: '31lpx' }) 126 + }
  127 + // .padding({ left: '31lpx', right: '31lpx' })
  128 + .padding({ left: 31, right: 31 })
103 .width('100%') 129 .width('100%')
104 130
105 Column() { 131 Column() {
@@ -110,14 +136,20 @@ export struct ChildCommentComponent { @@ -110,14 +136,20 @@ export struct ChildCommentComponent {
110 Text() { 136 Text() {
111 Span(`@${this.data.parentCommentUserName}：`) 137 Span(`@${this.data.parentCommentUserName}：`)
112 .fontColor($r('app.color.color_000000')) 138 .fontColor($r('app.color.color_000000'))
113 - .fontWeight('500lpx')  
114 - .fontSize('27lpx')  
115 - .lineHeight('40lpx') 139 + // .fontWeight('500lpx')
  140 + .fontWeight(500)
  141 + // .fontSize('27lpx')
  142 + .fontSize(27)
  143 + // .lineHeight('40lpx')
  144 + .lineHeight(40)
116 Span(this.data.parentCommentContent) 145 Span(this.data.parentCommentContent)
117 .fontColor($r('app.color.color_000000')) 146 .fontColor($r('app.color.color_000000'))
118 - .fontWeight('400lpx')  
119 - .fontSize('27lpx')  
120 - .lineHeight('40lpx') 147 + // .fontWeight('400lpx')
  148 + .fontWeight(400)
  149 + // .fontSize('27lpx')
  150 + .fontSize(27)
  151 + // .lineHeight('40lpx')
  152 + .lineHeight(40)
121 } 153 }
122 .width('100%') 154 .width('100%')
123 .textAlign(TextAlign.Start) 155 .textAlign(TextAlign.Start)
@@ -125,15 +157,21 @@ export struct ChildCommentComponent { @@ -125,15 +157,21 @@ export struct ChildCommentComponent {
125 Text() { 157 Text() {
126 Span(`@${this.data.parentCommentUserName}：`) 158 Span(`@${this.data.parentCommentUserName}：`)
127 .fontColor($r('app.color.color_000000')) 159 .fontColor($r('app.color.color_000000'))
128 - .fontWeight('500lpx')  
129 - .fontSize('27lpx')  
130 - .lineHeight('40lpx') 160 + // .fontWeight('500lpx')
  161 + .fontWeight(500)
  162 + // .fontSize('27lpx')
  163 + .fontSize(27)
  164 + // .lineHeight('40lpx')
  165 + .lineHeight(40)
131 166
132 Span(this.clipText(this.data.parentCommentContent, 31, 5, 630, 1)) 167 Span(this.clipText(this.data.parentCommentContent, 31, 5, 630, 1))
133 .fontColor($r('app.color.color_000000')) 168 .fontColor($r('app.color.color_000000'))
134 - .fontWeight('400lpx')  
135 - .fontSize('27lpx')  
136 - .lineHeight('40lpx') 169 + // .fontWeight('400lpx')
  170 + .fontWeight(400)
  171 + // .fontSize('27lpx')
  172 + .fontSize(27)
  173 + // .lineHeight('40lpx')
  174 + .lineHeight(40)
137 if (this.isOverLinesParent) { 175 if (this.isOverLinesParent) {
138 Span('...展开') 176 Span('...展开')
139 .fontColor($r('app.color.color_999999')) 177 .fontColor($r('app.color.color_999999'))
@@ -148,14 +186,18 @@ export struct ChildCommentComponent { @@ -148,14 +186,18 @@ export struct ChildCommentComponent {
148 } 186 }
149 } 187 }
150 .width('100%') 188 .width('100%')
151 - .padding({ top: '23lpx', bottom: '15lpx', right: '23lpx' }) 189 + // .padding({ top: '23lpx', bottom: '15lpx', right: '23lpx' })
  190 + .padding({ top: 23, bottom: 15, right: 23 })
152 191
153 Divider() 192 Divider()
154 .width('100%') 193 .width('100%')
155 - .height('1lpx')  
156 - .strokeWidth('1lpx') 194 + // .height('1lpx')
  195 + .height(1)
  196 + // .strokeWidth('1lpx')
  197 + .strokeWidth(1)
157 .backgroundColor($r('app.color.color_EDEDED')) 198 .backgroundColor($r('app.color.color_EDEDED'))
158 - .margin({ top: '4lpx', bottom: '4lpx' }) 199 + // .margin({ top: '4lpx', bottom: '4lpx' })
  200 + .margin({ top: 4, bottom: 4 })
159 } 201 }
160 202
161 Column() { 203 Column() {
@@ -163,17 +205,23 @@ export struct ChildCommentComponent { @@ -163,17 +205,23 @@ export struct ChildCommentComponent {
163 Row() { 205 Row() {
164 Image($r('app.media.comment_link_icon')) 206 Image($r('app.media.comment_link_icon'))
165 .objectFit(ImageFit.Auto) 207 .objectFit(ImageFit.Auto)
166 - .width('31lpx')  
167 - .height('31lpx')  
168 - .margin({ right: '10lpx' }) 208 + // .width('31lpx')
  209 + .width(31)
  210 + // .height('31lpx')
  211 + .height(31)
  212 + // .margin({ right: '10lpx' })
  213 + .margin({ right: 10 })
169 214
170 Column() { 215 Column() {
171 Row() { 216 Row() {
172 Text(`${this.data.targetTitle}`) 217 Text(`${this.data.targetTitle}`)
173 - .fontWeight('400lpx') 218 + // .fontWeight('400lpx')
  219 + .fontWeight(400)
174 .fontColor($r('app.color.color_666666')) 220 .fontColor($r('app.color.color_666666'))
175 - .lineHeight('38lpx')  
176 - .fontSize('27lpx') 221 + // .lineHeight('38lpx')
  222 + .lineHeight(38)
  223 + // .fontSize('27lpx')
  224 + .fontSize(27)
177 .layoutWeight(1) 225 .layoutWeight(1)
178 .maxLines(1) 226 .maxLines(1)
179 .textOverflow({ overflow: TextOverflow.Ellipsis }) 227 .textOverflow({ overflow: TextOverflow.Ellipsis })
@@ -184,13 +232,17 @@ export struct ChildCommentComponent { @@ -184,13 +232,17 @@ export struct ChildCommentComponent {
184 }.layoutWeight(1) 232 }.layoutWeight(1)
185 233
186 Image($r('app.media.arrow_icon_right')) 234 Image($r('app.media.arrow_icon_right'))
187 - .margin({ right: '4lpx' })  
188 - .width('23lpx')  
189 - .height('23lpx')  
190 - .margin({right:'23lpx'}) 235 + // .margin({ right: '4lpx' })
  236 + .margin({ right: 4 })
  237 + // .width('23lpx')
  238 + .width(23)
  239 + // .height('23lpx')
  240 + .height(23)
  241 + .margin({right: 23})
191 } 242 }
192 .width('100%') 243 .width('100%')
193 - .height('69lpx') 244 + // .height('69lpx')
  245 + .height(69)
194 .justifyContent(FlexAlign.SpaceBetween) 246 .justifyContent(FlexAlign.SpaceBetween)
195 .onClick(()=>{ 247 .onClick(()=>{
196 let content = getParams(this.data) 248 let content = getParams(this.data)
@@ -198,18 +250,25 @@ export struct ChildCommentComponent { @@ -198,18 +250,25 @@ export struct ChildCommentComponent {
198 ProcessUtils.processPage(content) 250 ProcessUtils.processPage(content)
199 }) 251 })
200 252
201 - }.height('69lpx') 253 + }
  254 + // .height('69lpx')
  255 + .height(69)
202 .justifyContent(FlexAlign.Center) 256 .justifyContent(FlexAlign.Center)
203 } 257 }
204 - .margin({ top: '19lpx', bottom: '31lpx', left: '31lpx', right: '31lpx' })  
205 - .padding({ left: '23lpx' })  
206 - .width('662lpx') 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)
207 .backgroundColor($r('app.color.color_F5F5F5')) 264 .backgroundColor($r('app.color.color_F5F5F5'))
208 265
209 if (!this.isLastItem) { 266 if (!this.isLastItem) {
210 Divider().width('100%') 267 Divider().width('100%')
211 - .height('12lpx')  
212 - .strokeWidth('12lpx') 268 + // .height('12lpx')
  269 + .height(12)
  270 + // .strokeWidth('12lpx')
  271 + .strokeWidth(12)
213 .color($r('app.color.color_F5F5F5')) 272 .color($r('app.color.color_F5F5F5'))
214 } 273 }
215 } 274 }
@@ -275,11 +334,15 @@ export struct ChildCommentComponent { @@ -275,11 +334,15 @@ export struct ChildCommentComponent {
275 334
276 @Extend(Text) 335 @Extend(Text)
277 function textStyle() { 336 function textStyle() {
278 - .width('630lpx')  
279 - .fontSize('31lpx')  
280 - .fontWeight('400lpx') 337 + // .width('630lpx')
  338 + .width(630)
  339 + // .fontSize('31lpx')
  340 + .fontSize(31)
  341 + // .fontWeight('400lpx')
  342 + .fontWeight(400)
281 .fontColor($r('app.color.color_222222')) 343 .fontColor($r('app.color.color_222222'))
282 - .lineHeight('46lpx') 344 + // .lineHeight('46lpx')
  345 + .lineHeight(46)
283 } 346 }
284 347
285 function getParams(item: CommentListItem) : ContentDTO{ 348 function getParams(item: CommentListItem) : ContentDTO{
@@ -37,14 +37,16 @@ export struct HomePageBottomCommentComponent { @@ -37,14 +37,16 @@ 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') 40 + // .height('2lpx')
  41 + .height(2)
41 } 42 }
42 if (this.count === 0) { 43 if (this.count === 0) {
43 if (this.isGetRequest == true) { 44 if (this.isGetRequest == true) {
44 EmptyComponent({ emptyType: 11 }) 45 EmptyComponent({ emptyType: 11 })
45 .layoutWeight(1) 46 .layoutWeight(1)
46 .width('100%') 47 .width('100%')
47 - .offset({ y: "-200lpx" }) 48 + // .offset({ y: "-200lpx" })
  49 + .offset({ y: -200 })
48 } 50 }
49 } else { 51 } else {
50 CustomPullToRefresh({ 52 CustomPullToRefresh({
@@ -71,7 +71,8 @@ export struct HomePageBottomFollowComponent { @@ -71,7 +71,8 @@ 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') 74 + // .height('2lpx')
  75 + .height(2)
75 } 76 }
76 77
77 if (this.count === 0) { 78 if (this.count === 0) {
@@ -80,28 +81,38 @@ export struct HomePageBottomFollowComponent { @@ -80,28 +81,38 @@ export struct HomePageBottomFollowComponent {
80 EmptyComponent({ emptyType: 14 }) 81 EmptyComponent({ emptyType: 14 })
81 .layoutWeight(1) 82 .layoutWeight(1)
82 .width('100%') 83 .width('100%')
83 - .offset({ y: "-200lpx" }) 84 + // .offset({ y: "-200lpx" })
  85 + .offset({ y: -200 })
84 } 86 }
85 87
86 Row() { 88 Row() {
87 Text("关注更多人民号") 89 Text("关注更多人民号")
88 - .fontWeight('400lpx') 90 + // .fontWeight('400lpx')
  91 + .fontWeight(400)
89 .fontColor($r('app.color.color_222222')) 92 .fontColor($r('app.color.color_222222'))
90 - .lineHeight('38lpx')  
91 - .fontSize('27lpx') 93 + // .lineHeight('38lpx')
  94 + .lineHeight(38)
  95 + // .fontSize('27lpx')
  96 + .fontSize(27)
92 .textAlign(TextAlign.Center) 97 .textAlign(TextAlign.Center)
93 - .margin({ right: '4lpx' }) 98 + // .margin({ right: '4lpx' })
  99 + .margin({ right: 4 })
94 Image($r('app.media.arrow_icon_right')) 100 Image($r('app.media.arrow_icon_right'))
95 .objectFit(ImageFit.Auto) 101 .objectFit(ImageFit.Auto)
96 - .width('27lpx')  
97 - .height('27lpx') 102 + // .width('27lpx')
  103 + .width(27)
  104 + // .height('27lpx')
  105 + .height(27)
98 } 106 }
99 - .height('69lpx')  
100 - .width('659lpx') 107 + // .height('69lpx')
  108 + .height(69)
  109 + // .width('659lpx')
  110 + .width(659)
101 .alignItems(VerticalAlign.Center) 111 .alignItems(VerticalAlign.Center)
102 .justifyContent(FlexAlign.Center) 112 .justifyContent(FlexAlign.Center)
103 .backgroundColor($r('app.color.color_F5F5F5')) 113 .backgroundColor($r('app.color.color_F5F5F5'))
104 - .margin({ top: '31lpx', bottom: '4lpx' }) 114 + // .margin({ top: '31lpx', bottom: '4lpx' })
  115 + .margin({ top: 31, bottom: 4 })
105 .onClick(() => { 116 .onClick(() => {
106 let params = { 'index': "1" } as Record<string, string> 117 let params = { 'index': "1" } as Record<string, string>
107 WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params) 118 WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params)
@@ -146,23 +157,32 @@ export struct HomePageBottomFollowComponent { @@ -146,23 +157,32 @@ export struct HomePageBottomFollowComponent {
146 ListItem() { 157 ListItem() {
147 Row() { 158 Row() {
148 Text("关注更多人民号") 159 Text("关注更多人民号")
149 - .fontWeight('400lpx') 160 + // .fontWeight('400lpx')
  161 + .fontWeight(400)
150 .fontColor($r('app.color.color_222222')) 162 .fontColor($r('app.color.color_222222'))
151 - .lineHeight('38lpx')  
152 - .fontSize('27lpx') 163 + // .lineHeight('38lpx')
  164 + .lineHeight(38)
  165 + // .fontSize('27lpx')
  166 + .fontSize(27)
153 .textAlign(TextAlign.Center) 167 .textAlign(TextAlign.Center)
154 - .margin({ right: '4lpx' }) 168 + // .margin({ right: '4lpx' })
  169 + .margin({ right: 4 })
155 Image($r('app.media.arrow_icon_right')) 170 Image($r('app.media.arrow_icon_right'))
156 .objectFit(ImageFit.Auto) 171 .objectFit(ImageFit.Auto)
157 - .width('27lpx')  
158 - .height('27lpx') 172 + // .width('27lpx')
  173 + .width(27)
  174 + // .height('27lpx')
  175 + .height(27)
159 } 176 }
160 - .height('69lpx')  
161 - .width('659lpx') 177 + // .height('69lpx')
  178 + .height(69)
  179 + // .width('659lpx')
  180 + .width(659)
162 .alignItems(VerticalAlign.Center) 181 .alignItems(VerticalAlign.Center)
163 .justifyContent(FlexAlign.Center) 182 .justifyContent(FlexAlign.Center)
164 .backgroundColor($r('app.color.color_F5F5F5')) 183 .backgroundColor($r('app.color.color_F5F5F5'))
165 - .margin({ top: '31lpx', bottom: '4lpx' }) 184 + // .margin({ top: '31lpx', bottom: '4lpx' })
  185 + .margin({ top: 31, bottom: 4 })
166 }.onClick(() => { 186 }.onClick(() => {
167 let params = { 'index': "1" } as Record<string, string> 187 let params = { 'index': "1" } as Record<string, string>
168 WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params) 188 WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params)
@@ -177,12 +197,13 @@ export struct HomePageBottomFollowComponent { @@ -177,12 +197,13 @@ export struct HomePageBottomFollowComponent {
177 if (!this.hasMore) { 197 if (!this.hasMore) {
178 ListItem() { 198 ListItem() {
179 ///ToDo 数据过少时，达不到滑动条件 后续优化 199 ///ToDo 数据过少时，达不到滑动条件 后续优化
180 - ListHasNoMoreDataUI().height(this.bottomCompH > 150?this.bottomCompH:150) 200 + ListHasNoMoreDataUI().height(this.bottomCompH > 150 ? this.bottomCompH :150)
181 } 201 }
182 } 202 }
183 } 203 }
184 .cachedCount(5) 204 .cachedCount(5)
185 - .padding({ left: '31lpx', right: '31lpx' }) 205 + // .padding({ left: '31lpx', right: '31lpx' })
  206 + .padding({ left: 31, right: 31 })
186 .layoutWeight(1) 207 .layoutWeight(1)
187 .scrollBar(BarState.Off) 208 .scrollBar(BarState.Off)
188 .edgeEffect(EdgeEffect.None) 209 .edgeEffect(EdgeEffect.None)
@@ -234,11 +255,11 @@ export struct HomePageBottomFollowComponent { @@ -234,11 +255,11 @@ export struct HomePageBottomFollowComponent {
234 } 255 }
235 } 256 }
236 this.bottomCompH = DisplayUtils.getDeviceHeight() - this.data_follow.totalCount()*101 257 this.bottomCompH = DisplayUtils.getDeviceHeight() - this.data_follow.totalCount()*101
237 - console.log(TAG, `${this.bottomCompH}`); 258 + // console.log(TAG, `${this.bottomCompH}`);
238 this.isLoading = false 259 this.isLoading = false
239 this.isGetRequest = true 260 this.isGetRequest = true
240 }).catch((err: Error) => { 261 }).catch((err: Error) => {
241 - console.log(TAG, "请求失败") 262 + // console.log(TAG, "请求失败")
242 this.isLoading = false 263 this.isLoading = false
243 this.isGetRequest = true 264 this.isGetRequest = true
244 }) 265 })
@@ -15,30 +15,39 @@ export struct MessageListItemUI { @@ -15,30 +15,39 @@ export struct MessageListItemUI {
15 Row() { 15 Row() {
16 Image(this.item.imgSrc) 16 Image(this.item.imgSrc)
17 .objectFit(ImageFit.Auto) 17 .objectFit(ImageFit.Auto)
18 - .width('92lpx')  
19 - .height('92lpx')  
20 - .margin({ right: '15lpx' }) 18 + // .width('92lpx')
  19 + .width(92)
  20 + // .height('92lpx')
  21 + .height(92)
  22 + // .margin({ right: '15lpx' })
  23 + .margin({ right: 15 })
21 24
22 Column() { 25 Column() {
23 Text(this.item.title) 26 Text(this.item.title)
24 .fontWeight(500) 27 .fontWeight(500)
25 - .fontSize('31lpx')  
26 - .lineHeight('42lpx') 28 + // .fontSize('31lpx')
  29 + .fontSize(31)
  30 + // .lineHeight('42lpx')
  31 + .lineHeight(42)
27 .fontColor($r('app.color.color_222222')) 32 .fontColor($r('app.color.color_222222'))
28 .maxLines(1) 33 .maxLines(1)
29 - .margin({ bottom: StringUtils.isNotEmpty(this.item.desc)?'8lpx':0 }) 34 + // .margin({ bottom: StringUtils.isNotEmpty(this.item.desc)?'8lpx':0 })
  35 + .margin({ bottom: StringUtils.isNotEmpty(this.item.desc) ? 8 : 0 })
30 36
31 if(StringUtils.isNotEmpty(this.item.desc)){ 37 if(StringUtils.isNotEmpty(this.item.desc)){
32 Text(`${this.item.desc}`) 38 Text(`${this.item.desc}`)
33 .fontColor($r('app.color.color_999999')) 39 .fontColor($r('app.color.color_999999'))
34 - .fontSize('27lpx')  
35 - .lineHeight('38lpx') 40 + // .fontSize('27lpx')
  41 + .fontSize(27)
  42 + // .lineHeight('38lpx')
  43 + .lineHeight(38)
36 .fontWeight(400) 44 .fontWeight(400)
37 .maxLines(1) 45 .maxLines(1)
38 .textOverflow({ overflow: TextOverflow.Ellipsis }) 46 .textOverflow({ overflow: TextOverflow.Ellipsis })
39 } 47 }
40 } 48 }
41 - .height('92lpx') 49 + // .height('92lpx')
  50 + .height(92)
42 .layoutWeight(1) 51 .layoutWeight(1)
43 .alignItems(HorizontalAlign.Start) 52 .alignItems(HorizontalAlign.Start)
44 .justifyContent(StringUtils.isNotEmpty(this.item.desc)?FlexAlign.Start:FlexAlign.Center) 53 .justifyContent(StringUtils.isNotEmpty(this.item.desc)?FlexAlign.Start:FlexAlign.Center)
@@ -47,40 +56,51 @@ export struct MessageListItemUI { @@ -47,40 +56,51 @@ export struct MessageListItemUI {
47 Column() { 56 Column() {
48 Text(`${this.item.time}`) 57 Text(`${this.item.time}`)
49 .fontColor($r('app.color.color_999999')) 58 .fontColor($r('app.color.color_999999'))
50 - .fontSize('23lpx') 59 + // .fontSize('23lpx')
  60 + .fontSize(23)
51 .fontWeight(500) 61 .fontWeight(500)
52 - .lineHeight('35lpx')  
53 - .margin({ bottom: this.item.unReadCount > 0 ?'8lpx':0 }) 62 + // .lineHeight('35lpx')
  63 + .lineHeight(35)
  64 + // .margin({ bottom: this.item.unReadCount > 0 ?'8lpx':0 })
  65 + .margin({ bottom: this.item.unReadCount > 0 ? 8 : 0 })
54 66
55 if(this.item.unReadCount > 0){ 67 if(this.item.unReadCount > 0){
56 Button(){ 68 Button(){
57 Text(`${this.item.unReadCount}`) 69 Text(`${this.item.unReadCount}`)
58 .fontWeight(400) 70 .fontWeight(400)
59 - .fontSize("18lpx") 71 + // .fontSize("18lpx")
  72 + .fontSize(18)
60 .fontColor($r('app.color.white')) 73 .fontColor($r('app.color.white'))
61 } 74 }
62 .type((this.item.unReadCount>0 && this.item.unReadCount < 10 ? ButtonType.Circle:ButtonType.Capsule)) 75 .type((this.item.unReadCount>0 && this.item.unReadCount < 10 ? ButtonType.Circle:ButtonType.Capsule))
63 .backgroundColor($r("app.color.color_ED2800")) 76 .backgroundColor($r("app.color.color_ED2800"))
64 .stateEffect(false) 77 .stateEffect(false)
65 - .height("27lpx")  
66 - .constraintSize({minWidth:"27lpx"}) 78 + // .height("27lpx")
  79 + .height(27)
  80 + // .constraintSize({minWidth:"27lpx"})
  81 + .constraintSize({minWidth: 27})
67 } 82 }
68 } 83 }
69 .justifyContent(FlexAlign.Start) 84 .justifyContent(FlexAlign.Start)
70 .alignItems(HorizontalAlign.End) 85 .alignItems(HorizontalAlign.End)
71 - .height('92lpx') 86 + // .height('92lpx')
  87 + .height(92)
72 } 88 }
73 .width('100%') 89 .width('100%')
74 - .height('92lpx') 90 + // .height('92lpx')
  91 + .height(92)
75 .justifyContent(FlexAlign.SpaceBetween) 92 .justifyContent(FlexAlign.SpaceBetween)
76 93
77 - }.height('154lpx') 94 + }
  95 + // .height('154lpx')
  96 + .height(154)
78 .width("100%") 97 .width("100%")
79 .justifyContent(FlexAlign.Center) 98 .justifyContent(FlexAlign.Center)
80 99
81 Text().backgroundColor($r('app.color.color_EDEDED')) 100 Text().backgroundColor($r('app.color.color_EDEDED'))
82 .width('100%') 101 .width('100%')
83 - .height('1lpx') 102 + // .height('1lpx')
  103 + .height(1)
84 .visibility(this.index != 3 ?Visibility.Visible:Visibility.None) 104 .visibility(this.index != 3 ?Visibility.Visible:Visibility.None)
85 } 105 }
86 } 106 }
@@ -38,8 +38,6 @@ export struct MessageListUI { @@ -38,8 +38,6 @@ export struct MessageListUI {
38 } 38 }
39 }) 39 })
40 } 40 }
41 - }).catch((err: Error) => {  
42 - console.log(TAG, JSON.stringify(err))  
43 }) 41 })
44 } 42 }
45 43
@@ -103,8 +101,6 @@ export struct MessageListUI { @@ -103,8 +101,6 @@ export struct MessageListUI {
103 } 101 }
104 }*/ 102 }*/
105 }) 103 })
106 - }).catch((err: Error) => {  
107 - console.log(TAG, JSON.stringify(err))  
108 }) 104 })
109 } 105 }
110 106
@@ -150,7 +146,7 @@ export struct MessageListUI { @@ -150,7 +146,7 @@ export struct MessageListUI {
150 } 146 }
151 } 147 }
152 148
153 - console.log(result); 149 + // console.log(result);
154 return result 150 return result
155 } 151 }
156 152
@@ -78,7 +78,7 @@ export struct MinePageComponent { @@ -78,7 +78,7 @@ export struct MinePageComponent {
78 }else { 78 }else {
79 this.percent = 1 79 this.percent = 1
80 } 80 }
81 - console.log(TAG,"currentBreakpoint==>"+this.percent) 81 + // console.log(TAG,"currentBreakpoint==>"+this.percent)
82 } 82 }
83 83
84 84
@@ -140,7 +140,7 @@ export struct MinePageComponent { @@ -140,7 +140,7 @@ export struct MinePageComponent {
140 this.getFunctionData() 140 this.getFunctionData()
141 this.getUserLogin() 141 this.getUserLogin()
142 this.addLoginStatusObserver() 142 this.addLoginStatusObserver()
143 - console.log(TAG,"currentBreakpoint==>"+this.currentBreakpoint) 143 + // console.log(TAG,"currentBreakpoint==>"+this.currentBreakpoint)
144 this.currentChanged() 144 this.currentChanged()
145 145
146 this.changeTopStatusBarColor(this.navItem.statusBarColor) 146 this.changeTopStatusBarColor(this.navItem.statusBarColor)
@@ -161,8 +161,6 @@ export struct MinePageComponent { @@ -161,8 +161,6 @@ export struct MinePageComponent {
161 }) 161 })
162 } 162 }
163 } 163 }
164 - }).catch((err: Error) => {  
165 - console.log(TAG, JSON.stringify(err))  
166 }) 164 })
167 } 165 }
168 166
@@ -195,7 +193,8 @@ export struct MinePageComponent { @@ -195,7 +193,8 @@ export struct MinePageComponent {
195 Stack(){ 193 Stack(){
196 Image(this.navItem?.backgroundUrl??'') 194 Image(this.navItem?.backgroundUrl??'')
197 .width('100%') 195 .width('100%')
198 - .height(`${657 * this.percent}lpx`) 196 + // .height(`${657 * this.percent}lpx`)
  197 + .height(657)
199 .objectFit(ImageFit.Cover) 198 .objectFit(ImageFit.Cover)
200 this.MinePageUI() 199 this.MinePageUI()
201 }.height('100%') 200 }.height('100%')
@@ -95,7 +95,7 @@ export struct PrivacySettingPage { @@ -95,7 +95,7 @@ export struct PrivacySettingPage {
95 @Builder PrivacySettingComponentsUI() { 95 @Builder PrivacySettingComponentsUI() {
96 Column() { 96 Column() {
97 97
98 - List({ space: `${this.calcHeight(23)}lpx` }) { 98 + List({ space: 12 }) {
99 ForEach(this.listData, (item: PrivacySettingModel, index:number) => { 99 ForEach(this.listData, (item: PrivacySettingModel, index:number) => {
100 ListItem() { 100 ListItem() {
101 if (item.privacyName == DiyString) { 101 if (item.privacyName == DiyString) {
@@ -130,32 +130,38 @@ export struct PrivacySettingPage { @@ -130,32 +130,38 @@ export struct PrivacySettingPage {
130 }) 130 })
131 }) 131 })
132 }.width('100%') 132 }.width('100%')
133 - .padding({ left: `${this.calcHeight(29)}lpx`, right: `${this.calcHeight(29)}lpx` })  
134 - .margin({ top: `${this.calcHeight(38)}lpx` }) 133 + .padding({ left: 15, right: 15 })
  134 + .margin({ top: 20 })
135 135
136 136
137 Row() { 137 Row() {
138 Text(this.tips) 138 Text(this.tips)
139 - .fontSize(`${this.calcHeight(25)}lpx`) 139 + .fontSize(14)
  140 + .lineHeight(20)
  141 + .fontWeight(400)
140 .textAlign(TextAlign.Start) 142 .textAlign(TextAlign.Start)
141 .fontColor($r("app.color.color_666666")) 143 .fontColor($r("app.color.color_666666"))
142 - .margin({ left: `${this.calcHeight(29)}lpx`, top: `${this.calcHeight(46)}lpx` }) 144 + .margin({ left: 15, top: 24 })
143 // .backgroundColor(Color.Orange) 145 // .backgroundColor(Color.Orange)
144 Text(this.privacyTips) 146 Text(this.privacyTips)
145 - .fontSize(`${this.calcHeight(25)}lpx`) 147 + .fontSize(14)
  148 + .lineHeight(20)
  149 + .fontWeight(400)
146 .textAlign(TextAlign.Start) 150 .textAlign(TextAlign.Start)
147 .fontColor('#ED2800') 151 .fontColor('#ED2800')
148 - .margin({ top: `${this.calcHeight(46)}lpx` }) 152 + .margin({ top: 24 })
149 .onClick(() => { 153 .onClick(() => {
150 //跳转隐私政策 154 //跳转隐私政策
151 let bean={contentID:"2",pageID:""} as Params 155 let bean={contentID:"2",pageID:""} as Params
152 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage,bean) 156 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage,bean)
153 }) 157 })
154 Text(this.tipsEnd) 158 Text(this.tipsEnd)
155 - .fontSize(`${this.calcHeight(25)}lpx`) 159 + .fontSize(14)
  160 + .lineHeight(20)
  161 + .fontWeight(400)
156 .textAlign(TextAlign.Start) 162 .textAlign(TextAlign.Start)
157 .fontColor($r("app.color.color_666666")) 163 .fontColor($r("app.color.color_666666"))
158 - .margin({ top: `${this.calcHeight(46)}lpx` }) 164 + .margin({ top: 24 })
159 } 165 }
160 166
161 } 167 }
@@ -183,28 +189,32 @@ struct getArrowCell { @@ -183,28 +189,32 @@ struct getArrowCell {
183 // 左侧标题 189 // 左侧标题
184 Text(this.item.privacyName) 190 Text(this.item.privacyName)
185 .fontColor('#666666') 191 .fontColor('#666666')
186 - .fontSize(`${this.calcHeight(31)}lpx`) 192 + .fontSize(16)
  193 + .lineHeight(23)
  194 + .fontWeight(400)
187 195
188 Row() { 196 Row() {
189 Text(this.item.permission ? '已开启' : '去设置') 197 Text(this.item.permission ? '已开启' : '去设置')
190 .fontColor(this.item.permission ? '#666666' : '#CCCCCC') 198 .fontColor(this.item.permission ? '#666666' : '#CCCCCC')
191 - .fontSize(`${this.calcHeight(31)}lpx`)  
192 - .margin({ right: `${this.calcHeight(8)}lpx` }) 199 + .fontSize(14)
  200 + .lineHeight(20)
  201 + .fontWeight(400)
  202 + .margin({ right: 4 })
193 203
194 Image($r('app.media.mine_user_arrow')) 204 Image($r('app.media.mine_user_arrow'))
195 - .width(`${this.calcHeight(27)}lpx`)  
196 - .height(`${this.calcHeight(27)}lpx`) 205 + .width(18)
  206 + .height(18)
197 .objectFit(ImageFit.Auto) 207 .objectFit(ImageFit.Auto)
198 } 208 }
199 209
200 } 210 }
201 .alignItems(VerticalAlign.Center) 211 .alignItems(VerticalAlign.Center)
202 .justifyContent(FlexAlign.SpaceBetween) 212 .justifyContent(FlexAlign.SpaceBetween)
203 - .height(`${this.calcHeight(97)}lpx`) 213 + .height(50)
204 .width('100%') 214 .width('100%')
205 - .padding({ left: `${this.calcHeight(29)}lpx`, right: `${this.calcHeight(29)}lpx` }) 215 + .padding({ left: 15, right: 15 })
206 .backgroundColor('#FFFFFF') 216 .backgroundColor('#FFFFFF')
207 - .borderRadius(`${this.calcHeight(8)}lpx`) 217 + .borderRadius(4)
208 } 218 }
209 219
210 calcHeight(value:number): number{ 220 calcHeight(value:number): number{
@@ -224,12 +234,14 @@ struct getTuiJianCell { @@ -224,12 +234,14 @@ struct getTuiJianCell {
224 // 左侧标题 234 // 左侧标题
225 Text(this.item.privacyName) 235 Text(this.item.privacyName)
226 .fontColor('#666666') 236 .fontColor('#666666')
227 - .fontSize(`${this.calcHeight(31)}lpx`) 237 + .fontSize(16)
  238 + .lineHeight(23)
  239 + .fontWeight(400)
228 240
229 Row() { 241 Row() {
230 Toggle({ type: ToggleType.Switch, isOn: this.item.permission }) 242 Toggle({ type: ToggleType.Switch, isOn: this.item.permission })
231 - .height(`${this.calcHeight(58)}lpx`)  
232 - .width(`${this.calcHeight(96)}lpx`) 243 + .height(30)
  244 + .width(50)
233 .selectedColor('#ED2700') 245 .selectedColor('#ED2700')
234 .onChange((isOn: boolean) => { 246 .onChange((isOn: boolean) => {
235 // this.privacySwitch = isOn; 247 // this.privacySwitch = isOn;
@@ -240,25 +252,26 @@ struct getTuiJianCell { @@ -240,25 +252,26 @@ struct getTuiJianCell {
240 } 252 }
241 .alignItems(VerticalAlign.Center) 253 .alignItems(VerticalAlign.Center)
242 .justifyContent(FlexAlign.SpaceBetween) 254 .justifyContent(FlexAlign.SpaceBetween)
243 - .height(`${this.calcHeight(97)}lpx`) 255 + .height(50)
244 .width('100%') 256 .width('100%')
245 257
246 258
247 Blank() 259 Blank()
248 .backgroundColor('#EDEDED') 260 .backgroundColor('#EDEDED')
249 - .height(`${this.calcHeight(1)}lpx`) 261 + .height(0.5)
250 262
251 Text(DiyCloseTipsString) 263 Text(DiyCloseTipsString)
252 .fontColor('#999999') 264 .fontColor('#999999')
253 - .fontSize(`${this.calcHeight(23)}lpx`)  
254 - .margin({ right: `${this.calcHeight(8)}lpx` })  
255 - .height(`${this.calcHeight(69)}lpx`) 265 + .fontSize(12)
  266 + .lineHeight(20)
  267 + .fontWeight(400)
  268 + .height(36)
256 269
257 }.width('100%') 270 }.width('100%')
258 .alignItems(HorizontalAlign.Start) 271 .alignItems(HorizontalAlign.Start)
259 .backgroundColor('#FFFFFF') 272 .backgroundColor('#FFFFFF')
260 - .borderRadius(`${this.calcHeight(8)}lpx`)  
261 - .padding({ left: `${this.calcHeight(29)}lpx`, right: `${this.calcHeight(29)}lpx` }) 273 + .borderRadius(4)
  274 + .padding({ left: 15, right: 15 })
262 } 275 }
263 276
264 calcHeight(value:number): number{ 277 calcHeight(value:number): number{
@@ -13,8 +13,10 @@ export struct CustomTitleAndEditUI { @@ -13,8 +13,10 @@ export struct CustomTitleAndEditUI {
13 //标题栏目 13 //标题栏目
14 if(this.imgBack){ 14 if(this.imgBack){
15 Image($r('app.media.back_icon')) 15 Image($r('app.media.back_icon'))
16 - .width('46lpx')  
17 - .height('46lpx') 16 + // .width('46lpx')
  17 + .width(46)
  18 + // .height('46lpx')
  19 + .height(46)
18 .objectFit(ImageFit.Auto) 20 .objectFit(ImageFit.Auto)
19 .interpolation(ImageInterpolation.High) 21 .interpolation(ImageInterpolation.High)
20 .id("back_icon") 22 .id("back_icon")
@@ -22,20 +24,24 @@ export struct CustomTitleAndEditUI { @@ -22,20 +24,24 @@ export struct CustomTitleAndEditUI {
22 center: {anchor: "__container__", align: VerticalAlign.Center}, 24 center: {anchor: "__container__", align: VerticalAlign.Center},
23 left: {anchor: "__container__", align: HorizontalAlign.Start} 25 left: {anchor: "__container__", align: HorizontalAlign.Start}
24 }) 26 })
25 - .margin({left:'31lpx'}) 27 + // .margin({left:'31lpx'})
  28 + .margin({left: 31})
26 .onClick(()=>{ 29 .onClick(()=>{
27 router.back() 30 router.back()
28 }) 31 })
29 } 32 }
30 33
31 Text(this.titleName) 34 Text(this.titleName)
32 - .height('42lpx') 35 + // .height('42lpx')
  36 + .height(42)
33 .maxLines(1) 37 .maxLines(1)
34 .id("title") 38 .id("title")
35 - .fontSize('35lpx') 39 + // .fontSize('35lpx')
  40 + .fontSize(35)
36 .fontWeight(400) 41 .fontWeight(400)
37 .fontColor($r('app.color.color_222222')) 42 .fontColor($r('app.color.color_222222'))
38 - .lineHeight('42lpx') 43 + // .lineHeight('42lpx')
  44 + .lineHeight(42)
39 .alignRules({ 45 .alignRules({
40 center: {anchor: "__container__", align: VerticalAlign.Center}, 46 center: {anchor: "__container__", align: VerticalAlign.Center},
41 middle: {anchor: "__container__", align: HorizontalAlign.Center} 47 middle: {anchor: "__container__", align: HorizontalAlign.Center}
@@ -51,14 +57,16 @@ export struct CustomTitleAndEditUI { @@ -51,14 +57,16 @@ export struct CustomTitleAndEditUI {
51 center: {anchor: "__container__", align: VerticalAlign.Center}, 57 center: {anchor: "__container__", align: VerticalAlign.Center},
52 right: {anchor: "__container__", align: HorizontalAlign.End} 58 right: {anchor: "__container__", align: HorizontalAlign.End}
53 }) 59 })
54 - .margin({right:'31lpx'}) 60 + // .margin({right:'31lpx'})
  61 + .margin({right: 31})
55 .onClick(()=>{ 62 .onClick(()=>{
56 this.isEditState = !this.isEditState 63 this.isEditState = !this.isEditState
57 this.editCallback() 64 this.editCallback()
58 }) 65 })
59 } 66 }
60 } 67 }
61 - .height('84lpx') 68 + // .height('84lpx')
  69 + .height(84)
62 .width('100%') 70 .width('100%')
63 .backgroundColor($r('app.color.white')) 71 .backgroundColor($r('app.color.white'))
64 72
@@ -11,8 +11,8 @@ export struct CustomTitleUI { @@ -11,8 +11,8 @@ export struct CustomTitleUI {
11 //标题栏目 11 //标题栏目
12 if(this.imgBack){ 12 if(this.imgBack){
13 Image($r('app.media.back_icon')) 13 Image($r('app.media.back_icon'))
14 - .width(`${this.calcHeight(46)}lpx`)  
15 - .height(`${this.calcHeight(46)}lpx`) 14 + .width(24)
  15 + .height(24)
16 .objectFit(ImageFit.Auto) 16 .objectFit(ImageFit.Auto)
17 .interpolation(ImageInterpolation.High) 17 .interpolation(ImageInterpolation.High)
18 .id("back_icon") 18 .id("back_icon")
@@ -20,7 +20,7 @@ export struct CustomTitleUI { @@ -20,7 +20,7 @@ export struct CustomTitleUI {
20 center: {anchor: "__container__", align: VerticalAlign.Center}, 20 center: {anchor: "__container__", align: VerticalAlign.Center},
21 left: {anchor: "__container__", align: HorizontalAlign.Start} 21 left: {anchor: "__container__", align: HorizontalAlign.Start}
22 }) 22 })
23 - .margin({left:`${this.calcHeight(31)}lpx`}) 23 + .margin({left: 16})
24 .onClick(()=>{ 24 .onClick(()=>{
25 router.back() 25 router.back()
26 }) 26 })
@@ -29,17 +29,18 @@ export struct CustomTitleUI { @@ -29,17 +29,18 @@ export struct CustomTitleUI {
29 Text(this.titleName) 29 Text(this.titleName)
30 .maxLines(1) 30 .maxLines(1)
31 .id("title") 31 .id("title")
32 - .fontSize(`${this.calcHeight(35)}lpx`) 32 + .fontFamily('PingFang SC-Regular')
  33 + .fontSize(18)
33 .fontWeight(400) 34 .fontWeight(400)
34 .fontColor($r('app.color.color_222222')) 35 .fontColor($r('app.color.color_222222'))
35 - .lineHeight(`${this.calcHeight(50)}lpx`) 36 + .lineHeight(26)
36 .alignRules({ 37 .alignRules({
37 center: {anchor: "__container__", align: VerticalAlign.Center}, 38 center: {anchor: "__container__", align: VerticalAlign.Center},
38 middle: {anchor: "__container__", align: HorizontalAlign.Center} 39 middle: {anchor: "__container__", align: HorizontalAlign.Center}
39 }) 40 })
40 41
41 } 42 }
42 - .height(`${this.calcHeight(84)}lpx`) 43 + .height(44)
43 .width('100%') 44 .width('100%')
44 .backgroundColor($r('app.color.white')) 45 .backgroundColor($r('app.color.white'))
45 } 46 }
@@ -7,22 +7,29 @@ export struct ListHasNoMoreDataUI{ @@ -7,22 +7,29 @@ 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 - .fontSize('23lpx') 10 + // .fontWeight('500lpx')
  11 + .fontWeight(500)
  12 + // .fontSize('23lpx')
  13 + .fontSize(23)
12 }.justifyContent(FlexAlign.Center) 14 }.justifyContent(FlexAlign.Center)
13 .width('100%') 15 .width('100%')
14 - .margin({top:'20lpx',bottom:'20lpx'}) 16 + // .margin({top:'20lpx',bottom:'20lpx'})
  17 + .margin({top: 20,bottom: 20})
15 }else if (this.style === 2){ 18 }else if (this.style === 2){
16 Column(){ 19 Column(){
17 Image($r('app.media.empty_icon')) 20 Image($r('app.media.empty_icon'))
18 - .width('200lpx')  
19 - .height('200lpx') 21 + // .width('200lpx')
  22 + .width(200)
  23 + // .height('200lpx')
  24 + .height(200)
20 .objectFit(ImageFit.Auto) 25 .objectFit(ImageFit.Auto)
21 .interpolation(ImageInterpolation.High) 26 .interpolation(ImageInterpolation.High)
22 Text("暂无内容") 27 Text("暂无内容")
23 .fontColor($r('app.color.color_999999')) 28 .fontColor($r('app.color.color_999999'))
24 - .fontWeight('500lpx')  
25 - .fontSize('23lpx') 29 + // .fontWeight('500lpx')
  30 + .fontWeight(500)
  31 + // .fontSize('23lpx')
  32 + .fontSize(23)
26 } 33 }
27 .justifyContent(FlexAlign.Center) 34 .justifyContent(FlexAlign.Center)
28 .width('100%') 35 .width('100%')
@@ -22,33 +22,35 @@ export struct MyCustomDialog { @@ -22,33 +22,35 @@ export struct MyCustomDialog {
22 Column(){ 22 Column(){
23 if(this.titleShow){ 23 if(this.titleShow){
24 Text(this.title) 24 Text(this.title)
25 - .fontSize("32lpx") 25 + .fontSize(18)
26 .fontColor($r('app.color.color_333333')) 26 .fontColor($r('app.color.color_333333'))
27 - .lineHeight('50lpx') 27 + .lineHeight(26)
28 .fontWeight(600) 28 .fontWeight(600)
29 } 29 }
30 30
31 if(this.tipShow){ 31 if(this.tipShow){
32 Text(this.tipValue) 32 Text(this.tipValue)
33 - .margin({ top:this.titleShow?"10lpx":"0lpx" })  
34 - .fontSize("27lpx") 33 + .margin({ top:this.titleShow ? 5 : 0 })
  34 + .fontSize(14)
35 .fontWeight(400) 35 .fontWeight(400)
36 - .lineHeight('38lpx') 36 + .lineHeight(20)
37 .fontColor($r('app.color.color_999999')) 37 .fontColor($r('app.color.color_999999'))
38 } 38 }
39 - }.padding({top:"48lpx",bottom:"48lpx"}) 39 + }.padding({top:25,bottom:25})
40 .alignItems(HorizontalAlign.Center) 40 .alignItems(HorizontalAlign.Center)
41 41
42 - Divider()  
43 - .width("100%")  
44 - .strokeWidth('1lpx')  
45 - .height('1lpx')  
46 - .color($r('app.color.color_EEEEEE')) 42 + // Divider()
  43 + // .width("100%")
  44 + // .strokeWidth(0.5)
  45 + // .height(0.5)
  46 + // .color($r('app.color.color_EEEEEE'))
47 47
48 Row(){ 48 Row(){
49 Text(this.leftText) 49 Text(this.leftText)
50 - .fontSize('35lpx') 50 + .fontSize(18)
51 .fontWeight(400) 51 .fontWeight(400)
  52 + .lineHeight(26)
  53 + .fontColor('#333333')
52 .fontColor(this.leftTextColor) 54 .fontColor(this.leftTextColor)
53 .onClick(() => { 55 .onClick(() => {
54 if (this.controller != undefined){ 56 if (this.controller != undefined){
@@ -64,14 +66,15 @@ export struct MyCustomDialog { @@ -64,14 +66,15 @@ export struct MyCustomDialog {
64 .textAlign(TextAlign.Center) 66 .textAlign(TextAlign.Center)
65 67
66 Divider() 68 Divider()
67 - .width("1lpx")  
68 - .strokeWidth('1lpx') 69 + .width(0.5)
  70 + .strokeWidth(0.5)
69 .vertical(true) 71 .vertical(true)
70 - .height('92lpx') 72 + .height(50)
71 .color($r('app.color.color_EEEEEE')) 73 .color($r('app.color.color_EEEEEE'))
72 74
73 Text(this.rightText) 75 Text(this.rightText)
74 - .fontSize('35lpx') 76 + .fontSize(18)
  77 + .lineHeight(26)
75 .textAlign(TextAlign.Center) 78 .textAlign(TextAlign.Center)
76 .fontWeight(400) 79 .fontWeight(400)
77 .fontColor(this.rightTextColor) 80 .fontColor(this.rightTextColor)
@@ -88,9 +91,9 @@ export struct MyCustomDialog { @@ -88,9 +91,9 @@ export struct MyCustomDialog {
88 }).layoutWeight(1) 91 }).layoutWeight(1)
89 } 92 }
90 .alignItems(VerticalAlign.Center) 93 .alignItems(VerticalAlign.Center)
91 - .height('96lpx') 94 + .height(50)
92 }.borderRadius(10) 95 }.borderRadius(10)
93 - .width("518lpx") 96 + .width(270)
94 .backgroundColor("#FFF") 97 .backgroundColor("#FFF")
95 } 98 }
96 } 99 }
@@ -61,9 +61,9 @@ export struct AboutPageUI { @@ -61,9 +61,9 @@ export struct AboutPageUI {
61 CustomTitleUI({titleName:'关于',percent:this.percent}) 61 CustomTitleUI({titleName:'关于',percent:this.percent})
62 62
63 Image($r('app.media.setting_about_logo')) 63 Image($r('app.media.setting_about_logo'))
64 - .width(`${this.calcHeight(376)}lpx`)  
65 - .height(`${this.calcHeight(160)}lpx`)  
66 - .margin({ top: `${this.calcHeight2(180)}lpx`, bottom: `${this.calcHeight2(160)}lpx` }) 64 + .width(145)
  65 + .height(80)
  66 + .margin({ top: 46, bottom: 94 })
67 .gesture( 67 .gesture(
68 TapGesture({ count: 2 }) 68 TapGesture({ count: 2 })
69 .onAction((event: GestureEvent) => { 69 .onAction((event: GestureEvent) => {
@@ -95,28 +95,32 @@ export struct AboutPageUI { @@ -95,28 +95,32 @@ export struct AboutPageUI {
95 }) 95 })
96 }.divider({ 96 }.divider({
97 strokeWidth: 1, 97 strokeWidth: 1,
98 - startMargin: `${this.calcHeight(29)}lpx`,  
99 - endMargin: `${this.calcHeight(29)}lpx`, 98 + startMargin: 15,
  99 + endMargin: 15,
100 color: '#EDEDED' 100 color: '#EDEDED'
101 }) 101 })
102 102
103 Blank() 103 Blank()
104 104
105 Image($r('app.media.about_us_code')) 105 Image($r('app.media.about_us_code'))
106 - .width(`${this.calcHeight(192)}lpx`)  
107 - .height(`${this.calcHeight(192)}lpx`) 106 + .width(100)
  107 + .height(100)
108 108
109 Text(this.version) 109 Text(this.version)
110 - .fontSize(`${this.calcHeight(25)}lpx`) 110 + .fontSize(13)
  111 + .lineHeight(16)
  112 + .fontWeight(400)
111 .textAlign(TextAlign.Center) 113 .textAlign(TextAlign.Center)
112 - .fontColor($r("app.color.color_666666"))  
113 - .margin({ bottom: `${this.calcHeight(31)}lpx` }) 114 + .fontColor('#000000')
  115 + .margin({ top: 16, bottom: 16 })
114 116
115 Text(this.message) 117 Text(this.message)
116 - .fontSize(`${this.calcHeight(19)}lpx`) 118 + .fontSize(10)
  119 + .fontWeight(400)
  120 + .lineHeight(14)
117 .textAlign(TextAlign.Center) 121 .textAlign(TextAlign.Center)
118 .fontColor($r("app.color.color_999999")) 122 .fontColor($r("app.color.color_999999"))
119 - .margin({ bottom: `${this.calcHeight(35)}lpx` }) 123 + .margin({ bottom: 18 })
120 } 124 }
121 .width('100%') 125 .width('100%')
122 .height('100%') 126 .height('100%')
@@ -130,18 +134,20 @@ export struct AboutPageUI { @@ -130,18 +134,20 @@ export struct AboutPageUI {
130 // 左侧标题 134 // 左侧标题
131 Text(`${item}`) 135 Text(`${item}`)
132 .fontColor('#666666') 136 .fontColor('#666666')
133 - .fontSize(`${this.calcHeight(31)}lpx`) 137 + .fontSize(16)
  138 + .fontWeight(400)
  139 + .lineHeight(23)
134 140
135 Image($r('app.media.mine_user_arrow')) 141 Image($r('app.media.mine_user_arrow'))
136 - .width(`${this.calcHeight(27)}lpx`)  
137 - .height(`${this.calcHeight(27)}lpx`) 142 + .width(14)
  143 + .height(14)
138 .objectFit(ImageFit.Auto) 144 .objectFit(ImageFit.Auto)
139 } 145 }
140 .alignItems(VerticalAlign.Center) 146 .alignItems(VerticalAlign.Center)
141 .justifyContent(FlexAlign.SpaceBetween) 147 .justifyContent(FlexAlign.SpaceBetween)
142 - .height(`${this.calcHeight(97)}lpx`) 148 + .height(50)
143 .width('100%') 149 .width('100%')
144 - .padding({ left:`${this.calcHeight(29)}lpx`, right: `${this.calcHeight(29)}lpx` }) 150 + .padding({ left:15, right: 15 })
145 } 151 }
146 152
147 calcHeight(value:number): number{ 153 calcHeight(value:number): number{
@@ -12,6 +12,8 @@ import { CustomLogoutDialog } from './CustomLogoutDialog'; @@ -12,6 +12,8 @@ import { CustomLogoutDialog } from './CustomLogoutDialog';
12 import { emitter } from '@kit.BasicServicesKit'; 12 import { emitter } from '@kit.BasicServicesKit';
13 import { ConfirmLogoutDialog } from './ConfirmLogoutDialog'; 13 import { ConfirmLogoutDialog } from './ConfirmLogoutDialog';
14 import { TrackingButton, TrackConstants, TrackingPageBrowse } from 'wdTracking/Index'; 14 import { TrackingButton, TrackConstants, TrackingPageBrowse } from 'wdTracking/Index';
  15 +import { TitleBackComponent } from './TitleBackComponent';
  16 +
15 import { AccountCenterItem } from '../../viewmodel/AccountCenterItem' 17 import { AccountCenterItem } from '../../viewmodel/AccountCenterItem'
16 import { it } from '@ohos/hypium'; 18 import { it } from '@ohos/hypium';
17 19
@@ -128,7 +130,6 @@ export struct AccountAndSecurityLayout { @@ -128,7 +130,6 @@ export struct AccountAndSecurityLayout {
128 this.ifSetPassword = false 130 this.ifSetPassword = false
129 } 131 }
130 } 132 }
131 - }).catch((err: Error) => {  
132 }) 133 })
133 } 134 }
134 135
@@ -158,7 +159,7 @@ export struct AccountAndSecurityLayout { @@ -158,7 +159,7 @@ export struct AccountAndSecurityLayout {
158 if(eventData&&eventData.data){ 159 if(eventData&&eventData.data){
159 this.listData[0].subTitle = eventData.data['content'] 160 this.listData[0].subTitle = eventData.data['content']
160 } 161 }
161 - Logger.debug( 'event callback:' + JSON.stringify(eventData)); 162 + // Logger.debug( 'event callback:' + JSON.stringify(eventData));
162 }; 163 };
163 164
164 // 订阅eventId为1的事件 165 // 订阅eventId为1的事件
@@ -169,6 +170,7 @@ export struct AccountAndSecurityLayout { @@ -169,6 +170,7 @@ export struct AccountAndSecurityLayout {
169 build() { 170 build() {
170 Column(){ 171 Column(){
171 if(this.isAccountPage){ 172 if(this.isAccountPage){
  173 + TitleBackComponent({title:"账户管理"})
172 this.settingList() 174 this.settingList()
173 }else { 175 }else {
174 this.logoutLayout() 176 this.logoutLayout()
@@ -180,55 +182,39 @@ export struct AccountAndSecurityLayout { @@ -180,55 +182,39 @@ export struct AccountAndSecurityLayout {
180 @Builder settingList() { 182 @Builder settingList() {
181 Stack({ alignContent: Alignment.Bottom }) { 183 Stack({ alignContent: Alignment.Bottom }) {
182 Column() { 184 Column() {
183 - RelativeContainer() {  
184 - Text('账户管理')  
185 - .fontColor('#FF333333')  
186 - .fontSize(18)  
187 - .textAlign(TextAlign.Center)  
188 - .height(44)  
189 - .alignRules({  
190 - top: { anchor: "__container__", align: VerticalAlign.Top },  
191 - left: { anchor: "__container__", align: HorizontalAlign.Start },  
192 - right: { anchor: "__container__", align: HorizontalAlign.End },  
193 -  
194 - })  
195 - .id('titleContent')  
196 - Image($r('app.media.back_icon'))  
197 - .objectFit(ImageFit.Auto)  
198 - .height(24)  
199 - .width(24)  
200 - .margin({  
201 - left: 16, top: 8  
202 - })  
203 - .alignRules({  
204 - top: { anchor: "__container__", align: VerticalAlign.Top },  
205 - left: { anchor: "__container__", align: HorizontalAlign.Start },  
206 - })  
207 - .onClick(() => {  
208 - router.back()  
209 - })  
210 - .id('backImage')  
211 -  
212 - }.height(44)  
213 -  
214 List() { 185 List() {
215 ForEach(this.listData, (item: MineMainSettingFunctionItem, index: number) => { 186 ForEach(this.listData, (item: MineMainSettingFunctionItem, index: number) => {
216 ListItem() { 187 ListItem() {
  188 + Column(){
  189 + Column(){
217 if (item.type == 0) { 190 if (item.type == 0) {
218 - Column() {  
219 - // this.getArrowCell(item)  
220 AccountArrowCell({ item:item}) 191 AccountArrowCell({ item:item})
221 - }.padding({ left: '27lpx' }).height('117lpx').justifyContent(FlexAlign.Center)  
222 } else if (item.type == 1) { 192 } else if (item.type == 1) {
223 - Column() {  
224 this.getSwitchCell(item) 193 this.getSwitchCell(item)
225 - }.padding({ left: '27lpx' }).height('117lpx').justifyContent(FlexAlign.Center)  
226 - } else {  
227 - // Column().width('100%').height('15lpx').backgroundColor(0xf0f0f0) 194 + }
  195 + }
  196 + .margin({
  197 + left: 16,
  198 + right: 16
  199 + })
  200 +
  201 + if(index === this.listData.length - 2) {
  202 + Divider()
  203 + .color('#f0f0f0')
  204 + .strokeWidth(5)
  205 + } else if(index !== this.listData.length - 1){
  206 + Divider()
  207 + .color('#f0f0f0')
  208 + .strokeWidth(1)
  209 + .margin({
  210 + left: 16,
  211 + right: 16
  212 + })
  213 + }
228 } 214 }
229 } 215 }
230 .onClick(() => { 216 .onClick(() => {
231 - console.log(index + "") 217 + // console.log(index + "")
232 if (index == 0){ 218 if (index == 0){
233 WDRouterRule.jumpWithPage(WDRouterPage.changeBindPhonePage) 219 WDRouterRule.jumpWithPage(WDRouterPage.changeBindPhonePage)
234 }else if (index == 1) { 220 }else if (index == 1) {
@@ -242,26 +228,32 @@ export struct AccountAndSecurityLayout { @@ -242,26 +228,32 @@ export struct AccountAndSecurityLayout {
242 } 228 }
243 }else if (index == 3) { 229 }else if (index == 3) {
244 trackButtonClick("accountManagementPageAccountCancellation") 230 trackButtonClick("accountManagementPageAccountCancellation")
245 - this.isAccountPage=false 231 + this.isAccountPage = false
246 this.logoutLayoutShowTime = DateTimeUtils.getTimeStamp() 232 this.logoutLayoutShowTime = DateTimeUtils.getTimeStamp()
247 } 233 }
248 }) 234 })
249 235
250 }) 236 })
251 } 237 }
252 - .divider({  
253 - strokeWidth: 1,  
254 - startMargin: 15,  
255 - endMargin: 10,  
256 - color: '#f0f0f0'  
257 - })  
258 .onScrollFrameBegin((offset, state) => { 238 .onScrollFrameBegin((offset, state) => {
259 return { offsetRemain: 0 } 239 return { offsetRemain: 0 }
260 }) 240 })
261 - }.height("100%") 241 + }
  242 + .height('90%')
  243 + .backgroundColor(Color.White)
262 244
263 Column() { 245 Column() {
264 - Button('退出登录',{ stateEffect: true ,type: ButtonType.Normal}).width('90%').height('80lpx').backgroundColor('#da3e22').fontColor('#fff').margin('20lpx').borderRadius('8lpx').onClick(()=>{ 246 + Button('退出登录',{ stateEffect: true ,type: ButtonType.Normal})
  247 + .width('90%')
  248 + .height(44)
  249 + .backgroundColor('#ED2800')
  250 + .fontColor('#FFFFFF')
  251 + .fontWeight(400)
  252 + .fontFamily('PingFang SC-Regular')
  253 + .fontSize(18)
  254 + .margin(15)
  255 + .borderRadius(5)
  256 + .onClick(()=>{
265 trackButtonClick("accountManagementPageLogout") 257 trackButtonClick("accountManagementPageLogout")
266 this.confirmDialogController.open() 258 this.confirmDialogController.open()
267 }) 259 })
@@ -272,7 +264,7 @@ export struct AccountAndSecurityLayout { @@ -272,7 +264,7 @@ export struct AccountAndSecurityLayout {
272 @Builder itemHead(text: string) { 264 @Builder itemHead(text: string) {
273 // 列表分组的头部组件，对应联系人分组A、B等位置的组件 265 // 列表分组的头部组件，对应联系人分组A、B等位置的组件
274 if (text.length > 0) { 266 if (text.length > 0) {
275 - Row().width('100%').height('20lpx').backgroundColor(0xf0f0f0) 267 + Row().width('100%').height(10).backgroundColor(0xf0f0f0)
276 } 268 }
277 } 269 }
278 270
@@ -281,10 +273,10 @@ export struct AccountAndSecurityLayout { @@ -281,10 +273,10 @@ export struct AccountAndSecurityLayout {
281 Column() { 273 Column() {
282 RelativeContainer() { 274 RelativeContainer() {
283 Text('注销账号') 275 Text('注销账号')
284 - .fontColor('#FF333333')  
285 - .fontSize("35lpx") 276 + .fontColor('#333333')
  277 + .fontSize(18)
286 .fontWeight(400) 278 .fontWeight(400)
287 - .lineHeight("50lpx") 279 + .lineHeight(26)
288 .textAlign(TextAlign.Center) 280 .textAlign(TextAlign.Center)
289 .height(44) 281 .height(44)
290 .alignRules({ 282 .alignRules({
@@ -306,56 +298,61 @@ export struct AccountAndSecurityLayout { @@ -306,56 +298,61 @@ export struct AccountAndSecurityLayout {
306 left: { anchor: "__container__", align: HorizontalAlign.Start }, 298 left: { anchor: "__container__", align: HorizontalAlign.Start },
307 }) 299 })
308 .onClick(() => { 300 .onClick(() => {
309 - this.isAccountPage=true 301 + this.isAccountPage = true
310 this.pageShowAccountTime = DateTimeUtils.getTimeStamp() 302 this.pageShowAccountTime = DateTimeUtils.getTimeStamp()
311 this.logoutLayoutHide() 303 this.logoutLayoutHide()
312 - this.protocolState=false 304 + this.protocolState = false
313 }) 305 })
314 .id('backImage') 306 .id('backImage')
315 307
316 }.height(44) 308 }.height(44)
317 309
318 Text('为保证您的账号安全，在您提交的注销申请生效前，需同时满足以下几个条件：') 310 Text('为保证您的账号安全，在您提交的注销申请生效前，需同时满足以下几个条件：')
319 - .fontColor('#FF222222') 311 + .fontColor('#222222')
320 .fontWeight(600) 312 .fontWeight(600)
321 - .lineHeight("42lpx")  
322 - .fontSize("31lpx")  
323 - .padding({ top:17,left: "31lpx", right: "31lpx" }) 313 + .lineHeight(22)
  314 + .fontSize(16)
  315 + .padding({ top:17,left: 16, right: 16 })
324 .width('100%') 316 .width('100%')
325 317
326 Text('1. 账号处于安全状态') 318 Text('1. 账号处于安全状态')
327 - .fontColor('#FF222222') 319 + .fontColor('#222222')
328 .fontSize(16) 320 .fontSize(16)
  321 + .lineHeight(22)
329 .fontWeight(600) 322 .fontWeight(600)
330 - .padding({ top: 24, left: "62lpx" }) 323 + .padding({ top: 24, left: 16 })
331 .width('100%') 324 .width('100%')
332 325
333 Text('账号处于正常使用状态，无被盗风险。') 326 Text('账号处于正常使用状态，无被盗风险。')
334 - .fontColor('#FF666666') 327 + .fontColor('#666666')
335 .fontSize(14) 328 .fontSize(14)
336 .fontWeight(400) 329 .fontWeight(400)
337 - .padding({ top: 8, left: "62lpx" }) 330 + .lineHeight(18)
  331 + .padding({ top: 8, left: 16 })
338 .width('100%') 332 .width('100%')
339 333
340 Text('2. 账号权限解除') 334 Text('2. 账号权限解除')
341 - .fontColor('#FF222222') 335 + .fontColor('#222222')
342 .fontSize(16) 336 .fontSize(16)
  337 + .lineHeight(22)
343 .fontWeight(600) 338 .fontWeight(600)
344 - .padding({ top: 24, left: "62lpx" }) 339 + .padding({ top: 24, left: 16 })
345 .width('100%') 340 .width('100%')
346 341
347 Text('账号已解除与其他产品的授权登录或绑定关系。') 342 Text('账号已解除与其他产品的授权登录或绑定关系。')
348 - .fontColor('#FF666666') 343 + .fontColor('#666666')
349 .fontSize(14) 344 .fontSize(14)
350 .fontWeight(400) 345 .fontWeight(400)
351 - .padding({ top: 8, left: "62lpx" }) 346 + .lineHeight(18)
  347 + .padding({ top: 8, left: 16 })
352 .width('100%') 348 .width('100%')
353 349
354 Text('3. 账号无任何纠纷，包括举报投诉') 350 Text('3. 账号无任何纠纷，包括举报投诉')
355 - .fontColor('#FF222222') 351 + .fontColor('#222222')
356 .fontSize(16) 352 .fontSize(16)
  353 + .lineHeight(22)
357 .fontWeight(600) 354 .fontWeight(600)
358 - .padding({ top: 24, left: "62lpx" }) 355 + .padding({ top: 24, left: 16 })
359 .width('100%') 356 .width('100%')
360 357
361 if (this.userType === 1 && this.logOffWaitTime.length > 0) { 358 if (this.userType === 1 && this.logOffWaitTime.length > 0) {
@@ -366,6 +363,13 @@ export struct AccountAndSecurityLayout { @@ -366,6 +363,13 @@ export struct AccountAndSecurityLayout {
366 .padding({ top: 32, left: "31lpx", right: "31lpx" }) 363 .padding({ top: 32, left: "31lpx", right: "31lpx" })
367 .width('100%') 364 .width('100%')
368 } 365 }
  366 + Text('请注意：注销后7天内不能再次注册人民日报客户端，需要等到账号冷静期结束才能再次登录注册')
  367 + .fontColor('#ED2800')
  368 + .fontSize(14)
  369 + .fontWeight(400)
  370 + .lineHeight(20)
  371 + .padding({ top: 32, left: 16, right: 16 })
  372 + .width('100%')
369 373
370 }.alignRules({ 374 }.alignRules({
371 top: { anchor: "__container__", align: VerticalAlign.Top }, 375 top: { anchor: "__container__", align: VerticalAlign.Top },
@@ -378,16 +382,16 @@ export struct AccountAndSecurityLayout { @@ -378,16 +382,16 @@ export struct AccountAndSecurityLayout {
378 Column() { 382 Column() {
379 Row() { 383 Row() {
380 Image(this.protocolState ? $r("app.media.logout_checkbox_select") : $r("app.media.logout_checkbox_unselected")) 384 Image(this.protocolState ? $r("app.media.logout_checkbox_select") : $r("app.media.logout_checkbox_unselected"))
381 - .width(15)  
382 - .height(15) 385 + .width(18)
  386 + .height(18)
383 .onClick(() => { 387 .onClick(() => {
384 this.protocolState = !this.protocolState 388 this.protocolState = !this.protocolState
385 389
386 }) 390 })
387 391
388 Text() { 392 Text() {
389 - Span("我已阅读并同意").fontColor("#999999").fontSize(12)  
390 - Span("《用户注销协议》").fontColor("#ED2800").fontSize(12).onClick(() => { 393 + Span("我已阅读并同意").fontColor("#999999").fontSize(12).lineHeight(18)
  394 + Span("《用户注销协议》").fontColor("#ED2800").fontSize(12).lineHeight(18).onClick(() => {
391 TrackingButton.click("cancelAccountPageUserLogoffAgreement",TrackConstants.PageName.Cancel_Account,TrackConstants.PageName.Cancel_Account) 395 TrackingButton.click("cancelAccountPageUserLogoffAgreement",TrackConstants.PageName.Cancel_Account,TrackConstants.PageName.Cancel_Account)
392 let bean = { contentID: "3", pageID: "" } as Params 396 let bean = { contentID: "3", pageID: "" } as Params
393 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean) 397 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
@@ -400,8 +404,9 @@ export struct AccountAndSecurityLayout { @@ -400,8 +404,9 @@ export struct AccountAndSecurityLayout {
400 .borderRadius(4) 404 .borderRadius(4)
401 .fontColor(this.protocolState ? "#FFFFFFFF" : "#66FFFFFF") 405 .fontColor(this.protocolState ? "#FFFFFFFF" : "#66FFFFFF")
402 .fontSize(18) 406 .fontSize(18)
  407 + .lineHeight(26)
403 .fontWeight(FontWeight.Medium) 408 .fontWeight(FontWeight.Medium)
404 - .margin({ top: 20 }) 409 + .margin({ top: 24 })
405 .height(44) 410 .height(44)
406 .textAlign(TextAlign.Center) 411 .textAlign(TextAlign.Center)
407 .width("100%") 412 .width("100%")
@@ -414,7 +419,7 @@ export struct AccountAndSecurityLayout { @@ -414,7 +419,7 @@ export struct AccountAndSecurityLayout {
414 this.dialogController.open() 419 this.dialogController.open()
415 420
416 }) 421 })
417 - }.padding({ left: 25, right: 25 }).width('100%') 422 + }.padding({ left: 25, right: 25 }).height(44).width('100%')
418 }.alignRules({ 423 }.alignRules({
419 bottom: { anchor: "__container__", align: VerticalAlign.Bottom }, 424 bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
420 left: { anchor: "__container__", align: HorizontalAlign.Start }, 425 left: { anchor: "__container__", align: HorizontalAlign.Start },
@@ -434,71 +439,46 @@ export struct AccountAndSecurityLayout { @@ -434,71 +439,46 @@ export struct AccountAndSecurityLayout {
434 Row() { 439 Row() {
435 // 判断有没有图片 440 // 判断有没有图片
436 if (item.imgSrc) { 441 if (item.imgSrc) {
437 - Image(item.imgSrc).height('38lpx').margin({ right: '5lpx' })  
438 - Text(`${item.title}`).margin({ top: '8lpx' }).height('38lpx').fontColor('#333333').fontSize('29lpx') 442 + Image(item.imgSrc)
  443 + .height(20)
  444 + .width(20)
  445 + .margin({ right: 16 })
  446 + Text(`${item.title}`)
  447 + .lineHeight(20)
  448 + .fontColor('#222222')
  449 + .fontSize(15)
  450 + .fontWeight(400)
  451 + .fontFamily('PingFang SC-Regular')
439 } else { 452 } else {
440 - Text(`${item.title}`).margin({ top: '8lpx' }).height('38lpx').fontColor('#333333').fontSize('29lpx') 453 + Text(`${item.title}`)
  454 + .lineHeight(20)
  455 + .fontColor('#222222')
  456 + .fontSize(15)
  457 + .fontWeight(400)
  458 + .fontFamily('PingFang SC-Regular')
441 } 459 }
442 }.width('60%') 460 }.width('60%')
443 461
444 // 右侧文案和右箭头 462 // 右侧文案和右箭头
445 Row() { 463 Row() {
446 Toggle({ type: ToggleType.Switch, isOn: item.switchState }) 464 Toggle({ type: ToggleType.Switch, isOn: item.switchState })
447 - .height('50lpx')  
448 - .margin({ left: '81lpx', right: '29lpx' })  
449 - .selectedColor(Color.Pink) 465 + .height(30)
  466 + .width(50)
  467 + .selectedColor("#ED2800")
450 .onChange((isOn: boolean) => { 468 .onChange((isOn: boolean) => {
451 this.privacySwitch = isOn; 469 this.privacySwitch = isOn;
452 }) 470 })
453 - }.width('40%')  
454 - .margin({ right: '29lpx' })  
455 - .justifyContent(FlexAlign.End)  
456 -  
457 - }  
458 - .alignItems(VerticalAlign.Center)  
459 - .justifyContent(FlexAlign.SpaceBetween)  
460 - }.height('54lpx')  
461 - }  
462 -  
463 - // 右文字+箭头cell  
464 - @Builder getArrowCell(item: MineMainSettingFunctionItem) {  
465 - Column() {  
466 - Row() {  
467 - // 左侧logo和标题  
468 - Row() {  
469 - // 判断有没有图片  
470 - if (item.imgSrc) {  
471 - Image(item.imgSrc)  
472 - .height('38lpx')  
473 - .margin({ right: '5lpx' })  
474 } 471 }
475 - Text(`${item.title}`)  
476 - .margin({ top: '8lpx' })  
477 - .height('38lpx')  
478 - .fontColor('#333333')  
479 - .fontSize('29lpx')  
480 - }.width('60%')  
481 -  
482 - // 右侧文案和右箭头  
483 - Row() {  
484 - Text(item.subTitle ? item.subTitle : '')  
485 - .fontColor('#999999')  
486 - .maxLines(1)  
487 - Image($r('app.media.mine_user_arrow'))  
488 - .width('27lpx')  
489 - .height('27lpx')  
490 - .objectFit(ImageFit.Auto)  
491 - Column().width('29lpx')  
492 - }.width('40%')  
493 - .margin({ right: '29lpx' }) 472 + .width('40%')
494 .justifyContent(FlexAlign.End) 473 .justifyContent(FlexAlign.End)
495 474
496 } 475 }
497 .alignItems(VerticalAlign.Center) 476 .alignItems(VerticalAlign.Center)
498 .justifyContent(FlexAlign.SpaceBetween) 477 .justifyContent(FlexAlign.SpaceBetween)
499 -  
500 } 478 }
501 - .height('54lpx') 479 + .height(56)
  480 + .justifyContent(FlexAlign.Center)
  481 + .alignItems(HorizontalAlign.Center)
502 } 482 }
503 483
504 logout(){ 484 logout(){
@@ -548,14 +528,16 @@ export struct AccountArrowCell{ @@ -548,14 +528,16 @@ export struct AccountArrowCell{
548 // 判断有没有图片 528 // 判断有没有图片
549 if (this.item.imgSrc) { 529 if (this.item.imgSrc) {
550 Image(this.item.imgSrc) 530 Image(this.item.imgSrc)
551 - .height('38lpx')  
552 - .margin({ right: '5lpx' }) 531 + .height(20)
  532 + .width(20)
  533 + .margin({ right: 16 })
553 } 534 }
554 Text(`${this.item.title}`) 535 Text(`${this.item.title}`)
555 - .margin({ top: '8lpx' })  
556 - .height('38lpx')  
557 - .fontColor('#333333')  
558 - .fontSize('29lpx') 536 + .lineHeight(20)
  537 + .fontColor('#222222')
  538 + .fontSize(15)
  539 + .fontWeight(400)
  540 + .fontFamily('PingFang SC-Regular')
559 }.width('60%') 541 }.width('60%')
560 542
561 // 右侧文案和右箭头 543 // 右侧文案和右箭头
@@ -563,20 +545,24 @@ export struct AccountArrowCell{ @@ -563,20 +545,24 @@ export struct AccountArrowCell{
563 Text(this.item.subTitle ? this.item.subTitle : '') 545 Text(this.item.subTitle ? this.item.subTitle : '')
564 .fontColor('#999999') 546 .fontColor('#999999')
565 .maxLines(1) 547 .maxLines(1)
  548 + .lineHeight(18)
  549 + .fontSize(14)
  550 + .fontWeight(400)
  551 + .fontFamily('PingFang SC-Regular')
566 Image($r('app.media.mine_user_arrow')) 552 Image($r('app.media.mine_user_arrow'))
567 - .width('27lpx')  
568 - .height('27lpx') 553 + .width(14)
  554 + .height(14)
569 .objectFit(ImageFit.Auto) 555 .objectFit(ImageFit.Auto)
570 - Column().width('29lpx')  
571 }.width('40%') 556 }.width('40%')
572 - .margin({ right: '29lpx' })  
573 .justifyContent(FlexAlign.End) 557 .justifyContent(FlexAlign.End)
574 558
575 } 559 }
576 .alignItems(VerticalAlign.Center) 560 .alignItems(VerticalAlign.Center)
577 .justifyContent(FlexAlign.SpaceBetween) 561 .justifyContent(FlexAlign.SpaceBetween)
578 } 562 }
579 - .height('54lpx') 563 + .height(56)
  564 + .justifyContent(FlexAlign.Center)
  565 + .alignItems(HorizontalAlign.Center)
580 } 566 }
581 } 567 }
582 568
@@ -24,21 +24,21 @@ export struct ConfirmLogoutDialog { @@ -24,21 +24,21 @@ export struct ConfirmLogoutDialog {
24 Column(){ 24 Column(){
25 if(this.titleShow){ 25 if(this.titleShow){
26 Text(this.title) 26 Text(this.title)
27 - .fontSize("32lpx") 27 + .fontSize(18)
28 .fontColor($r('app.color.color_333333')) 28 .fontColor($r('app.color.color_333333'))
29 - .lineHeight('50lpx') 29 + .lineHeight(26)
30 .fontWeight(600) 30 .fontWeight(600)
31 } 31 }
32 32
33 if(this.tipShow){ 33 if(this.tipShow){
34 Text(this.tipValue) 34 Text(this.tipValue)
35 - .margin({ top:this.titleShow?"10lpx":"0lpx" })  
36 - .fontSize("27lpx") 35 + .margin({ top:this.titleShow ? 5 : 0 })
  36 + .fontSize(14)
37 .fontWeight(400) 37 .fontWeight(400)
38 - .lineHeight('38lpx') 38 + .lineHeight(20)
39 .fontColor($r('app.color.color_999999')) 39 .fontColor($r('app.color.color_999999'))
40 } 40 }
41 - }.padding({top:"48lpx",bottom:"48lpx"}) 41 + }.padding(25)
42 .alignItems(HorizontalAlign.Center) 42 .alignItems(HorizontalAlign.Center)
43 43
44 Divider() 44 Divider()
@@ -49,8 +49,9 @@ export struct ConfirmLogoutDialog { @@ -49,8 +49,9 @@ export struct ConfirmLogoutDialog {
49 49
50 Row(){ 50 Row(){
51 Text(this.leftText) 51 Text(this.leftText)
52 - .fontSize('35lpx') 52 + .fontSize(18)
53 .fontWeight(400) 53 .fontWeight(400)
  54 + .lineHeight(26)
54 .fontColor(this.leftTextColor) 55 .fontColor(this.leftTextColor)
55 .onClick(() => { 56 .onClick(() => {
56 if (this.controller != undefined){ 57 if (this.controller != undefined){
@@ -66,14 +67,15 @@ export struct ConfirmLogoutDialog { @@ -66,14 +67,15 @@ export struct ConfirmLogoutDialog {
66 .textAlign(TextAlign.Center) 67 .textAlign(TextAlign.Center)
67 68
68 Divider() 69 Divider()
69 - .width("1lpx")  
70 - .strokeWidth('1lpx') 70 + .width(0.5)
  71 + .strokeWidth(0.5)
71 .vertical(true) 72 .vertical(true)
72 - .height('92lpx') 73 + .height(50)
73 .color($r('app.color.color_EEEEEE')) 74 .color($r('app.color.color_EEEEEE'))
74 75
75 Text(this.rightText) 76 Text(this.rightText)
76 - .fontSize('35lpx') 77 + .fontSize(18)
  78 + .lineHeight(26)
77 .textAlign(TextAlign.Center) 79 .textAlign(TextAlign.Center)
78 .fontWeight(400) 80 .fontWeight(400)
79 .fontColor(this.rightTextColor) 81 .fontColor(this.rightTextColor)
@@ -90,9 +92,9 @@ export struct ConfirmLogoutDialog { @@ -90,9 +92,9 @@ export struct ConfirmLogoutDialog {
90 }).layoutWeight(1) 92 }).layoutWeight(1)
91 } 93 }
92 .alignItems(VerticalAlign.Center) 94 .alignItems(VerticalAlign.Center)
93 - .height('96lpx') 95 + .height(50)
94 }.borderRadius(10) 96 }.borderRadius(10)
95 - .width("518lpx")  
96 - .backgroundColor("#FFF") 97 + .width(270)
  98 + .backgroundColor('#FFFFFF')
97 } 99 }
98 } 100 }
@@ -106,31 +106,48 @@ export struct MineSettingComponent { @@ -106,31 +106,48 @@ export struct MineSettingComponent {
106 // 循环渲染ListItemGroup，contactsGroups为多个分组联系人contacts和标题title的数据集合 106 // 循环渲染ListItemGroup，contactsGroups为多个分组联系人contacts和标题title的数据集合
107 ForEach(this.listData, (item: MineMainSettingFunctionItem, index: number) => { 107 ForEach(this.listData, (item: MineMainSettingFunctionItem, index: number) => {
108 ListItem() { 108 ListItem() {
  109 + Column(){
  110 + Column(){
109 if (item.type == 0) { 111 if (item.type == 0) {
110 - Column() {  
111 this.getArrowCell(item,index) 112 this.getArrowCell(item,index)
112 - }.padding({ left: `${this.calcHeight(27)}lpx` }).height(`${this.calcHeight(117)}lpx`).justifyContent(FlexAlign.Center)  
113 } else if (item.type == 1) { 113 } else if (item.type == 1) {
114 - Column() {  
115 this.getSwitchCell(item,index) 114 this.getSwitchCell(item,index)
116 - }.padding({ left: `${this.calcHeight(27)}lpx` }).height(`${this.calcHeight(117)}lpx`).justifyContent(FlexAlign.Center)  
117 - } else {  
118 - Column().width('100%').height(`${this.calcHeight(15)}lpx`).backgroundColor(0xf0f0f0) 115 + }
  116 + }
  117 + .margin({
  118 + left: 16,
  119 + right: 16
  120 + })
  121 + if(index === this.listData.length - 2) {
  122 + Divider()
  123 + .color('#f0f0f0')
  124 + .strokeWidth(5)
  125 + } else if(index !== this.listData.length - 1) {
  126 + Divider()
  127 + .color('#f0f0f0')
  128 + .strokeWidth(1)
  129 + .margin({
  130 + left: 16,
  131 + right: 16
  132 + })
  133 + }
119 } 134 }
120 } 135 }
121 }) 136 })
122 }.onScrollFrameBegin((offset, state) => { 137 }.onScrollFrameBegin((offset, state) => {
123 return { offsetRemain: 0 } 138 return { offsetRemain: 0 }
124 - }).divider({strokeWidth:1,color:"#f0f0f0",startMargin: 15,endMargin: 10}) 139 + })
125 } 140 }
126 .backgroundColor(Color.White) 141 .backgroundColor(Color.White)
127 - .borderRadius(8)  
128 } 142 }
129 143
130 @Builder itemHead(text: string) { 144 @Builder itemHead(text: string) {
131 // 列表分组的头部组件，对应联系人分组A、B等位置的组件 145 // 列表分组的头部组件，对应联系人分组A、B等位置的组件
132 if (text.length > 0) { 146 if (text.length > 0) {
133 - Row().width('100%').height(`${this.calcHeight(20)}lpx`).backgroundColor(0xf0f0f0) 147 + Row()
  148 + .width('100%')
  149 + .height(10)
  150 + .backgroundColor(0xf0f0f0)
134 } 151 }
135 } 152 }
136 153
@@ -143,32 +160,34 @@ export struct MineSettingComponent { @@ -143,32 +160,34 @@ export struct MineSettingComponent {
143 // 判断有没有图片 160 // 判断有没有图片
144 if (0) { 161 if (0) {
145 Image('https://pic.rmb.bdstatic.com/e182cf67c341d1128d2a6cc05886bf62.jpeg@s_0,h_2000') 162 Image('https://pic.rmb.bdstatic.com/e182cf67c341d1128d2a6cc05886bf62.jpeg@s_0,h_2000')
146 - .height(`${this.calcHeight(38)}lpx`)  
147 - .margin({ right: `${this.calcHeight(5)}lpx` }) 163 + .height(20)
  164 + .width(20)
  165 + .margin({ right: 16 })
148 166
149 Text(`${item.title}`) 167 Text(`${item.title}`)
150 - .margin({ top: `${this.calcHeight(8)}lpx` })  
151 - .height(`${this.calcHeight(38)}lpx`)  
152 - .fontColor('#333333')  
153 - .fontSize(`${this.calcHeight(29)}lpx`) 168 + .lineHeight(20)
  169 + .fontColor('#222222')
  170 + .fontSize(15)
  171 + .fontWeight(400)
  172 + .fontFamily('PingFang SC-Regular')
154 } else { 173 } else {
155 Text(`${item.title}`) 174 Text(`${item.title}`)
156 - .margin({ top: `${this.calcHeight(8)}lpx` })  
157 - .height(`${this.calcHeight(38)}lpx`)  
158 - .fontColor('#333333')  
159 - .fontSize(`${this.calcHeight(29)}lpx`) 175 + .lineHeight(20)
  176 + .fontColor('#222222')
  177 + .fontSize(15)
  178 + .fontWeight(400)
  179 + .fontFamily('PingFang SC-Regular')
160 } 180 }
161 }.width('60%') 181 }.width('60%')
162 182
163 // 右侧文案和右箭头 183 // 右侧文案和右箭头
164 Row() { 184 Row() {
165 Toggle({ type: ToggleType.Switch, isOn: item.switchState }) 185 Toggle({ type: ToggleType.Switch, isOn: item.switchState })
166 - .height(`${this.calcHeight(50)}lpx`)  
167 - .width(`${this.calcHeight(96)}lpx`)  
168 - .margin({ left: `${this.calcHeight(81)}lpx`, right: `${this.calcHeight(29)}lpx` }) 186 + .height(30)
  187 + .width(50)
169 .selectedColor("#ED2800") 188 .selectedColor("#ED2800")
170 .onChange((isOn: boolean) => { 189 .onChange((isOn: boolean) => {
171 - Logger.debug("SPHelper", "数据 ： " + JSON.stringify(item)) 190 + // Logger.debug("SPHelper", "数据 ： " + JSON.stringify(item))
172 if(item.itemType=='push_switch'){ 191 if(item.itemType=='push_switch'){
173 trackButtonClick("settingPagePushSwitch") 192 trackButtonClick("settingPagePushSwitch")
174 //推送 193 //推送
@@ -187,43 +206,53 @@ export struct MineSettingComponent { @@ -187,43 +206,53 @@ export struct MineSettingComponent {
187 SPHelper.default.save(SpConstants.SETTING_SUSPENSION_SWITCH,isOn) 206 SPHelper.default.save(SpConstants.SETTING_SUSPENSION_SWITCH,isOn)
188 } 207 }
189 }) 208 })
190 - }.width('40%')  
191 - .margin({ right: `${this.calcHeight(29)}lpx` }) 209 + }
  210 + .width('40%')
192 .justifyContent(FlexAlign.End) 211 .justifyContent(FlexAlign.End)
193 212
194 } 213 }
195 .alignItems(VerticalAlign.Center) 214 .alignItems(VerticalAlign.Center)
196 .justifyContent(FlexAlign.SpaceBetween) 215 .justifyContent(FlexAlign.SpaceBetween)
197 - }.height(`${this.calcHeight(54)}lpx`) 216 + }
  217 + .height(56)
  218 + .justifyContent(FlexAlign.Center)
  219 + .alignItems(HorizontalAlign.Center)
198 } 220 }
199 221
200 // 右文字+箭头cell 222 // 右文字+箭头cell
201 @Builder getArrowCell(item:MineMainSettingFunctionItem, index:number) { 223 @Builder getArrowCell(item:MineMainSettingFunctionItem, index:number) {
202 Column() { 224 Column() {
203 -  
204 Row() { 225 Row() {
205 // 左侧logo和标题 226 // 左侧logo和标题
206 Row() { 227 Row() {
207 Text(`${item.title}`) 228 Text(`${item.title}`)
208 - .margin({ top: `${this.calcHeight(8)}lpx` })  
209 - .height(`${this.calcHeight(38)}lpx`)  
210 - .fontColor('#333333')  
211 - .fontSize(`${this.calcHeight(29)}lpx`)  
212 - }.width('60%') 229 + .lineHeight(20)
  230 + .fontColor('#222222')
  231 + .fontSize(15)
  232 + .fontWeight(400)
  233 + .fontFamily('PingFang SC-Regular')
  234 + }
  235 + .width('60%')
213 236
214 // 右侧文案和右箭头 237 // 右侧文案和右箭头
215 Row() { 238 Row() {
216 - Text((item.itemType=='clear_cache') ? this.cacheSize.toFixed(2) + 'M' : '') 239 + Text((item.itemType=='clear_cache') ? this.cacheSize.toFixed(2) + 'MB' : '')
217 .fontColor('#999999') 240 .fontColor('#999999')
218 .maxLines(1) 241 .maxLines(1)
  242 + .lineHeight(18)
  243 + .fontSize(14)
  244 + .fontWeight(400)
  245 + .fontFamily('PingFang SC-Regular')
219 Image($r('app.media.mine_user_arrow_2')) 246 Image($r('app.media.mine_user_arrow_2'))
220 - .width(`${this.calcHeight(27)}lpx`)  
221 - .height(`${this.calcHeight(27)}lpx`) 247 + .width(14)
  248 + .height(14)
222 .objectFit(ImageFit.Auto) 249 .objectFit(ImageFit.Auto)
223 .interpolation(ImageInterpolation.High) 250 .interpolation(ImageInterpolation.High)
224 - Column().width(`${this.calcHeight(29)}lpx`)  
225 - }.width('40%')  
226 - .margin({ right: `${this.calcHeight(29)}lpx` }) 251 + .margin({
  252 + left: 5
  253 + })
  254 + }
  255 + .width('40%')
227 .justifyContent(FlexAlign.End) 256 .justifyContent(FlexAlign.End)
228 257
229 } 258 }
@@ -231,7 +260,9 @@ export struct MineSettingComponent { @@ -231,7 +260,9 @@ export struct MineSettingComponent {
231 .justifyContent(FlexAlign.SpaceBetween) 260 .justifyContent(FlexAlign.SpaceBetween)
232 261
233 } 262 }
234 - .height(`${this.calcHeight(54)}lpx`) 263 + .height(56)
  264 + .justifyContent(FlexAlign.Center)
  265 + .alignItems(HorizontalAlign.Center)
235 .onClick(() => { 266 .onClick(() => {
236 if (item.itemType == 'account') { 267 if (item.itemType == 'account') {
237 trackButtonClick("settingPageAccountManagement") 268 trackButtonClick("settingPageAccountManagement")
@@ -255,12 +286,12 @@ export struct MineSettingComponent { @@ -255,12 +286,12 @@ export struct MineSettingComponent {
255 let context = getContext(this) as common.UIAbilityContext 286 let context = getContext(this) as common.UIAbilityContext
256 let application = context.getApplicationContext(); 287 let application = context.getApplicationContext();
257 let appPath = application.cacheDir 288 let appPath = application.cacheDir
258 - Logger.debug("MineSettingComponent", appPath) 289 + // Logger.debug("MineSettingComponent", appPath)
259 fs.rmdir(appPath).then(() => { 290 fs.rmdir(appPath).then(() => {
260 this.getCacheSize() 291 this.getCacheSize()
261 }) 292 })
262 let path = context.cacheDir 293 let path = context.cacheDir
263 - Logger.debug("MineSettingComponent", path) 294 + // Logger.debug("MineSettingComponent", path)
264 fs.rmdir(path).then(() => { 295 fs.rmdir(path).then(() => {
265 this.getCacheSize() 296 this.getCacheSize()
266 }) 297 })
@@ -270,7 +301,7 @@ export struct MineSettingComponent { @@ -270,7 +301,7 @@ export struct MineSettingComponent {
270 // 获取缓存数据 301 // 获取缓存数据
271 storageStatistics.getCurrentBundleStats((err: BusinessError, bundleStats: storageStatistics.BundleStats) => { 302 storageStatistics.getCurrentBundleStats((err: BusinessError, bundleStats: storageStatistics.BundleStats) => {
272 if (err) { 303 if (err) {
273 - console.error(`Invoke getCurrentBundleStats failed, code is ${err.code}, message is ${err.message}`); 304 + // console.error(`Invoke getCurrentBundleStats failed, code is ${err.code}, message is ${err.message}`);
274 } else { 305 } else {
275 this.cacheSize = bundleStats.cacheSize / 1024.00 / 1024.00; 306 this.cacheSize = bundleStats.cacheSize / 1024.00 / 1024.00;
276 } 307 }
@@ -11,16 +11,18 @@ export struct CustomBottomFuctionUI { @@ -11,16 +11,18 @@ export struct CustomBottomFuctionUI {
11 RelativeContainer(){ 11 RelativeContainer(){
12 Row(){ 12 Row(){
13 Image(this.isAllSelect?$r("app.media.MyCollection_selected_icon"):$r("app.media.MyCollection_unselected_icon")) 13 Image(this.isAllSelect?$r("app.media.MyCollection_selected_icon"):$r("app.media.MyCollection_unselected_icon"))
14 - .width('20')  
15 - .height('20')  
16 - .margin({right:'31lpx' }) 14 + .width(20)
  15 + .height(20)
  16 + // .margin({right:'31lpx' })
  17 + .margin({right: 31 })
17 18
18 Text(this.isAllSelect?'取消全选':'全选') 19 Text(this.isAllSelect?'取消全选':'全选')
19 .fontColor($r('app.color.color_222222')) 20 .fontColor($r('app.color.color_222222'))
20 .backgroundColor(Color.White) 21 .backgroundColor(Color.White)
21 } 22 }
22 .id("allSelect_Button") 23 .id("allSelect_Button")
23 - .margin({left:'31lpx'}) 24 + // .margin({left:'31lpx'})
  25 + .margin({left: 31})
24 .alignRules({ 26 .alignRules({
25 center: {anchor: "__container__", align: VerticalAlign.Center}, 27 center: {anchor: "__container__", align: VerticalAlign.Center},
26 left: {anchor: "__container__", align: HorizontalAlign.Start} 28 left: {anchor: "__container__", align: HorizontalAlign.Start}
@@ -40,7 +42,8 @@ export struct CustomBottomFuctionUI { @@ -40,7 +42,8 @@ export struct CustomBottomFuctionUI {
40 center: {anchor: "__container__", align: VerticalAlign.Center}, 42 center: {anchor: "__container__", align: VerticalAlign.Center},
41 right: {anchor: "__container__", align: HorizontalAlign.End} 43 right: {anchor: "__container__", align: HorizontalAlign.End}
42 }) 44 })
43 - .margin({right:'31lpx'}) 45 + // .margin({right:'31lpx'})
  46 + .margin({right: 31})
44 .onClick(()=>{ 47 .onClick(()=>{
45 this.confirmCallback() 48 this.confirmCallback()
46 }) 49 })
@@ -10,8 +10,8 @@ export struct CustomSelectUI { @@ -10,8 +10,8 @@ export struct CustomSelectUI {
10 } 10 }
11 .backgroundColor(Color.White) 11 .backgroundColor(Color.White)
12 .type(ButtonType.Normal) 12 .type(ButtonType.Normal)
13 - .width('20')  
14 - .height('20') 13 + .width(20)
  14 + .height(20)
15 .onClick(() => { 15 .onClick(() => {
16 this.isOn = !this.isOn; 16 this.isOn = !this.isOn;
17 this.selectCallback(this.isOn) 17 this.selectCallback(this.isOn)
@@ -79,7 +79,7 @@ struct MineHomePage { @@ -79,7 +79,7 @@ struct MineHomePage {
79 Stack({ alignContent: Alignment.Top }){ 79 Stack({ alignContent: Alignment.Top }){
80 Image($r('app.media.title_bg')) 80 Image($r('app.media.title_bg'))
81 .width('100%') 81 .width('100%')
82 - .height('355lpx') 82 + .height(182)
83 .objectFit(ImageFit.Cover) 83 .objectFit(ImageFit.Cover)
84 84
85 Row() 85 Row()
@@ -103,19 +103,24 @@ struct MineHomePage { @@ -103,19 +103,24 @@ 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('115lpx')  
107 - .height('115lpx') 106 + .width(60)
  107 + .height(60)
108 .objectFit(ImageFit.Auto) 108 .objectFit(ImageFit.Auto)
109 - .clip(new Circle({ width: '115lpx', height: '115lpx' })) 109 + .clip(new Circle({ width: 60, height: 60 }))
110 Image(this.levelHead) 110 Image(this.levelHead)
111 - .width('165lpx')  
112 - .height('165lpx') 111 + // .width('165lpx')
  112 + .width(165)
  113 + // .height('165lpx')
  114 + .height(165)
113 .objectFit(ImageFit.Auto) 115 .objectFit(ImageFit.Auto)
114 }.onClick(()=>{ 116 }.onClick(()=>{
115 let params = {'headPhotoUrl': this.headPhotoUrl} as Record<string, string>; 117 let params = {'headPhotoUrl': this.headPhotoUrl} as Record<string, string>;
116 WDRouterRule.jumpWithPage(WDRouterPage.showUserHeaderPage,params) 118 WDRouterRule.jumpWithPage(WDRouterPage.showUserHeaderPage,params)
117 - }).width('165lpx')  
118 - .height('165lpx') 119 + })
  120 + // .width('165lpx')
  121 + .width(165)
  122 + // .height('165lpx')
  123 + .height(165)
119 124
120 Column() { 125 Column() {
121 Row() { 126 Row() {
@@ -123,9 +128,12 @@ struct MineHomePage { @@ -123,9 +128,12 @@ struct MineHomePage {
123 .fontColor($r('app.color.white')) 128 .fontColor($r('app.color.white'))
124 .maxLines(1) 129 .maxLines(1)
125 .textOverflow({ overflow: TextOverflow.Ellipsis }) 130 .textOverflow({ overflow: TextOverflow.Ellipsis })
126 - .fontSize('38lpx')  
127 - .lineHeight('50lpx')  
128 - .fontWeight('500lpx') 131 + // .fontSize('38lpx')
  132 + .fontSize(38)
  133 + // .lineHeight('50lpx')
  134 + .lineHeight(50)
  135 + // .fontWeight('500lpx')
  136 + .fontWeight(500)
129 .onClick(()=>{ 137 .onClick(()=>{
130 let params: editModelParams = { 138 let params: editModelParams = {
131 editContent: this.userName 139 editContent: this.userName
@@ -136,18 +144,24 @@ struct MineHomePage { @@ -136,18 +144,24 @@ struct MineHomePage {
136 if(this.levelId>0){ 144 if(this.levelId>0){
137 Text(`等级${this.levelId}`) 145 Text(`等级${this.levelId}`)
138 .fontColor($r('app.color.color_ED2800')) 146 .fontColor($r('app.color.color_ED2800'))
139 - .fontSize('23lpx') 147 + // .fontSize('23lpx')
  148 + .fontSize(23)
140 .fontWeight(500) 149 .fontWeight(500)
141 - .margin({ left: '10lpx' }) 150 + // .margin({ left: '10lpx' })
  151 + .margin({ left: 10 })
142 .backgroundImage($r("app.media.my_grade_bg")) 152 .backgroundImage($r("app.media.my_grade_bg"))
143 .backgroundImageSize(ImageSize.Cover) 153 .backgroundImageSize(ImageSize.Cover)
144 - .padding({left:"17lpx",right:"8lpx"})  
145 - .height('35lpx') 154 + // .padding({left:"17lpx",right:"8lpx"})
  155 + .padding({left: 17,right: 8})
  156 + // .height('35lpx')
  157 + .height(35)
146 .borderRadius({topRight:2,bottomRight:2}) 158 .borderRadius({topRight:2,bottomRight:2})
147 } 159 }
148 160
149 Blank() 161 Blank()
150 - }.width('507lpx') 162 + }
  163 + // .width('507lpx')
  164 + .width(507)
151 165
152 Row() { 166 Row() {
153 Row() { 167 Row() {
@@ -156,11 +170,14 @@ struct MineHomePage { @@ -156,11 +170,14 @@ struct MineHomePage {
156 Text("阅读") 170 Text("阅读")
157 .textStyle2() 171 .textStyle2()
158 } 172 }
159 - .margin({ right: '15lpx' }) 173 + // .margin({ right: '15lpx' })
  174 + .margin({ right: 15 })
160 175
161 Divider() 176 Divider()
162 - .height('19lpx')  
163 - .width('2lpx') 177 + // .height('19lpx')
  178 + .height(19)
  179 + // .width('2lpx')
  180 + .width(2)
164 .color($r('app.color.white')) 181 .color($r('app.color.white'))
165 .vertical(true) 182 .vertical(true)
166 .opacity(0.4) 183 .opacity(0.4)
@@ -169,11 +186,15 @@ struct MineHomePage { @@ -169,11 +186,15 @@ struct MineHomePage {
169 .textStyle() 186 .textStyle()
170 Text("评论") 187 Text("评论")
171 .textStyle2() 188 .textStyle2()
172 - }.margin({ right: '15lpx', left: '15lpx' }) 189 + }
  190 + // .margin({ right: '15lpx', left: '15lpx' })
  191 + .margin({ right: 15, left: 15 })
173 192
174 Divider() 193 Divider()
175 - .height('19lpx')  
176 - .width('2lpx') 194 + // .height('19lpx')
  195 + .height(19)
  196 + // .width('2lpx')
  197 + .width(2)
177 .color($r('app.color.white')) 198 .color($r('app.color.white'))
178 .vertical(true) 199 .vertical(true)
179 .opacity(0.4) 200 .opacity(0.4)
@@ -182,10 +203,15 @@ struct MineHomePage { @@ -182,10 +203,15 @@ struct MineHomePage {
182 .textStyle() 203 .textStyle()
183 Text("关注") 204 Text("关注")
184 .textStyle2() 205 .textStyle2()
185 - }.margin({ left: '15lpx' })  
186 - }.margin({ top: '23lpx' }) 206 + }
  207 + // .margin({ left: '15lpx' })
  208 + .margin({ left: 15 })
  209 + }
  210 + // .margin({ top: '23lpx' })
  211 + .margin({ top: 23 })
187 }.alignItems(HorizontalAlign.Start) 212 }.alignItems(HorizontalAlign.Start)
188 - .margin({ left: StringUtils.isEmpty(this.levelHead)?'32lpx':"3lpx" }) 213 + // .margin({ left: StringUtils.isEmpty(this.levelHead)?'32lpx':"3lpx" })
  214 + .margin({ left: StringUtils.isEmpty(this.levelHead) ? 32 : 3 })
189 } 215 }
190 .onAreaChange((oldValue: Area, newValue: Area) => { 216 .onAreaChange((oldValue: Area, newValue: Area) => {
191 if (this.firstPositionY === 0) { 217 if (this.firstPositionY === 0) {
@@ -199,27 +225,34 @@ struct MineHomePage { @@ -199,27 +225,34 @@ struct MineHomePage {
199 } 225 }
200 }) 226 })
201 .backgroundColor($r('app.color.color_transparent')) 227 .backgroundColor($r('app.color.color_transparent'))
202 - .height('184lpx') 228 + // .height('184lpx')
  229 + .height(184)
203 .width('100%') 230 .width('100%')
204 - .padding({ left: '6lpx' }) 231 + // .padding({ left: '6lpx' })
  232 + .padding({ left: 6 })
205 233
206 234
207 //用户简介区域 235 //用户简介区域
208 Column() { 236 Column() {
209 Row() { 237 Row() {
210 Text(this.isHasIntroduction?"简介："+this.desc:this.desc) 238 Text(this.isHasIntroduction?"简介："+this.desc:this.desc)
211 - .fontSize('27lpx') 239 + // .fontSize('27lpx')
  240 + .fontSize(27)
212 .maxLines(3) 241 .maxLines(3)
213 .textOverflow({ overflow: TextOverflow.Ellipsis }) 242 .textOverflow({ overflow: TextOverflow.Ellipsis })
214 - .lineHeight('40lpx')  
215 - .fontWeight('400lpx') 243 + // .lineHeight('40lpx')
  244 + .lineHeight(40)
  245 + // .fontWeight('400lpx')
  246 + .fontWeight(400)
216 .fontColor(this.isHasIntroduction?$r('app.color.color_222222'):$r('app.color.color_999999')) 247 .fontColor(this.isHasIntroduction?$r('app.color.color_222222'):$r('app.color.color_999999'))
217 .textAlign(TextAlign.Start) 248 .textAlign(TextAlign.Start)
218 249
219 if(!this.isHasIntroduction){ 250 if(!this.isHasIntroduction){
220 Image($r('app.media.user_info_edit_icon')) 251 Image($r('app.media.user_info_edit_icon'))
221 - .width('27lpx')  
222 - .height('27lpx') 252 + // .width('27lpx')
  253 + .width(27)
  254 + // .height('27lpx')
  255 + .height(27)
223 .interpolation(ImageInterpolation.High) 256 .interpolation(ImageInterpolation.High)
224 .objectFit(ImageFit.Auto) 257 .objectFit(ImageFit.Auto)
225 } 258 }
@@ -232,21 +265,28 @@ struct MineHomePage { @@ -232,21 +265,28 @@ struct MineHomePage {
232 265
233 266
234 Text(`来到人民日报${this.registerTimeForDay}天`) 267 Text(`来到人民日报${this.registerTimeForDay}天`)
235 - .fontSize('23lpx')  
236 - .lineHeight('25lpx')  
237 - .fontWeight('400lpx') 268 + // .fontSize('23lpx')
  269 + .fontSize(23)
  270 + // .lineHeight('25lpx')
  271 + .lineHeight(25)
  272 + // .fontWeight('400lpx')
  273 + .fontWeight(400)
238 .fontColor($r('app.color.color_999999')) 274 .fontColor($r('app.color.color_999999'))
239 .textAlign(TextAlign.Start) 275 .textAlign(TextAlign.Start)
240 - .margin({ top: '15lpx' }) 276 + // .margin({ top: '15lpx' })
  277 + .margin({ top: 15 })
241 278
242 - }.padding({ left: '31lpx',right:'31lpx',top:'19lpx',bottom:'31lpx'}) 279 + }
  280 + // .padding({ left: '31lpx',right:'31lpx',top:'19lpx',bottom:'31lpx'})
  281 + .padding({ left: 31,right: 31,top: 19,bottom: 31})
243 .alignItems(HorizontalAlign.Start) 282 .alignItems(HorizontalAlign.Start)
244 .justifyContent(FlexAlign.Center) 283 .justifyContent(FlexAlign.Center)
245 .width('100%') 284 .width('100%')
246 .backgroundColor($r('app.color.white')) 285 .backgroundColor($r('app.color.white'))
247 //间隔符 286 //间隔符
248 287
249 - Divider().width('100%').height('12lpx').color($r('app.color.color_F5F5F5')).strokeWidth('12lpx') 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)
250 290
251 //tab 页面 291 //tab 页面
252 Stack({ alignContent: Alignment.Top }){ 292 Stack({ alignContent: Alignment.Top }){
@@ -265,7 +305,8 @@ struct MineHomePage { @@ -265,7 +305,8 @@ struct MineHomePage {
265 trackTabFirstClick(index === 0 ? "评论":"关注") 305 trackTabFirstClick(index === 0 ? "评论":"关注")
266 }) 306 })
267 .vertical(false) 307 .vertical(false)
268 - .barHeight("77lpx") 308 + // .barHeight("77lpx")
  309 + .barHeight(77)
269 310
270 Column() { 311 Column() {
271 // 页签 312 // 页签
@@ -281,7 +322,8 @@ struct MineHomePage { @@ -281,7 +322,8 @@ struct MineHomePage {
281 .scrollable(ScrollDirection.Horizontal) 322 .scrollable(ScrollDirection.Horizontal)
282 .scrollBar(BarState.Off) 323 .scrollBar(BarState.Off)
283 .width('100%') 324 .width('100%')
284 - .padding({left:'31lpx'}) 325 + // .padding({left:'31lpx'})
  326 + .padding({left: 31})
285 } 327 }
286 .alignItems(VerticalAlign.Bottom) 328 .alignItems(VerticalAlign.Bottom)
287 .width('100%') 329 .width('100%')
@@ -289,7 +331,8 @@ struct MineHomePage { @@ -289,7 +331,8 @@ struct MineHomePage {
289 .backgroundColor($r('app.color.white')) 331 .backgroundColor($r('app.color.white'))
290 .alignItems(HorizontalAlign.Start) 332 .alignItems(HorizontalAlign.Start)
291 .width('100%') 333 .width('100%')
292 - .height('77lpx') 334 + // .height('77lpx')
  335 + .height(77)
293 } 336 }
294 }.width("100%") 337 }.width("100%")
295 } 338 }
@@ -302,7 +345,7 @@ struct MineHomePage { @@ -302,7 +345,7 @@ struct MineHomePage {
302 }.width('100%') 345 }.width('100%')
303 // .padding({bottom:px2vp(this.bottomSafeHeight)}) 346 // .padding({bottom:px2vp(this.bottomSafeHeight)})
304 .layoutWeight(1) 347 .layoutWeight(1)
305 - }else{ 348 + } else {
306 Column(){ 349 Column(){
307 CustomTitleUI({ titleName: "" }) 350 CustomTitleUI({ titleName: "" })
308 351
@@ -324,38 +367,38 @@ struct MineHomePage { @@ -324,38 +367,38 @@ struct MineHomePage {
324 RelativeContainer() { 367 RelativeContainer() {
325 //标题栏目 368 //标题栏目
326 Image($r('app.media.icon_arrow_left_white') ) 369 Image($r('app.media.icon_arrow_left_white') )
327 - .width('46lpx')  
328 - .height('46lpx') 370 + .width(24)
  371 + .height(24)
329 .objectFit(ImageFit.Auto) 372 .objectFit(ImageFit.Auto)
330 .id("back_icon") 373 .id("back_icon")
331 .alignRules({ 374 .alignRules({
332 center: { anchor: "__container__", align: VerticalAlign.Center }, 375 center: { anchor: "__container__", align: VerticalAlign.Center },
333 left: { anchor: "__container__", align: HorizontalAlign.Start } 376 left: { anchor: "__container__", align: HorizontalAlign.Start }
334 }) 377 })
335 - .margin({ left: '31lpx' }) 378 + .margin({ left: 18 })
336 .onClick(() => { 379 .onClick(() => {
337 router.back() 380 router.back()
338 }) 381 })
339 382
340 Text("编辑资料") 383 Text("编辑资料")
341 - .height('42lpx') 384 + .height(22)
342 .maxLines(1) 385 .maxLines(1)
343 .id("rightText") 386 .id("rightText")
344 - .fontSize('31lpx') 387 + .fontSize(16)
345 .fontWeight(400) 388 .fontWeight(400)
346 .fontColor($r('app.color.white') ) 389 .fontColor($r('app.color.white') )
347 - .lineHeight('42lpx') 390 + .lineHeight(22)
348 .alignRules({ 391 .alignRules({
349 center: { anchor: "__container__", align: VerticalAlign.Center }, 392 center: { anchor: "__container__", align: VerticalAlign.Center },
350 right: { anchor: "__container__", align: HorizontalAlign.End } 393 right: { anchor: "__container__", align: HorizontalAlign.End }
351 }) 394 })
352 - .margin({ right: '31lpx' }) 395 + .margin({ right: 16 })
353 .onClick(()=>{ 396 .onClick(()=>{
354 this.editUserInfo() 397 this.editUserInfo()
355 }) 398 })
356 } 399 }
357 .visibility(this.tileOpacity > 0 ? 1 : 0) 400 .visibility(this.tileOpacity > 0 ? 1 : 0)
358 - .height('84lpx') 401 + .height(44)
359 .width('100%') 402 .width('100%')
360 .backgroundColor($r('app.color.color_transparent')) 403 .backgroundColor($r('app.color.color_transparent'))
361 } 404 }
@@ -365,22 +408,22 @@ struct MineHomePage { @@ -365,22 +408,22 @@ struct MineHomePage {
365 RelativeContainer() { 408 RelativeContainer() {
366 //标题栏目 409 //标题栏目
367 Image($r('app.media.back_icon')) 410 Image($r('app.media.back_icon'))
368 - .width('46lpx')  
369 - .height('46lpx') 411 + .width(24)
  412 + .height(24)
370 .objectFit(ImageFit.Auto) 413 .objectFit(ImageFit.Auto)
371 .id("back_icon") 414 .id("back_icon")
372 .alignRules({ 415 .alignRules({
373 center: { anchor: "__container__", align: VerticalAlign.Center }, 416 center: { anchor: "__container__", align: VerticalAlign.Center },
374 left: { anchor: "__container__", align: HorizontalAlign.Start } 417 left: { anchor: "__container__", align: HorizontalAlign.Start }
375 }) 418 })
376 - .margin({ left: '31lpx' }) 419 + .margin({ left: 18 })
377 .onClick(() => { 420 .onClick(() => {
378 router.back() 421 router.back()
379 }) 422 })
380 Image(this.headPhotoUrl&&this.headPhotoUrl.length>0?this.headPhotoUrl:(this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon'))) 423 Image(this.headPhotoUrl&&this.headPhotoUrl.length>0?this.headPhotoUrl:(this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon')))
381 .alt($r('app.media.default_head')) 424 .alt($r('app.media.default_head'))
382 - .width('60lpx')  
383 - .height('60lpx') 425 + .width(32)
  426 + .height(32)
384 .objectFit(ImageFit.Auto) 427 .objectFit(ImageFit.Auto)
385 .id("head_icon") 428 .id("head_icon")
386 .borderRadius(50) 429 .borderRadius(50)
@@ -388,43 +431,42 @@ struct MineHomePage { @@ -388,43 +431,42 @@ struct MineHomePage {
388 center: { anchor: "__container__", align: VerticalAlign.Center }, 431 center: { anchor: "__container__", align: VerticalAlign.Center },
389 left: { anchor: "back_icon", align: HorizontalAlign.End } 432 left: { anchor: "back_icon", align: HorizontalAlign.End }
390 }) 433 })
391 - .margin({ left: '31lpx' }) 434 + .margin({ left: 10 })
392 .onClick(() => { 435 .onClick(() => {
393 router.back() 436 router.back()
394 }) 437 })
395 438
396 Text(`${this.userName}`) 439 Text(`${this.userName}`)
397 - .height('42lpx')  
398 .maxLines(1) 440 .maxLines(1)
399 .id("title") 441 .id("title")
400 - .fontSize('27lpx') 442 + .fontSize(14)
401 .fontWeight(400) 443 .fontWeight(400)
402 .fontColor($r('app.color.color_222222')) 444 .fontColor($r('app.color.color_222222'))
403 - .lineHeight('31lpx') 445 + .lineHeight(16)
404 .alignRules({ 446 .alignRules({
405 center: { anchor: "__container__", align: VerticalAlign.Center }, 447 center: { anchor: "__container__", align: VerticalAlign.Center },
406 left: { anchor: "head_icon", align: HorizontalAlign.End } 448 left: { anchor: "head_icon", align: HorizontalAlign.End }
407 }) 449 })
408 - .margin({ left: '12lpx' }) 450 + .margin({ left: 6 })
409 451
410 Text("编辑资料") 452 Text("编辑资料")
411 - .height('42lpx') 453 + .height(22)
412 .maxLines(1) 454 .maxLines(1)
413 .id("rightText") 455 .id("rightText")
414 - .fontSize('31lpx') 456 + .fontSize(16)
415 .fontWeight(400) 457 .fontWeight(400)
416 .fontColor($r('app.color.color_222222')) 458 .fontColor($r('app.color.color_222222'))
417 - .lineHeight('42lpx') 459 + .lineHeight(22)
418 .alignRules({ 460 .alignRules({
419 center: { anchor: "__container__", align: VerticalAlign.Center }, 461 center: { anchor: "__container__", align: VerticalAlign.Center },
420 right: { anchor: "__container__", align: HorizontalAlign.End } 462 right: { anchor: "__container__", align: HorizontalAlign.End }
421 }) 463 })
422 - .margin({ right: '31lpx' }) 464 + .margin({ right: 16 })
423 .onClick(()=>{ 465 .onClick(()=>{
424 this.editUserInfo() 466 this.editUserInfo()
425 }) 467 })
426 } 468 }
427 - .height('84lpx') 469 + .height(44)
428 .width('100%') 470 .width('100%')
429 .backgroundColor($r('app.color.white')) 471 .backgroundColor($r('app.color.white'))
430 .visibility(this.tileOpacity > 0 ? 0 : 1) 472 .visibility(this.tileOpacity > 0 ? 0 : 1)
@@ -435,19 +477,26 @@ struct MineHomePage { @@ -435,19 +477,26 @@ struct MineHomePage {
435 @Builder TabBuilder(index: number, title: string) { 477 @Builder TabBuilder(index: number, title: string) {
436 Stack(){ 478 Stack(){
437 Text(title) 479 Text(title)
438 - .height('38lpx')  
439 - .fontSize('33lpx') 480 + // .height('38lpx')
  481 + .height(38)
  482 + // .fontSize('33lpx')
  483 + .fontSize(33)
440 .fontWeight(this.currentIndex === index ? 600 : 400) 484 .fontWeight(this.currentIndex === index ? 600 : 400)
441 .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor) 485 .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
442 - .lineHeight('38lpx') 486 + // .lineHeight('38lpx')
  487 + .lineHeight(38)
443 488
444 if(this.currentIndex === index){ 489 if(this.currentIndex === index){
445 Divider() 490 Divider()
446 - .width('31lpx')  
447 - .height('4lpx') 491 + // .width('31lpx')
  492 + .width(31)
  493 + // .height('4lpx')
  494 + .height(4)
448 .color('#ED2800') 495 .color('#ED2800')
449 - .strokeWidth('4lpx')  
450 - .margin({top:'50lpx'}) 496 + // .strokeWidth('4lpx')
  497 + .strokeWidth(4)
  498 + // .margin({top:'50lpx'})
  499 + .margin({top: 50})
451 .id("divTag") 500 .id("divTag")
452 } 501 }
453 }.onClick(()=>{ 502 }.onClick(()=>{
@@ -455,9 +504,12 @@ struct MineHomePage { @@ -455,9 +504,12 @@ struct MineHomePage {
455 this.controller.changeIndex(this.currentIndex) 504 this.controller.changeIndex(this.currentIndex)
456 trackTabFirstClick(index === 0 ? "评论":"关注") 505 trackTabFirstClick(index === 0 ? "评论":"关注")
457 }) 506 })
458 - .height('77lpx')  
459 - .width('70lpx')  
460 - .margin({right:'29lpx'}) 507 + // .height('77lpx')
  508 + .height(77)
  509 + // .width('70lpx')
  510 + .width(70)
  511 + // .margin({right:'29lpx'})
  512 + .margin({right: 29})
461 } 513 }
462 514
463 /** 515 /**
@@ -537,7 +589,8 @@ struct MineHomePage { @@ -537,7 +589,8 @@ struct MineHomePage {
537 @Extend(Text) function textStyle() { 589 @Extend(Text) function textStyle() {
538 .fontColor($r('app.color.white')) 590 .fontColor($r('app.color.white'))
539 .textStyleDefault() 591 .textStyleDefault()
540 - .margin({ right: '10lpx' }) 592 + // .margin({ right: '10lpx' })
  593 + .margin({ right: 10 })
541 } 594 }
542 595
543 @Extend(Text) function textStyle2() { 596 @Extend(Text) function textStyle2() {
@@ -547,9 +600,12 @@ struct MineHomePage { @@ -547,9 +600,12 @@ struct MineHomePage {
547 600
548 @Extend(Text) function textStyleDefault() { 601 @Extend(Text) function textStyleDefault() {
549 .textAlign(TextAlign.Start) 602 .textAlign(TextAlign.Start)
550 - .fontSize('23lpx')  
551 - .fontWeight('400lpx')  
552 - .lineHeight('31lpx') 603 + // .fontSize('23lpx')
  604 + .fontSize(23)
  605 + // .fontWeight('400lpx')
  606 + .fontWeight(400)
  607 + // .lineHeight('31lpx')
  608 + .lineHeight(31)
553 } 609 }
554 610
555 function trackTabFirstClick(firstLevelTabName: string){ 611 function trackTabFirstClick(firstLevelTabName: string){
@@ -15,20 +15,21 @@ export struct TabLiveItemComponent { @@ -15,20 +15,21 @@ export struct TabLiveItemComponent {
15 } 15 }
16 16
17 build() { 17 build() {
  18 + Column() {
18 Row() { 19 Row() {
19 Image(StringUtils.isEmpty(this.item.senderUserAvatarUrl) ? $r('app.media.default_head') : this.item.senderUserAvatarUrl) 20 Image(StringUtils.isEmpty(this.item.senderUserAvatarUrl) ? $r('app.media.default_head') : this.item.senderUserAvatarUrl)
20 .borderRadius(90) 21 .borderRadius(90)
21 .width(24) 22 .width(24)
22 .height(24) 23 .height(24)
23 -  
24 - Column() {  
25 - Row() { 24 + .id("senderUserAvatar")
26 Text(this.item.senderUserName) 25 Text(this.item.senderUserName)
27 .maxLines(1) 26 .maxLines(1)
28 .textOverflow({ overflow: TextOverflow.Ellipsis }) 27 .textOverflow({ overflow: TextOverflow.Ellipsis })
29 .fontSize('14vp') 28 .fontSize('14vp')
30 .fontWeight(400) 29 .fontWeight(400)
31 .fontColor('#222222') 30 .fontColor('#222222')
  31 + .alignRules({center:{anchor:"senderUserAvatar",align:VerticalAlign.Center}})
  32 + .margin({left:8})
32 Text(this.item.role === 'host' ? '主持人' : '嘉宾') 33 Text(this.item.role === 'host' ? '主持人' : '嘉宾')
33 .maxLines(1) 34 .maxLines(1)
34 .textOverflow({ overflow: TextOverflow.Ellipsis }) 35 .textOverflow({ overflow: TextOverflow.Ellipsis })
@@ -71,7 +72,9 @@ export struct TabLiveItemComponent { @@ -71,7 +72,9 @@ export struct TabLiveItemComponent {
71 .width(100) 72 .width(100)
72 .visibility(1 == this.item.isTop ? Visibility.Visible : Visibility.None) 73 .visibility(1 == this.item.isTop ? Visibility.Visible : Visibility.None)
73 } 74 }
74 - 75 + .justifyContent(FlexAlign.Start)
  76 + .width("100%")
  77 + Column() {
75 Text(this.item.text) 78 Text(this.item.text)
76 .fontSize('14vp') 79 .fontSize('14vp')
77 .fontWeight(400) 80 .fontWeight(400)
@@ -171,17 +174,16 @@ export struct TabLiveItemComponent { @@ -171,17 +174,16 @@ export struct TabLiveItemComponent {
171 } 174 }
172 } 175 }
173 .margin({ 176 .margin({
174 - left: 8,  
175 - right: 16 177 + left: 32,
176 }) 178 })
177 - .layoutWeight(1)  
178 .alignItems(HorizontalAlign.Start) 179 .alignItems(HorizontalAlign.Start)
  180 + .justifyContent(FlexAlign.Start)
179 } 181 }
180 - .alignItems(VerticalAlign.Top)  
181 .padding({ 182 .padding({
182 left: 17, 183 left: 17,
183 - top: 8,  
184 - bottom: 8, 184 + top: 12,
  185 + right: 16,
  186 + bottom: 4,
185 }) 187 })
186 } 188 }
187 189
@@ -62,19 +62,29 @@ struct ChangeBindPhonePage { @@ -62,19 +62,29 @@ struct ChangeBindPhonePage {
62 build() { 62 build() {
63 Column(){ 63 Column(){
64 Column() { 64 Column() {
65 - Image($r('app.media.login_back_icon')).width(24).height(24).margin({ left: 15, top: 10 }).onClick(() => { 65 + Image($r('app.media.login_back_icon'))
  66 + .width(24)
  67 + .height(24)
  68 + .margin({ left: 16, top: 8 })
  69 + .onClick(() => {
66 router.back() 70 router.back()
67 }) 71 })
68 72
69 - Text(this.pageTitle).fontSize(22).fontColor('#333333').fontWeight(FontWeight.Bold).margin({ left: 25, top: 112 }) 73 + Text(this.pageTitle)
  74 + .fontSize(22)
  75 + .lineHeight(32)
  76 + .fontColor('#222222')
  77 + .fontWeight(600)
  78 + .margin({ left: 25, top: 112 })
70 79
71 Column(){ 80 Column(){
72 TextInput({text: this.phoneContent, placeholder: "请输入手机号" }) 81 TextInput({text: this.phoneContent, placeholder: "请输入手机号" })
73 .fontSize(16) 82 .fontSize(16)
  83 + .lineHeight(24)
74 .height(48) 84 .height(48)
75 .placeholderColor("#CCCCCC") 85 .placeholderColor("#CCCCCC")
76 .maxLength(11) 86 .maxLength(11)
77 - .margin({ top: 36 }) 87 + .margin({ top: 40 })
78 .backgroundColor("#F5F5F5") 88 .backgroundColor("#F5F5F5")
79 .borderRadius(4) 89 .borderRadius(4)
80 .type(InputType.Number) 90 .type(InputType.Number)
@@ -95,6 +105,7 @@ struct ChangeBindPhonePage { @@ -95,6 +105,7 @@ struct ChangeBindPhonePage {
95 .placeholderColor("#CCCCCC") 105 .placeholderColor("#CCCCCC")
96 .layoutWeight(1) 106 .layoutWeight(1)
97 .fontSize(16) 107 .fontSize(16)
  108 + .lineHeight(24)
98 .height(48) 109 .height(48)
99 .type(InputType.Number) 110 .type(InputType.Number)
100 .fontColor("#222222") 111 .fontColor("#222222")
@@ -109,6 +120,7 @@ struct ChangeBindPhonePage { @@ -109,6 +120,7 @@ struct ChangeBindPhonePage {
109 .fontColor(this.codeBtnState?'#ED2800':'#80ED2800') 120 .fontColor(this.codeBtnState?'#ED2800':'#80ED2800')
110 .width(110) 121 .width(110)
111 .fontSize(14) 122 .fontSize(14)
  123 + .lineHeight(24)
112 .fontWeight( FontWeight.Bold) 124 .fontWeight( FontWeight.Bold)
113 .height(48) 125 .height(48)
114 .textAlign(TextAlign.Center) 126 .textAlign(TextAlign.Center)
@@ -144,9 +156,10 @@ struct ChangeBindPhonePage { @@ -144,9 +156,10 @@ struct ChangeBindPhonePage {
144 .fontColor("#FFFFFF") 156 .fontColor("#FFFFFF")
145 .borderRadius(4) 157 .borderRadius(4)
146 .fontSize(18) 158 .fontSize(18)
  159 + .lineHeight(26)
147 .textAlign(TextAlign.Center) 160 .textAlign(TextAlign.Center)
148 .fontWeight(FontWeight.Medium) 161 .fontWeight(FontWeight.Medium)
149 - .margin({ top: 26 }) 162 + .margin({ top: 36 })
150 .height(44) 163 .height(44)
151 .backgroundColor("#ED2800") 164 .backgroundColor("#ED2800")
152 .enabled(this.isSubmit ? true : false) 165 .enabled(this.isSubmit ? true : false)
@@ -68,7 +68,7 @@ struct ForgetPasswordPage { @@ -68,7 +68,7 @@ struct ForgetPasswordPage {
68 .fontSize(18) 68 .fontSize(18)
69 .textAlign(TextAlign.Center) 69 .textAlign(TextAlign.Center)
70 .fontWeight(FontWeight.Medium) 70 .fontWeight(FontWeight.Medium)
71 - .margin({ top: 26 }) 71 + .margin({ top: 36 })
72 .height(44) 72 .height(44)
73 .backgroundColor("#ED2800") 73 .backgroundColor("#ED2800")
74 .enabled(this.isSubmit ? true : false) 74 .enabled(this.isSubmit ? true : false)
@@ -76,7 +76,9 @@ struct ForgetPasswordPage { @@ -76,7 +76,9 @@ struct ForgetPasswordPage {
76 .onClick(() => { 76 .onClick(() => {
77 this.checkVerifyCode() 77 this.checkVerifyCode()
78 }) 78 })
79 - }.padding({ left: 25, right: 25 }).width('100%') 79 + }
  80 + .height(44)
  81 + .padding({ left: 25, right: 25 }).width('100%')
80 82
81 }.width('100%') 83 }.width('100%')
82 .height('100%') 84 .height('100%')
@@ -91,7 +91,6 @@ struct LoginPage { @@ -91,7 +91,6 @@ struct LoginPage {
91 disableScreenCapture(){ 91 disableScreenCapture(){
92 let windowClass: window.Window|undefined = undefined; 92 let windowClass: window.Window|undefined = undefined;
93 let context = getContext(this) as common.UIAbilityContext 93 let context = getContext(this) as common.UIAbilityContext
94 - try {  
95 window.getLastWindow(context, (err, data) => { 94 window.getLastWindow(context, (err, data) => {
96 if (err.code) { 95 if (err.code) {
97 return 96 return
@@ -100,15 +99,12 @@ struct LoginPage { @@ -100,15 +99,12 @@ struct LoginPage {
100 windowClass.setWindowPrivacyMode(this.isPrivacyMode, (err: BusinessError) => { 99 windowClass.setWindowPrivacyMode(this.isPrivacyMode, (err: BusinessError) => {
101 const errCode: number = err.code; 100 const errCode: number = err.code;
102 if (errCode) { 101 if (errCode) {
103 - console.error('Failed to set the window to privacy mode. Cause:' + JSON.stringify(err)); 102 + // console.error('Failed to set the window to privacy mode. Cause:' + JSON.stringify(err));
104 return; 103 return;
105 } 104 }
106 - console.info('Succeeded in setting the window to privacy mode.'); 105 + // console.info('Succeeded in setting the window to privacy mode.');
107 }); 106 });
108 }) 107 })
109 - } catch (exception) {  
110 - console.error('Failed to set the window to privacy mode. Cause:' + JSON.stringify(exception));  
111 - }  
112 } 108 }
113 109
114 aboutToDisappear(): void { 110 aboutToDisappear(): void {
@@ -79,8 +79,10 @@ struct ModifyPasswordPage { @@ -79,8 +79,10 @@ struct ModifyPasswordPage {
79 @Builder TitleBackComponent(title:string){ 79 @Builder TitleBackComponent(title:string){
80 RelativeContainer() { 80 RelativeContainer() {
81 Text(title) 81 Text(title)
82 - .fontColor('#FF333333') 82 + .fontColor('#333333')
83 .fontSize(18) 83 .fontSize(18)
  84 + .fontWeight(400)
  85 + .lineHeight(26)
84 .textAlign(TextAlign.Center) 86 .textAlign(TextAlign.Center)
85 .height(44) 87 .height(44)
86 .alignRules({ 88 .alignRules({
@@ -113,17 +115,26 @@ struct ModifyPasswordPage { @@ -113,17 +115,26 @@ struct ModifyPasswordPage {
113 @Builder ModifyPasswordLayout(){ 115 @Builder ModifyPasswordLayout(){
114 Column(){ 116 Column(){
115 Column() { 117 Column() {
116 - Text("修改密码").fontWeight(FontWeight.Bold).fontSize(20).maxLines(1) 118 + Text("修改密码")
  119 + .fontWeight(600)
  120 + .fontSize(22)
  121 + .maxLines(1)
  122 + .fontColor('#222222')
  123 + .lineHeight(32)
117 } 124 }
118 .width('100%') 125 .width('100%')
119 - .height(`${this.calcHeight(75)}lpx`)  
120 .alignItems(HorizontalAlign.Start) 126 .alignItems(HorizontalAlign.Start)
  127 + .margin({
  128 + bottom: 40
  129 + })
121 130
122 Row() { 131 Row() {
123 Row() { 132 Row() {
124 TextInput({ placeholder: "请输入原密码" }) 133 TextInput({ placeholder: "请输入原密码" })
125 .passwordIcon({onIconSrc:$r("app.media.login_password_on"),offIconSrc:$r("app.media.login_password_off")}) 134 .passwordIcon({onIconSrc:$r("app.media.login_password_on"),offIconSrc:$r("app.media.login_password_off")})
126 .placeholderColor("#CCCCCC") 135 .placeholderColor("#CCCCCC")
  136 + .fontSize(16)
  137 + .lineHeight(24)
127 .type(InputType.Password) 138 .type(InputType.Password)
128 .showPasswordIcon(true) 139 .showPasswordIcon(true)
129 .backgroundColor('#00000000') 140 .backgroundColor('#00000000')
@@ -133,12 +144,11 @@ struct ModifyPasswordPage { @@ -133,12 +144,11 @@ struct ModifyPasswordPage {
133 }) 144 })
134 } 145 }
135 .alignItems(VerticalAlign.Center) 146 .alignItems(VerticalAlign.Center)
136 - .height(`${this.calcHeight(80)}lpx`) 147 + .height(48)
137 .backgroundColor('#f5f5f5') 148 .backgroundColor('#f5f5f5')
138 - .borderRadius('4vp') 149 + .borderRadius(4)
139 } 150 }
140 .width('100%') 151 .width('100%')
141 - .height(`${this.calcHeight(110)}lpx`)  
142 .backgroundColor(0xffffff0) 152 .backgroundColor(0xffffff0)
143 .alignItems(VerticalAlign.Center) 153 .alignItems(VerticalAlign.Center)
144 154
@@ -147,6 +157,8 @@ struct ModifyPasswordPage { @@ -147,6 +157,8 @@ struct ModifyPasswordPage {
147 TextInput({ placeholder: "请输入新密码" }) 157 TextInput({ placeholder: "请输入新密码" })
148 .passwordIcon({onIconSrc:$r("app.media.login_password_on"),offIconSrc:$r("app.media.login_password_off")}) 158 .passwordIcon({onIconSrc:$r("app.media.login_password_on"),offIconSrc:$r("app.media.login_password_off")})
149 .placeholderColor("#CCCCCC") 159 .placeholderColor("#CCCCCC")
  160 + .fontSize(16)
  161 + .lineHeight(24)
150 .type(InputType.Password) 162 .type(InputType.Password)
151 .showPasswordIcon(true) 163 .showPasswordIcon(true)
152 .backgroundColor('#00000000') 164 .backgroundColor('#00000000')
@@ -156,12 +168,12 @@ struct ModifyPasswordPage { @@ -156,12 +168,12 @@ struct ModifyPasswordPage {
156 }) 168 })
157 } 169 }
158 .alignItems(VerticalAlign.Center) 170 .alignItems(VerticalAlign.Center)
159 - .height(`${this.calcHeight(80)}lpx`) 171 + .height(48)
160 .backgroundColor('#f5f5f5') 172 .backgroundColor('#f5f5f5')
161 - .borderRadius('4vp') 173 + .borderRadius(4)
162 } 174 }
163 .width('100%') 175 .width('100%')
164 - .height(`${this.calcHeight(110)}lpx`) 176 + .margin({top: 12})
165 .backgroundColor(0xffffff0) 177 .backgroundColor(0xffffff0)
166 .alignItems(VerticalAlign.Center) 178 .alignItems(VerticalAlign.Center)
167 179
@@ -169,6 +181,8 @@ struct ModifyPasswordPage { @@ -169,6 +181,8 @@ struct ModifyPasswordPage {
169 Row() { 181 Row() {
170 TextInput({ placeholder: "再次输入新密码" }) 182 TextInput({ placeholder: "再次输入新密码" })
171 .placeholderColor("#CCCCCC") 183 .placeholderColor("#CCCCCC")
  184 + .fontSize(16)
  185 + .lineHeight(24)
172 .type(InputType.Password) 186 .type(InputType.Password)
173 .passwordIcon({onIconSrc:$r("app.media.login_password_on"),offIconSrc:$r("app.media.login_password_off")}) 187 .passwordIcon({onIconSrc:$r("app.media.login_password_on"),offIconSrc:$r("app.media.login_password_off")})
174 .showPasswordIcon(true) 188 .showPasswordIcon(true)
@@ -179,20 +193,26 @@ struct ModifyPasswordPage { @@ -179,20 +193,26 @@ struct ModifyPasswordPage {
179 }) 193 })
180 } 194 }
181 .alignItems(VerticalAlign.Center) 195 .alignItems(VerticalAlign.Center)
182 - .height(`${this.calcHeight(80)}lpx`) 196 + .height(48)
183 .backgroundColor('#f5f5f5') 197 .backgroundColor('#f5f5f5')
184 - .borderRadius('4vp') 198 + .borderRadius(4)
185 } 199 }
186 .width('100%') 200 .width('100%')
187 - .height(`${this.calcHeight(110)}lpx`) 201 + .margin({top: 12})
188 .backgroundColor(0xffffff0) 202 .backgroundColor(0xffffff0)
189 .alignItems(VerticalAlign.Center) 203 .alignItems(VerticalAlign.Center)
190 204
191 Column() { 205 Column() {
192 - Text("提示：密码长度8~20位，使用大写字母、小写字母、数字、特殊字符中三种或三种以上").fontSize(12).maxLines(3).fontColor(0x999999).padding({top:`${this.calcHeight(10)}lpx`}) 206 + Text("提示：密码长度8~20位，使用大写字母、小写字母、数字、特殊字符中三种或三种以上")
  207 + .fontSize(12)
  208 + .lineHeight(17)
  209 + .maxLines(3)
  210 + .fontColor('#999999')
  211 + .fontWeight(400)
  212 + .padding({top: 12})
193 } 213 }
194 .width('100%') 214 .width('100%')
195 - .height(`${this.calcHeight(85)}lpx`) 215 + .height(34)
196 .alignItems(HorizontalAlign.Start) 216 .alignItems(HorizontalAlign.Start)
197 217
198 218
@@ -202,10 +222,10 @@ struct ModifyPasswordPage { @@ -202,10 +222,10 @@ struct ModifyPasswordPage {
202 .fontColor("#FFFFFF") 222 .fontColor("#FFFFFF")
203 .borderRadius(4) 223 .borderRadius(4)
204 .fontSize(18) 224 .fontSize(18)
205 - .textAlign(TextAlign.Center)  
206 - .fontWeight(FontWeight.Medium)  
207 - .margin({ top: 26 }) 225 + .lineHeight(26)
208 .height(44) 226 .height(44)
  227 + .textAlign(TextAlign.Center)
  228 + .fontWeight(400)
209 .backgroundColor("#ED2800") 229 .backgroundColor("#ED2800")
210 .enabled(this.btnStatus ? true : false) 230 .enabled(this.btnStatus ? true : false)
211 .opacity(this.btnStatus ? 1: 0.6) 231 .opacity(this.btnStatus ? 1: 0.6)
@@ -215,22 +235,32 @@ struct ModifyPasswordPage { @@ -215,22 +235,32 @@ struct ModifyPasswordPage {
215 this.submit() 235 this.submit()
216 } 236 }
217 }) 237 })
218 - }.width('100%')  
219 - .padding({top:`${this.calcHeight(25)}lpx`})  
220 - .alignItems(VerticalAlign.Center) 238 + }
  239 + .height(44)
221 .width('100%') 240 .width('100%')
  241 + .margin({top:36})
  242 + .alignItems(VerticalAlign.Center)
222 243
223 Column() { 244 Column() {
224 - Text("忘记密码").fontSize(14).maxLines(3).fontColor(0x999999).padding({top:`${this.calcHeight(10)}lpx`}) 245 + Text("忘记密码")
  246 + .fontSize(14)
  247 + .maxLines(3)
  248 + .lineHeight(20)
  249 + .fontColor('#666666')
225 .onClick(()=>{ 250 .onClick(()=>{
226 WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage) 251 WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage)
227 }) 252 })
228 } 253 }
229 - .margin({top:15}) 254 + .margin({top:12})
230 .width('100%') 255 .width('100%')
231 - .height(`${this.calcHeight(85)}lpx`)  
232 .alignItems(HorizontalAlign.Center) 256 .alignItems(HorizontalAlign.Center)
233 - }.padding({top:`${this.calcHeight(92)}lpx`,left:`${this.calcHeight(48)}lpx`,right:`${this.calcHeight(48)}lpx`}) 257 + }
  258 + .padding(
  259 + {
  260 + top:40,
  261 + left:25,
  262 + right:25
  263 + })
234 264
235 } 265 }
236 266
@@ -185,9 +185,9 @@ export struct SettingPasswordPage { @@ -185,9 +185,9 @@ export struct SettingPasswordPage {
185 RelativeContainer() { 185 RelativeContainer() {
186 Text(title) 186 Text(title)
187 .fontColor('#FF333333') 187 .fontColor('#FF333333')
188 - .fontSize(`${this.calcHeight(18)}`) 188 + .fontSize(18)
189 .textAlign(TextAlign.Center) 189 .textAlign(TextAlign.Center)
190 - .height(`${this.calcHeight(44)}`) 190 + .height(44)
191 .alignRules({ 191 .alignRules({
192 top: { anchor: "__container__", align: VerticalAlign.Top }, 192 top: { anchor: "__container__", align: VerticalAlign.Top },
193 left: { anchor: "__container__", align: HorizontalAlign.Start }, 193 left: { anchor: "__container__", align: HorizontalAlign.Start },
@@ -197,10 +197,10 @@ export struct SettingPasswordPage { @@ -197,10 +197,10 @@ export struct SettingPasswordPage {
197 .id('titleContent') 197 .id('titleContent')
198 Image($r("app.media.login_back_icon")) 198 Image($r("app.media.login_back_icon"))
199 .objectFit(ImageFit.Auto) 199 .objectFit(ImageFit.Auto)
200 - .height(`${this.calcHeight(24)}`)  
201 - .width(`${this.calcHeight(24)}`) 200 + .height(24)
  201 + .width(24)
202 .margin({ 202 .margin({
203 - left: `${this.calcHeight(16)}`, top: `${this.calcHeight(8)}` 203 + left: 16, top: 8
204 }) 204 })
205 .alignRules({ 205 .alignRules({
206 top: { anchor: "__container__", align: VerticalAlign.Top }, 206 top: { anchor: "__container__", align: VerticalAlign.Top },
@@ -211,7 +211,7 @@ export struct SettingPasswordPage { @@ -211,7 +211,7 @@ export struct SettingPasswordPage {
211 }) 211 })
212 .id('backImage') 212 .id('backImage')
213 213
214 - }.height(`${this.calcHeight(44)}`) 214 + }.height(44)
215 } 215 }
216 216
217 // 页面布局 217 // 页面布局
@@ -236,9 +236,15 @@ export struct SettingPasswordPage { @@ -236,9 +236,15 @@ export struct SettingPasswordPage {
236 } 236 }
237 }) 237 })
238 } 238 }
239 - }.width('100%')  
240 - .padding({ left:`${this.calcHeight(31)}lpx`,right:`${this.calcHeight(31)}lpx`,top:`${this.calcHeight(131)}lpx` }) 239 + .width('100%').height('100%')
  240 + }
  241 + .width('100%')
241 .height('100%') 242 .height('100%')
  243 + .padding(
  244 + {
  245 + left: 25,
  246 + right: 25
  247 + })
242 } 248 }
243 249
244 /***************************** UI元素 ******************************************/ 250 /***************************** UI元素 ******************************************/
@@ -246,11 +252,18 @@ export struct SettingPasswordPage { @@ -246,11 +252,18 @@ export struct SettingPasswordPage {
246 // 标题 252 // 标题
247 @Builder getTitleCell(item: AccoutPageDataModel, alignTitle: HorizontalAlign) { 253 @Builder getTitleCell(item: AccoutPageDataModel, alignTitle: HorizontalAlign) {
248 Column() { 254 Column() {
249 - Text(item.compTitle).fontWeight(FontWeight.Bold).fontSize(`${this.calcHeight(20)}`).maxLines(1) 255 + Text(item.compTitle)
  256 + .fontWeight(600)
  257 + .fontSize(22)
  258 + .maxLines(1)
  259 + .fontColor('#222222')
  260 + .lineHeight(32)
250 } 261 }
251 .width('100%') 262 .width('100%')
252 - .height(`${this.calcHeight(75)}lpx`)  
253 .alignItems(alignTitle) 263 .alignItems(alignTitle)
  264 + .margin({
  265 + bottom: 40
  266 + })
254 } 267 }
255 268
256 // 密码输入框 269 // 密码输入框
@@ -259,6 +272,8 @@ export struct SettingPasswordPage { @@ -259,6 +272,8 @@ export struct SettingPasswordPage {
259 Row() { 272 Row() {
260 TextInput({ placeholder: item.inputPlacholder }) 273 TextInput({ placeholder: item.inputPlacholder })
261 .placeholderColor("#CCCCCC") 274 .placeholderColor("#CCCCCC")
  275 + .fontSize(16)
  276 + .lineHeight(24)
262 .passwordIcon({onIconSrc:$r("app.media.login_password_on"),offIconSrc:$r("app.media.login_password_off")}) 277 .passwordIcon({onIconSrc:$r("app.media.login_password_on"),offIconSrc:$r("app.media.login_password_off")})
263 .type(InputType.Password) 278 .type(InputType.Password)
264 .showPasswordIcon(true) 279 .showPasswordIcon(true)
@@ -271,14 +286,16 @@ export struct SettingPasswordPage { @@ -271,14 +286,16 @@ export struct SettingPasswordPage {
271 }) 286 })
272 } 287 }
273 .alignItems(VerticalAlign.Center) 288 .alignItems(VerticalAlign.Center)
274 - .height(`${this.calcHeight(80)}lpx`) 289 + .height(48)
275 .backgroundColor('#f5f5f5') 290 .backgroundColor('#f5f5f5')
276 - .borderRadius(`${this.calcHeight(4)}`) 291 + .borderRadius(4)
277 } 292 }
278 .width('100%') 293 .width('100%')
279 - .height(`${this.calcHeight(110)}lpx`)  
280 .backgroundColor(0xffffff0) 294 .backgroundColor(0xffffff0)
281 .alignItems(VerticalAlign.Center) 295 .alignItems(VerticalAlign.Center)
  296 + .margin({
  297 + top: 12
  298 + })
282 } 299 }
283 300
284 // 手机号输入框 301 // 手机号输入框
@@ -287,6 +304,8 @@ export struct SettingPasswordPage { @@ -287,6 +304,8 @@ export struct SettingPasswordPage {
287 Row() { 304 Row() {
288 TextInput({ placeholder: item.inputPlacholder }) 305 TextInput({ placeholder: item.inputPlacholder })
289 .placeholderColor("#CCCCCC") 306 .placeholderColor("#CCCCCC")
  307 + .fontSize(16)
  308 + .lineHeight(24)
290 .backgroundColor('#00000000') 309 .backgroundColor('#00000000')
291 .onChange((value: string) => { 310 .onChange((value: string) => {
292 this.inputTextChange(value, item.inputTag) 311 this.inputTextChange(value, item.inputTag)
@@ -296,24 +315,28 @@ export struct SettingPasswordPage { @@ -296,24 +315,28 @@ export struct SettingPasswordPage {
296 }) 315 })
297 } 316 }
298 .alignItems(VerticalAlign.Center) 317 .alignItems(VerticalAlign.Center)
299 - .height(`${this.calcHeight(80)}lpx`) 318 + .height(48)
300 .backgroundColor('#f5f5f5') 319 .backgroundColor('#f5f5f5')
301 - .borderRadius(`${this.calcHeight(4)}`) 320 + .borderRadius(4)
302 } 321 }
303 .width('100%') 322 .width('100%')
304 - .height(`${this.calcHeight(110)}lpx`)  
305 .backgroundColor(0xffffff0) 323 .backgroundColor(0xffffff0)
306 .alignItems(VerticalAlign.Center) 324 .alignItems(VerticalAlign.Center)
  325 + .margin({
  326 + top: 12
  327 + })
307 } 328 }
308 329
309 // 验证码码输入框 330 // 验证码码输入框
310 @Builder getCodeCell(item: AccoutPageDataModel) { 331 @Builder getCodeCell(item: AccoutPageDataModel) {
311 Row() { 332 Row() {
312 Stack() { 333 Stack() {
313 - Image($r('app.media.get_code_bg')).width('100%').borderRadius(`${this.calcHeight(4)}`) 334 + Image($r('app.media.get_code_bg')).width('100%').borderRadius(4)
314 Row() { 335 Row() {
315 TextInput({ placeholder: item.inputPlacholder }) 336 TextInput({ placeholder: item.inputPlacholder })
316 .placeholderColor("#CCCCCC") 337 .placeholderColor("#CCCCCC")
  338 + .fontSize(16)
  339 + .lineHeight(24)
317 .backgroundColor('#00000000') 340 .backgroundColor('#00000000')
318 .width('67.28%') 341 .width('67.28%')
319 .onChange((value: string) => { 342 .onChange((value: string) => {
@@ -325,26 +348,32 @@ export struct SettingPasswordPage { @@ -325,26 +348,32 @@ export struct SettingPasswordPage {
325 .fontColor('#da3e22') 348 .fontColor('#da3e22')
326 } 349 }
327 .width('100%') 350 .width('100%')
328 - }.height(`${this.calcHeight(80)}lpx`) 351 + }.height(48)
329 } 352 }
330 .width('100%') 353 .width('100%')
331 - .height(`${this.calcHeight(110)}lpx`)  
332 .backgroundColor(0xffffff0) 354 .backgroundColor(0xffffff0)
333 .alignItems(VerticalAlign.Center) 355 .alignItems(VerticalAlign.Center)
  356 + .margin({
  357 + top: 12
  358 + })
334 } 359 }
335 360
336 // desc 361 // desc
337 @Builder getDescCell(item: AccoutPageDataModel, alignTitle: HorizontalAlign) { 362 @Builder getDescCell(item: AccoutPageDataModel, alignTitle: HorizontalAlign) {
338 Column() { 363 Column() {
339 - Text(item.compDesc).fontSize(`${this.calcHeight(12)}`).maxLines(3).fontColor(0x999999).padding({top:`${this.calcHeight(10)}lpx`}) 364 + Text(item.compDesc)
  365 + .fontSize(14)
  366 + .maxLines(3)
  367 + .lineHeight(20)
  368 + .fontColor('#666666')
340 .onClick(()=>{ 369 .onClick(()=>{
341 if (item.compDesc == '忘记密码') { 370 if (item.compDesc == '忘记密码') {
342 - this.showToastTip('密码不符合密码规范') 371 + WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage)
343 } 372 }
344 }) 373 })
345 } 374 }
346 .width('100%') 375 .width('100%')
347 - .height(`${this.calcHeight(85)}lpx`) 376 + .margin({top:12})
348 .alignItems(alignTitle) 377 .alignItems(alignTitle)
349 } 378 }
350 379
@@ -354,29 +383,32 @@ export struct SettingPasswordPage { @@ -354,29 +383,32 @@ export struct SettingPasswordPage {
354 Text(item.compButtonTitle) 383 Text(item.compButtonTitle)
355 .layoutWeight(1) 384 .layoutWeight(1)
356 .fontColor("#FFFFFF") 385 .fontColor("#FFFFFF")
357 - .borderRadius(`${this.calcHeight(4)}`)  
358 - .fontSize(`${this.calcHeight(18)}`) 386 + .borderRadius(4)
  387 + .fontSize(18)
  388 + .lineHeight(26)
359 .textAlign(TextAlign.Center) 389 .textAlign(TextAlign.Center)
360 .fontWeight(FontWeight.Medium) 390 .fontWeight(FontWeight.Medium)
361 - .margin({ top: `${this.calcHeight(26)}` })  
362 - .height(`${this.calcHeight(44)}`) 391 + .margin({ top: 36 })
  392 + .height(44)
363 .backgroundColor("#ED2800") 393 .backgroundColor("#ED2800")
364 .enabled(this.btnStatus ? true : false) 394 .enabled(this.btnStatus ? true : false)
365 .opacity(this.btnStatus ? 1: 0.6) 395 .opacity(this.btnStatus ? 1: 0.6)
366 .onClick(() => { 396 .onClick(() => {
367 this.buttonClick() 397 this.buttonClick()
368 }) 398 })
369 - }.padding({top:`${this.calcHeight(25)}lpx`}) 399 + }
  400 + .height(44)
  401 + .padding({left: 25, right: 25})
370 .width('100%') 402 .width('100%')
371 } 403 }
372 404
373 // 标题 405 // 标题
374 @Builder getLogoCell(item: AccoutPageDataModel) { 406 @Builder getLogoCell(item: AccoutPageDataModel) {
375 Column() { 407 Column() {
376 - Image(item.compLogo).height(`${this.calcHeight(150)}lpx`).width(`${this.calcHeight(150)}lpx`) 408 + Image(item.compLogo).height(150).width(150)
377 } 409 }
378 .width('100%') 410 .width('100%')
379 - .height(`${this.calcHeight(200)}lpx`) 411 + .height(200)
380 } 412 }
381 413
382 /***************************** 事件处理 ******************************************/ 414 /***************************** 事件处理 ******************************************/
@@ -421,7 +453,7 @@ export struct SettingPasswordPage { @@ -421,7 +453,7 @@ export struct SettingPasswordPage {
421 }); 453 });
422 }).catch((err: string) => { 454 }).catch((err: string) => {
423 this.showToastTip(err) 455 this.showToastTip(err)
424 - Logger.error(TAG, 'catch err:' + JSON.stringify(err)); 456 + // Logger.error(TAG, 'catch err:' + JSON.stringify(err));
425 }); 457 });
426 } 458 }
427 } 459 }
@@ -64,19 +64,29 @@ struct VerifyPhoneNumberPage { @@ -64,19 +64,29 @@ struct VerifyPhoneNumberPage {
64 build() { 64 build() {
65 Column(){ 65 Column(){
66 Column() { 66 Column() {
67 - Image($r('app.media.login_back_icon')).width(24).height(24).margin({ left: 15, top: 10 }).onClick(() => { 67 + Image($r('app.media.login_back_icon'))
  68 + .width(24)
  69 + .height(24)
  70 + .margin({ left: 16, top: 8 })
  71 + .onClick(() => {
68 router.back() 72 router.back()
69 }) 73 })
70 74
71 - Text(this.pageTitle).fontSize(22).fontColor('#333333').fontWeight(FontWeight.Bold).margin({ left: 25, top: 112 }) 75 + Text(this.pageTitle)
  76 + .fontSize(22)
  77 + .lineHeight(32)
  78 + .fontColor('#222222')
  79 + .fontWeight(600)
  80 + .margin({ left: 25, top: 112 })
72 81
73 Column() { 82 Column() {
74 TextInput({ text: this.securityPhone(this.phoneContent) }) 83 TextInput({ text: this.securityPhone(this.phoneContent) })
75 .placeholderColor("#CCCCCC") 84 .placeholderColor("#CCCCCC")
76 .fontSize(16) 85 .fontSize(16)
  86 + .lineHeight(24)
77 .height(48) 87 .height(48)
78 .maxLength(11) 88 .maxLength(11)
79 - .margin({ top: 36 }) 89 + .margin({ top: 40 })
80 .backgroundColor("#F5F5F5") 90 .backgroundColor("#F5F5F5")
81 .borderRadius(4) 91 .borderRadius(4)
82 .enabled(false) 92 .enabled(false)
@@ -96,6 +106,7 @@ struct VerifyPhoneNumberPage { @@ -96,6 +106,7 @@ struct VerifyPhoneNumberPage {
96 .placeholderColor("#CCCCCC") 106 .placeholderColor("#CCCCCC")
97 .layoutWeight(1) 107 .layoutWeight(1)
98 .fontSize(16) 108 .fontSize(16)
  109 + .lineHeight(24)
99 .height(48) 110 .height(48)
100 .type(InputType.Number) 111 .type(InputType.Number)
101 .fontColor("#222222") 112 .fontColor("#222222")
@@ -110,6 +121,7 @@ struct VerifyPhoneNumberPage { @@ -110,6 +121,7 @@ struct VerifyPhoneNumberPage {
110 .fontColor(this.codeBtnState?'#ED2800':'#80ED2800') 121 .fontColor(this.codeBtnState?'#ED2800':'#80ED2800')
111 .width(110) 122 .width(110)
112 .fontSize(14) 123 .fontSize(14)
  124 + .lineHeight(24)
113 .fontWeight( FontWeight.Bold) 125 .fontWeight( FontWeight.Bold)
114 .height(48) 126 .height(48)
115 .textAlign(TextAlign.Center) 127 .textAlign(TextAlign.Center)
@@ -129,7 +141,8 @@ struct VerifyPhoneNumberPage { @@ -129,7 +141,8 @@ struct VerifyPhoneNumberPage {
129 }) 141 })
130 142
131 143
132 - }.margin({ top: 12 }) 144 + }
  145 + .margin({ top: 12 })
133 .height(48) 146 .height(48)
134 .alignItems(VerticalAlign.Center) 147 .alignItems(VerticalAlign.Center)
135 .justifyContent(FlexAlign.Start) 148 .justifyContent(FlexAlign.Start)
@@ -146,16 +159,20 @@ struct VerifyPhoneNumberPage { @@ -146,16 +159,20 @@ struct VerifyPhoneNumberPage {
146 .fontColor(this.isSubmit ?"#FFFFFFFF":"#66FFFFFF") 159 .fontColor(this.isSubmit ?"#FFFFFFFF":"#66FFFFFF")
147 .borderRadius(4) 160 .borderRadius(4)
148 .fontSize(18) 161 .fontSize(18)
  162 + .lineHeight(26)
149 .textAlign(TextAlign.Center) 163 .textAlign(TextAlign.Center)
150 .fontWeight(FontWeight.Medium) 164 .fontWeight(FontWeight.Medium)
151 - .margin({ top: 26 }) 165 + .margin({ top: 36 })
152 .height(44) 166 .height(44)
153 .backgroundColor(this.isSubmit ?"#ED2800":"#99ED2800") 167 .backgroundColor(this.isSubmit ?"#ED2800":"#99ED2800")
154 .enabled(this.isSubmit ? true : false) 168 .enabled(this.isSubmit ? true : false)
155 .onClick(() => { 169 .onClick(() => {
156 this.checkVerifyCode() 170 this.checkVerifyCode()
157 }) 171 })
158 - }.padding({ left: 25, right: 25 }).width('100%') 172 + }
  173 + .height(44)
  174 + .padding({ left: 25, right: 25 })
  175 + .width('100%')
159 176
160 }.width('100%').height('100%').alignItems(HorizontalAlign.Start) 177 }.width('100%').height('100%').alignItems(HorizontalAlign.Start)
161 }.width("100%") 178 }.width("100%")