wangliang_wd

Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  ref |> 修复直播频道预告卡上预约状态在登录和退出时未刷新问题
... ... @@ -46,6 +46,7 @@ export struct ZhSingleRow03 {
@State moreWidth:number = 22
@State moreTips: string = ''
scroller: Scroller = new Scroller()
@Consume @Watch('pageShowForUpdateData') pageShow :number
resetMoreTips() {
console.log('resetMoreTips', this.moreWidth, this.initMoreWidth)
... ... @@ -89,7 +90,7 @@ export struct ZhSingleRow03 {
}
async aboutToAppear(): Promise<void> {
if (HttpUtils.getUserId()) {
if (HttpUtils.isLogin()) {
this.getReserveState();
}
this.loadImg = await onlyWifiLoadImg();
... ... @@ -118,11 +119,23 @@ export struct ZhSingleRow03 {
}
}
})
// 可能有被动强制退出清空
EmitterUtils.receiveEvent(EmitterEventId.FORCE_USER_LOGIN_OUT, () => {
this.getReserveState()
})
}
pageShowForUpdateData() {
this.getReserveState()
}
// 请求所有预约状态
async getReserveState() {
if (false == HttpUtils.isLogin()) {
this.reservedIds = []
return
}
const reserveBean: reserveReqItem[] = this.compDTO.operDataList.map((item: ContentDTO) => {
const reqItem: reserveReqItem = {
liveId: item.objectId.toString(),
... ...