fix:bug[18313] 【华为验收】【ux-直板机】【底部导航条适配】点击 我的-关注,进入该页面,该页面底部导航条未沉浸
Showing
6 changed files
with
35 additions
and
15 deletions
| @@ -117,9 +117,6 @@ export struct FollowChildComponent{ | @@ -117,9 +117,6 @@ export struct FollowChildComponent{ | ||
| 117 | }.height('202lpx') | 117 | }.height('202lpx') |
| 118 | .justifyContent(FlexAlign.Start) | 118 | .justifyContent(FlexAlign.Start) |
| 119 | 119 | ||
| 120 | - // Text().backgroundColor($r('app.color.color_EDEDED')) | ||
| 121 | - // .width('100%') | ||
| 122 | - // .height('2lpx') | ||
| 123 | Divider() | 120 | Divider() |
| 124 | .width('100%') | 121 | .width('100%') |
| 125 | .height('2lpx') | 122 | .height('2lpx') |
| @@ -236,10 +233,6 @@ export struct FollowChildComponent{ | @@ -236,10 +233,6 @@ export struct FollowChildComponent{ | ||
| 236 | }.height('146lpx') | 233 | }.height('146lpx') |
| 237 | .justifyContent(FlexAlign.Center) | 234 | .justifyContent(FlexAlign.Center) |
| 238 | 235 | ||
| 239 | - // Text().backgroundColor($r('app.color.color_EDEDED')) | ||
| 240 | - // .width('100%') | ||
| 241 | - // .height('2lpx') | ||
| 242 | - | ||
| 243 | Divider() | 236 | Divider() |
| 244 | .width('100%') | 237 | .width('100%') |
| 245 | .height('2lpx') | 238 | .height('2lpx') |
| @@ -95,6 +95,8 @@ export struct FollowFirstTabsComponent{ | @@ -95,6 +95,8 @@ export struct FollowFirstTabsComponent{ | ||
| 95 | TabContent(){ | 95 | TabContent(){ |
| 96 | FollowSecondTabsComponent({data:$data,firstIndex:index}) | 96 | FollowSecondTabsComponent({data:$data,firstIndex:index}) |
| 97 | }.tabBar(this.TabBuilder(index,item)) | 97 | }.tabBar(this.TabBuilder(index,item)) |
| 98 | + .backgroundColor($r('app.color.white')) | ||
| 99 | + .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM]) | ||
| 98 | }, (item: FollowListItem, index: number) => index.toString()) | 100 | }, (item: FollowListItem, index: number) => index.toString()) |
| 99 | } | 101 | } |
| 100 | .vertical(false) | 102 | .vertical(false) |
| @@ -108,9 +110,11 @@ export struct FollowFirstTabsComponent{ | @@ -108,9 +110,11 @@ export struct FollowFirstTabsComponent{ | ||
| 108 | trackTabFirstClick(this.data[index].directoryName) | 110 | trackTabFirstClick(this.data[index].directoryName) |
| 109 | }) | 111 | }) |
| 110 | .width('100%') | 112 | .width('100%') |
| 113 | + .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM]) | ||
| 111 | .layoutWeight(1) | 114 | .layoutWeight(1) |
| 112 | } | 115 | } |
| 113 | }.width('100%') | 116 | }.width('100%') |
| 117 | + .height("100%") | ||
| 114 | } | 118 | } |
| 115 | 119 | ||
| 116 | reloadNetWork(){ | 120 | reloadNetWork(){ |
| @@ -91,8 +91,6 @@ export struct FollowListDetailUI { | @@ -91,8 +91,6 @@ export struct FollowListDetailUI { | ||
| 91 | ListItem() { | 91 | ListItem() { |
| 92 | FollowChildComponent({ data: item, type: this.type }) | 92 | FollowChildComponent({ data: item, type: this.type }) |
| 93 | } | 93 | } |
| 94 | - .onClick(() => { | ||
| 95 | - }) | ||
| 96 | }, (item: FollowListDetailItem) => item.creatorId) | 94 | }, (item: FollowListDetailItem) => item.creatorId) |
| 97 | 95 | ||
| 98 | //没有更多数据 显示提示 | 96 | //没有更多数据 显示提示 |
| @@ -102,6 +100,7 @@ export struct FollowListDetailUI { | @@ -102,6 +100,7 @@ export struct FollowListDetailUI { | ||
| 102 | } | 100 | } |
| 103 | } | 101 | } |
| 104 | } | 102 | } |
| 103 | + .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM]) | ||
| 105 | .edgeEffect(EdgeEffect.None) | 104 | .edgeEffect(EdgeEffect.None) |
| 106 | .cachedCount(5) | 105 | .cachedCount(5) |
| 107 | .padding({ left: '31lpx', right: '31lpx' }) | 106 | .padding({ left: '31lpx', right: '31lpx' }) |
| @@ -118,6 +117,7 @@ export struct FollowListDetailUI { | @@ -118,6 +117,7 @@ export struct FollowListDetailUI { | ||
| 118 | } | 117 | } |
| 119 | } | 118 | } |
| 120 | .width('100%') | 119 | .width('100%') |
| 120 | + .layoutWeight(1) | ||
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | async addFollowStatusObserver() { | 123 | async addFollowStatusObserver() { |
sight_harmony/features/wdComponent/src/main/ets/components/mine/follow/FollowSecondTabsComponent.ets
| @@ -22,15 +22,35 @@ export struct FollowSecondTabsComponent{ | @@ -22,15 +22,35 @@ export struct FollowSecondTabsComponent{ | ||
| 22 | 22 | ||
| 23 | if(this.data != null){ | 23 | if(this.data != null){ |
| 24 | if(this.data[this.firstIndex].children == null || this.data[this.firstIndex].children.length == 0){ | 24 | if(this.data[this.firstIndex].children == null || this.data[this.firstIndex].children.length == 0){ |
| 25 | - FollowListDetailUI({creatorDirectoryId:this.data[this.firstIndex].id,type:1}) | ||
| 26 | - .layoutWeight(1) | 25 | + Stack({ alignContent: Alignment.Top }){ |
| 26 | + Row() | ||
| 27 | + .width("100%") | ||
| 28 | + .height("100%") | ||
| 29 | + .backgroundColor($r('app.color.color_transparent')) | ||
| 30 | + .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM]) | ||
| 31 | + | ||
| 32 | + FollowListDetailUI({creatorDirectoryId:this.data[this.firstIndex].id,type:1}) | ||
| 33 | + .height("100%") | ||
| 34 | + .width("100%") | ||
| 35 | + }.width("100%") | ||
| 36 | + .layoutWeight(1) | ||
| 27 | }else{ | 37 | }else{ |
| 28 | - this.FollowSecondUI() | 38 | + Stack({ alignContent: Alignment.Top }){ |
| 39 | + Row() | ||
| 40 | + .width("100%") | ||
| 41 | + .height("100%") | ||
| 42 | + .backgroundColor($r('app.color.color_transparent')) | ||
| 43 | + .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM]) | ||
| 44 | + | ||
| 45 | + this.FollowSecondUI() | ||
| 46 | + }.width("100%") | ||
| 47 | + .layoutWeight(1) | ||
| 29 | } | 48 | } |
| 30 | } | 49 | } |
| 31 | } | 50 | } |
| 32 | .width('100%') | 51 | .width('100%') |
| 33 | .layoutWeight(1) | 52 | .layoutWeight(1) |
| 53 | + .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM]) | ||
| 34 | } | 54 | } |
| 35 | 55 | ||
| 36 | @Builder FollowSecondUI(){ | 56 | @Builder FollowSecondUI(){ |
| @@ -51,6 +71,7 @@ export struct FollowSecondTabsComponent{ | @@ -51,6 +71,7 @@ export struct FollowSecondTabsComponent{ | ||
| 51 | .scrollBar(BarState.Off) | 71 | .scrollBar(BarState.Off) |
| 52 | .height('100%') | 72 | .height('100%') |
| 53 | }.height('100%') | 73 | }.height('100%') |
| 74 | + .backgroundColor($r('app.color.color_F9F9F9')) | ||
| 54 | .alignItems(HorizontalAlign.Center) | 75 | .alignItems(HorizontalAlign.Center) |
| 55 | } | 76 | } |
| 56 | .alignItems(VerticalAlign.Top) | 77 | .alignItems(VerticalAlign.Top) |
| @@ -60,8 +81,7 @@ export struct FollowSecondTabsComponent{ | @@ -60,8 +81,7 @@ export struct FollowSecondTabsComponent{ | ||
| 60 | ForEach(this.data[this.firstIndex].children, (item: FollowSecondListItem, index: number ) => { | 81 | ForEach(this.data[this.firstIndex].children, (item: FollowSecondListItem, index: number ) => { |
| 61 | TabContent(){ | 82 | TabContent(){ |
| 62 | FollowThirdTabsComponent({data:$data,firstIndex:$firstIndex,secondIndex:index}) | 83 | FollowThirdTabsComponent({data:$data,firstIndex:$firstIndex,secondIndex:index}) |
| 63 | - } | ||
| 64 | - .backgroundColor($r('app.color.white')) | 84 | + }.expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM]) |
| 65 | }, (item: FollowListItem, index: number) => index.toString()) | 85 | }, (item: FollowListItem, index: number) => index.toString()) |
| 66 | } | 86 | } |
| 67 | .vertical(true) | 87 | .vertical(true) |
| @@ -73,6 +93,7 @@ export struct FollowSecondTabsComponent{ | @@ -73,6 +93,7 @@ export struct FollowSecondTabsComponent{ | ||
| 73 | .barWidth(0) | 93 | .barWidth(0) |
| 74 | .height('100%') | 94 | .height('100%') |
| 75 | .layoutWeight(1) | 95 | .layoutWeight(1) |
| 96 | + .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM]) | ||
| 76 | }.width('100%') | 97 | }.width('100%') |
| 77 | } | 98 | } |
| 78 | 99 |
| @@ -104,6 +104,8 @@ export struct FollowThirdTabsComponent{ | @@ -104,6 +104,8 @@ export struct FollowThirdTabsComponent{ | ||
| 104 | this.currentIndex = index | 104 | this.currentIndex = index |
| 105 | }) | 105 | }) |
| 106 | .width('100%') | 106 | .width('100%') |
| 107 | + .layoutWeight(1) | ||
| 108 | + .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM]) | ||
| 107 | } | 109 | } |
| 108 | } | 110 | } |
| 109 | 111 |
| @@ -29,7 +29,7 @@ struct FollowListPage { | @@ -29,7 +29,7 @@ struct FollowListPage { | ||
| 29 | //Tab 详情 | 29 | //Tab 详情 |
| 30 | FollowFirstTabsComponent({changeIndex:Number(this.curIndex)}) | 30 | FollowFirstTabsComponent({changeIndex:Number(this.curIndex)}) |
| 31 | } | 31 | } |
| 32 | - .backgroundColor($r('app.color.color_F9F9F9')) | 32 | + .backgroundColor($r('app.color.white')) |
| 33 | .height('100%') | 33 | .height('100%') |
| 34 | .width('100%') | 34 | .width('100%') |
| 35 | } | 35 | } |
-
Please register or login to post a comment