Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main
* 'main' of http://192.168.1.42/developOne/harmonyPool: fix: 19151 UI还原问题-【uat】进入视频直播,分享按钮和android不一致,看图 fix:1)搜索 输入wuhuhuan,缺省图和android不一致,看图
Showing
5 changed files
with
9 additions
and
9 deletions
| 1 | -import { ContentDTO } from 'wdBean/Index'; | ||
| 2 | import { BaseDTO } from 'wdBean/src/main/ets/bean/component/BaseDTO'; | 1 | import { BaseDTO } from 'wdBean/src/main/ets/bean/component/BaseDTO'; |
| 3 | import { LazyDataSource } from 'wdKit/Index'; | 2 | import { LazyDataSource } from 'wdKit/Index'; |
| 4 | import { WDViewDefaultType } from '../../view/EmptyComponent'; | 3 | import { WDViewDefaultType } from '../../view/EmptyComponent'; |
| @@ -29,7 +29,7 @@ import { JSON } from '@kit.ArkTS' | @@ -29,7 +29,7 @@ import { JSON } from '@kit.ArkTS' | ||
| 29 | import { MoreComponent } from '../cardview/MoreComponent' | 29 | import { MoreComponent } from '../cardview/MoreComponent' |
| 30 | import { Card9Component } from '../cardview/Card9Component' | 30 | import { Card9Component } from '../cardview/Card9Component' |
| 31 | import { WDRouterRule, WDRouterPage } from 'wdRouter/Index' | 31 | import { WDRouterRule, WDRouterPage } from 'wdRouter/Index' |
| 32 | - | 32 | +import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent' |
| 33 | const TAG = "SearchResultContentComponent" | 33 | const TAG = "SearchResultContentComponent" |
| 34 | 34 | ||
| 35 | @Component | 35 | @Component |
| @@ -270,7 +270,12 @@ export struct SearchResultContentComponent { | @@ -270,7 +270,12 @@ export struct SearchResultContentComponent { | ||
| 270 | build() { | 270 | build() { |
| 271 | Column() { | 271 | Column() { |
| 272 | if (this.count == 0) { | 272 | if (this.count == 0) { |
| 273 | - ListHasNoMoreDataUI({ style: 2 }) | 273 | + // ListHasNoMoreDataUI({ style: 2 }) |
| 274 | + EmptyComponent({ | ||
| 275 | + emptyType: WDViewDefaultType.WDViewDefaultType_NoSearchResult, | ||
| 276 | + emptyButton: false, | ||
| 277 | + | ||
| 278 | + }) | ||
| 274 | } else { | 279 | } else { |
| 275 | List({ scroller: this.scroller2 }) { | 280 | List({ scroller: this.scroller2 }) { |
| 276 | if (this.data_rmh != null && this.data_rmh.length > 0) { | 281 | if (this.data_rmh != null && this.data_rmh.length > 0) { |
| @@ -314,11 +319,7 @@ export struct SearchResultContentComponent { | @@ -314,11 +319,7 @@ export struct SearchResultContentComponent { | ||
| 314 | } | 319 | } |
| 315 | if (index != this.data.totalCount() - 1) { | 320 | if (index != this.data.totalCount() - 1) { |
| 316 | Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) | 321 | Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) |
| 317 | - // Divider() | ||
| 318 | - // .width('100%') | ||
| 319 | - // .height('1lpx') | ||
| 320 | - // .color($r('app.color.color_F5F5F5')) | ||
| 321 | - // .strokeWidth('1lpx') | 322 | + |
| 322 | } | 323 | } |
| 323 | } | 324 | } |
| 324 | } | 325 | } |
| @@ -86,7 +86,7 @@ export struct PlayerFullScreenView { | @@ -86,7 +86,7 @@ export struct PlayerFullScreenView { | ||
| 86 | .margin({ left: 10 }) | 86 | .margin({ left: 10 }) |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | - Image($r(`app.media.ic_share`)).height(24).width(24) | 89 | + Image($r(`app.media.ic_share_empty`)).height(24).width(24) |
| 90 | .onClick(() => { | 90 | .onClick(() => { |
| 91 | this.share() | 91 | this.share() |
| 92 | }) | 92 | }) |
-
Please register or login to post a comment