developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
yumaochao
e0dd2ed5 1 parent 4348b80f

fix：somebug

Inline Side-by-side
Showing 1 changed file with 0 additions and 3 deletions
@@ -185,8 +185,6 @@ export struct LiveHorizontalCardComponent { @@ -185,8 +185,6 @@ export struct LiveHorizontalCardComponent {
185 .scrollable(this.compDTO.operDataList.length >= 2 ? ScrollDirection.Horizontal : ScrollDirection.None) 185 .scrollable(this.compDTO.operDataList.length >= 2 ? ScrollDirection.Horizontal : ScrollDirection.None)
186 .scrollBar(BarState.Off) 186 .scrollBar(BarState.Off)
187 .edgeEffect(EdgeEffect.None) 187 .edgeEffect(EdgeEffect.None)
188 -<<<<<<< HEAD  
189 -=======  
190 .onReachEnd(() => { 188 .onReachEnd(() => {
191 this.edgeAnimation() 189 this.edgeAnimation()
192 }) 190 })
@@ -206,7 +204,6 @@ export struct LiveHorizontalCardComponent { @@ -206,7 +204,6 @@ export struct LiveHorizontalCardComponent {
206 } 204 }
207 } 205 }
208 }) 206 })
209 ->>>>>>> 5b11f108e91a00822c1244a56ba2d9417a9385b7  
210 .width(CommonConstants.FULL_WIDTH) 207 .width(CommonConstants.FULL_WIDTH)
211 .height(this.compDTO.operDataList.length == 2 ? 180 : 136) 208 .height(this.compDTO.operDataList.length == 2 ? 180 : 136)
212 } else if (this.compDTO.operDataList.length) { 209 } else if (this.compDTO.operDataList.length) {