wangliang_wd

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不一致,看图
import { ContentDTO } from 'wdBean/Index';
import { BaseDTO } from 'wdBean/src/main/ets/bean/component/BaseDTO';
import { LazyDataSource } from 'wdKit/Index';
import { WDViewDefaultType } from '../../view/EmptyComponent';
... ...
... ... @@ -29,7 +29,7 @@ import { JSON } from '@kit.ArkTS'
import { MoreComponent } from '../cardview/MoreComponent'
import { Card9Component } from '../cardview/Card9Component'
import { WDRouterRule, WDRouterPage } from 'wdRouter/Index'
import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent'
const TAG = "SearchResultContentComponent"
@Component
... ... @@ -270,7 +270,12 @@ export struct SearchResultContentComponent {
build() {
Column() {
if (this.count == 0) {
ListHasNoMoreDataUI({ style: 2 })
// ListHasNoMoreDataUI({ style: 2 })
EmptyComponent({
emptyType: WDViewDefaultType.WDViewDefaultType_NoSearchResult,
emptyButton: false,
})
} else {
List({ scroller: this.scroller2 }) {
if (this.data_rmh != null && this.data_rmh.length > 0) {
... ... @@ -314,11 +319,7 @@ export struct SearchResultContentComponent {
}
if (index != this.data.totalCount() - 1) {
Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
// Divider()
// .width('100%')
// .height('1lpx')
// .color($r('app.color.color_F5F5F5'))
// .strokeWidth('1lpx')
}
}
}
... ...
... ... @@ -86,7 +86,7 @@ export struct PlayerFullScreenView {
.margin({ left: 10 })
}
Image($r(`app.media.ic_share`)).height(24).width(24)
Image($r(`app.media.ic_share_empty`)).height(24).width(24)
.onClick(() => {
this.share()
})
... ...