Showing
2 changed files
with
13 additions
and
7 deletions
| @@ -306,9 +306,10 @@ struct ReserveMorePage { | @@ -306,9 +306,10 @@ struct ReserveMorePage { | ||
| 306 | middle: { anchor: "__container__", align: HorizontalAlign.Center } | 306 | middle: { anchor: "__container__", align: HorizontalAlign.Center } |
| 307 | }) | 307 | }) |
| 308 | } | 308 | } |
| 309 | - .backgroundColor('#FFFFFF') | ||
| 310 | - .height(44) | ||
| 311 | - .width('100%') | 309 | + .height(vp2px(44) + this.topSafeHeight + 'px') |
| 310 | + .padding({ top: this.topSafeHeight + 'px' }) | ||
| 311 | + .width('100%').backgroundColor('#FFFFFF') | ||
| 312 | + | ||
| 312 | } | 313 | } |
| 313 | 314 | ||
| 314 | @Builder | 315 | @Builder |
| @@ -413,7 +414,9 @@ struct ReserveMorePage { | @@ -413,7 +414,9 @@ struct ReserveMorePage { | ||
| 413 | this.reservedIds = [] | 414 | this.reservedIds = [] |
| 414 | } | 415 | } |
| 415 | 416 | ||
| 416 | - liveReviewDTO.list.forEach((content) => { content.pageId = this.pageId }) | 417 | + liveReviewDTO.list.forEach((content) => { |
| 418 | + content.pageId = this.pageId | ||
| 419 | + }) | ||
| 417 | this.data.push(...liveReviewDTO.list) | 420 | this.data.push(...liveReviewDTO.list) |
| 418 | //批量查询关注状态 | 421 | //批量查询关注状态 |
| 419 | this.getAppointmentInfo(liveReviewDTO.list) | 422 | this.getAppointmentInfo(liveReviewDTO.list) |
| @@ -518,7 +521,7 @@ struct ReserveMorePage { | @@ -518,7 +521,7 @@ struct ReserveMorePage { | ||
| 518 | try { | 521 | try { |
| 519 | 522 | ||
| 520 | // 埋点 | 523 | // 埋点 |
| 521 | - Tracking.event(!reserveItem.subscribe ? "live_subscribe_click":"cancel_live_subscribe_click", | 524 | + Tracking.event(!reserveItem.subscribe ? "live_subscribe_click" : "cancel_live_subscribe_click", |
| 522 | TrackParamConvert.program(item)) | 525 | TrackParamConvert.program(item)) |
| 523 | 526 | ||
| 524 | const res = await LiveModel.liveAppointment(reserveItem.relationId, reserveItem.liveId.toString(), | 527 | const res = await LiveModel.liveAppointment(reserveItem.relationId, reserveItem.liveId.toString(), |
| @@ -555,6 +558,7 @@ struct ReserveMorePage { | @@ -555,6 +558,7 @@ struct ReserveMorePage { | ||
| 555 | } | 558 | } |
| 556 | } | 559 | } |
| 557 | } | 560 | } |
| 561 | + | ||
| 558 | getReserveDate(eventDateTimeString: string, type: number): string { | 562 | getReserveDate(eventDateTimeString: string, type: number): string { |
| 559 | // 解析事件的日期和时间 | 563 | // 解析事件的日期和时间 |
| 560 | const eventDateTime = new Date(eventDateTimeString); | 564 | const eventDateTime = new Date(eventDateTimeString); |
| @@ -570,15 +574,16 @@ struct ReserveMorePage { | @@ -570,15 +574,16 @@ struct ReserveMorePage { | ||
| 570 | const currentDate = currentDateTime.setHours(0, 0, 0, 0); | 574 | const currentDate = currentDateTime.setHours(0, 0, 0, 0); |
| 571 | if (eventDate === currentDate) { | 575 | if (eventDate === currentDate) { |
| 572 | return `今天`; | 576 | return `今天`; |
| 573 | - }else{ | 577 | + } else { |
| 574 | const month = eventDateTime.getMonth() + 1; | 578 | const month = eventDateTime.getMonth() + 1; |
| 575 | const date = eventDateTime.getDate(); | 579 | const date = eventDateTime.getDate(); |
| 576 | return `${month}月${date}日`; | 580 | return `${month}月${date}日`; |
| 577 | } | 581 | } |
| 578 | - }else { | 582 | + } else { |
| 579 | return `${eventTimeStr}`; | 583 | return `${eventTimeStr}`; |
| 580 | } | 584 | } |
| 581 | } | 585 | } |
| 586 | + | ||
| 582 | // getReserveDate(eventDateTimeString: string, type: number): string { | 587 | // getReserveDate(eventDateTimeString: string, type: number): string { |
| 583 | // // 解析事件的日期和时间 | 588 | // // 解析事件的日期和时间 |
| 584 | // const eventDateTime = new Date(eventDateTimeString); | 589 | // const eventDateTime = new Date(eventDateTimeString); |
-
Please register or login to post a comment