developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
张善主
e4c45041 2 parents 93f94a97 1836954e

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 2 changed files with 4 additions and 5 deletions
@@ -81,7 +81,6 @@ export struct SubscribeMessageComponent{ @@ -81,7 +81,6 @@ export struct SubscribeMessageComponent{
81 } 81 }
82 }) 82 })
83 .width('100%') 83 .width('100%')
84 - .margin({bottom:px2vp(this.bottomSafeHeight)})  
85 } 84 }
86 } 85 }
87 .backgroundColor($r('app.color.color_F9F9F9')) 86 .backgroundColor($r('app.color.color_F9F9F9'))
@@ -113,12 +112,12 @@ export struct SubscribeMessageComponent{ @@ -113,12 +112,12 @@ export struct SubscribeMessageComponent{
113 if (!this.hasMore) { 112 if (!this.hasMore) {
114 ListItem() { 113 ListItem() {
115 ListHasNoMoreDataUI() 114 ListHasNoMoreDataUI()
116 - } 115 + }.padding({bottom:px2vp(this.bottomSafeHeight) + 10})
117 } 116 }
118 }.width('100%') 117 }.width('100%')
  118 + .edgeEffect(EdgeEffect.None)
119 .height("100%") 119 .height("100%")
120 .scrollBar(BarState.Off) 120 .scrollBar(BarState.Off)
121 - .layoutWeight(1)  
122 } 121 }
123 122
124 getNewPageData() { 123 getNewPageData() {
@@ -52,9 +52,9 @@ class MineSettingDatasModel{ @@ -52,9 +52,9 @@ class MineSettingDatasModel{
52 this.mainSettingData.push(new MineMainSettingFunctionItem(null, 'wifi网络情况下自动播放视频', null, 1, videoState,"video_switch")) 52 this.mainSettingData.push(new MineMainSettingFunctionItem(null, 'wifi网络情况下自动播放视频', null, 1, videoState,"video_switch"))
53 let suspensionState=SPHelper.default.getSync(SpConstants.SETTING_SUSPENSION_SWITCH,false) as boolean 53 let suspensionState=SPHelper.default.getSync(SpConstants.SETTING_SUSPENSION_SWITCH,false) as boolean
54 this.mainSettingData.push(new MineMainSettingFunctionItem(null, '开启播放器悬浮窗', null, 1, suspensionState,"suspensionState_switch")) 54 this.mainSettingData.push(new MineMainSettingFunctionItem(null, '开启播放器悬浮窗', null, 1, suspensionState,"suspensionState_switch"))
55 - this.mainSettingData.push(new MineMainSettingFunctionItem(null, null, null, 2, null,"")) 55 + // this.mainSettingData.push(new MineMainSettingFunctionItem(null, null, null, 2, null,""))
56 this.mainSettingData.push(new MineMainSettingFunctionItem(null, '清理缓存', '32MB', 0, false,"clear_cache")) 56 this.mainSettingData.push(new MineMainSettingFunctionItem(null, '清理缓存', '32MB', 0, false,"clear_cache"))
57 - this.mainSettingData.push(new MineMainSettingFunctionItem(null, '评价我们', null, 0, false,"")) 57 + // this.mainSettingData.push(new MineMainSettingFunctionItem(null, '评价我们', null, 0, false,""))
58 58
59 return this.mainSettingData 59 return this.mainSettingData
60 } 60 }