liyubing

Merge remote-tracking branch 'origin/main'

@@ -6,7 +6,6 @@ import { StringUtils } from 'wdKit/Index' @@ -6,7 +6,6 @@ import { StringUtils } from 'wdKit/Index'
6 import { CardMediaInfo } from '../cardCommon/CardMediaInfo' 6 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
7 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO' 7 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
8 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index' 8 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
9 -import { LiveModel } from '../../viewmodel/LiveModel'  
10 9
11 @Component 10 @Component
12 export struct LiveHorizontalReservationComponent { 11 export struct LiveHorizontalReservationComponent {
@@ -20,7 +19,7 @@ export struct LiveHorizontalReservationComponent { @@ -20,7 +19,7 @@ export struct LiveHorizontalReservationComponent {
20 .width(3) 19 .width(3)
21 .height(16) 20 .height(16)
22 .margin({ right: 4 }) 21 .margin({ right: 4 })
23 - Text(StringUtils.isNotEmpty(this?.compDTO?.objectTitle) ? this?.compDTO?.objectTitle : "直播预") 22 + Text(StringUtils.isNotEmpty(this?.compDTO?.objectTitle) ? this?.compDTO?.objectTitle : "直播预")
24 .fontSize($r("app.float.font_size_17")) 23 .fontSize($r("app.float.font_size_17"))
25 .fontColor($r("app.color.color_222222")) 24 .fontColor($r("app.color.color_222222"))
26 .fontWeight(600) 25 .fontWeight(600)
@@ -82,6 +81,7 @@ export struct LiveHorizontalReservationComponent { @@ -82,6 +81,7 @@ export struct LiveHorizontalReservationComponent {
82 }) 81 })
83 }) 82 })
84 }.listDirection(Axis.Horizontal) 83 }.listDirection(Axis.Horizontal)
  84 + .scrollBar(BarState.Off)
85 .width(CommonConstants.FULL_WIDTH) 85 .width(CommonConstants.FULL_WIDTH)
86 .height(this.compDTO.operDataList.length == 2 ? 180 : 136) 86 .height(this.compDTO.operDataList.length == 2 ? 180 : 136)
87 } else if (this.compDTO.operDataList.length) { 87 } else if (this.compDTO.operDataList.length) {