张善主

Merge remote-tracking branch 'origin/main'

@@ -210,7 +210,7 @@ export struct LiveHorizontalCardComponent { @@ -210,7 +210,7 @@ export struct LiveHorizontalCardComponent {
210 this.edgeAnimation() 210 this.edgeAnimation()
211 }) 211 })
212 .onScrollStop(() => { 212 .onScrollStop(() => {
213 - this.resetEdgeAnimation(); 213 + // this.resetEdgeAnimation();
214 }) 214 })
215 .onScroll((xOffset: number, yOffset: number) => { 215 .onScroll((xOffset: number, yOffset: number) => {
216 if (xOffset < 0) { 216 if (xOffset < 0) {
@@ -138,10 +138,12 @@ struct LaunchAdvertisingPage { @@ -138,10 +138,12 @@ struct LaunchAdvertisingPage {
138 }) 138 })
139 } 139 }
140 if(this.defaultModel.screenType === '1') { 140 if(this.defaultModel.screenType === '1') {
141 - Image($r('app.media.LaunchPage_logo'))  
142 - .width('278lpx')  
143 - .height('154lpx')  
144 - .margin({top: '28lpx',bottom:'28lpx'}) 141 + Column(){
  142 + Image($r('app.media.LaunchPage_logo'))
  143 + .width('278lpx')
  144 + .height('154lpx')
  145 + .margin({top:20})
  146 + }.width('100%').height('16%').backgroundColor(Color.White).expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
145 } 147 }
146 } 148 }
147 .width('100%') 149 .width('100%')