Merge remote-tracking branch 'origin/main'

@@ -244,6 +244,7 @@ struct LiveMorePage {
         })
         })
     }
     }
     .height(44)
     .height(44)
+    .margin({top:this.topSafeHeight+'px'})
     .width('100%')
     .width('100%')
   }
   }
 
 

@@ -306,9 +306,10 @@ struct ReserveMorePage {
           middle: { anchor: "__container__", align: HorizontalAlign.Center }
           middle: { anchor: "__container__", align: HorizontalAlign.Center }
         })
         })
     }
     }
-    .backgroundColor('#FFFFFF')
-    .height(44)
-    .width('100%')
+    .height(vp2px(44) + this.topSafeHeight + 'px')
+    .padding({ top: this.topSafeHeight + 'px' })
+    .width('100%').backgroundColor('#FFFFFF')
+
   }
   }
 
 
   @Builder
   @Builder
@@ -413,7 +414,9 @@ struct ReserveMorePage {
           this.reservedIds = []
           this.reservedIds = []
         }
         }
 
 
-        liveReviewDTO.list.forEach((content) => { content.pageId = this.pageId })
+        liveReviewDTO.list.forEach((content) => {
+          content.pageId = this.pageId
+        })
         this.data.push(...liveReviewDTO.list)
         this.data.push(...liveReviewDTO.list)
         //批量查询关注状态
         //批量查询关注状态
         this.getAppointmentInfo(liveReviewDTO.list)
         this.getAppointmentInfo(liveReviewDTO.list)
@@ -518,7 +521,7 @@ struct ReserveMorePage {
         try {
         try {
 
 
           // 埋点
           // 埋点
-          Tracking.event(!reserveItem.subscribe ? "live_subscribe_click":"cancel_live_subscribe_click",
+          Tracking.event(!reserveItem.subscribe ? "live_subscribe_click" : "cancel_live_subscribe_click",
             TrackParamConvert.program(item))
             TrackParamConvert.program(item))
 
 
           const res = await LiveModel.liveAppointment(reserveItem.relationId, reserveItem.liveId.toString(),
           const res = await LiveModel.liveAppointment(reserveItem.relationId, reserveItem.liveId.toString(),
@@ -555,6 +558,7 @@ struct ReserveMorePage {
       }
       }
     }
     }
   }
   }
+
   getReserveDate(eventDateTimeString: string, type: number): string {
   getReserveDate(eventDateTimeString: string, type: number): string {
     // 解析事件的日期和时间
     // 解析事件的日期和时间
     const eventDateTime = new Date(eventDateTimeString);
     const eventDateTime = new Date(eventDateTimeString);
@@ -570,15 +574,16 @@ struct ReserveMorePage {
       const currentDate = currentDateTime.setHours(0, 0, 0, 0);
       const currentDate = currentDateTime.setHours(0, 0, 0, 0);
       if (eventDate === currentDate) {
       if (eventDate === currentDate) {
         return `今天`;
         return `今天`;
-      }else{
+      } else {
         const month = eventDateTime.getMonth() + 1;
         const month = eventDateTime.getMonth() + 1;
         const date = eventDateTime.getDate();
         const date = eventDateTime.getDate();
         return `${month}月${date}日`;
         return `${month}月${date}日`;
       }
       }
-    }else {
+    } else {
       return `${eventTimeStr}`;
       return `${eventTimeStr}`;
     }
     }
   }
   }
+
   // getReserveDate(eventDateTimeString: string, type: number): string {
   // getReserveDate(eventDateTimeString: string, type: number): string {
   //   // 解析事件的日期和时间
   //   // 解析事件的日期和时间
   //   const eventDateTime = new Date(eventDateTimeString);
   //   const eventDateTime = new Date(eventDateTimeString);