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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  feat: 已预约边框
  ref |> 临时修复uat直播无法进入问题

@@ -336,6 +336,9 @@ export struct ZhSingleRow03 {
               .fontSize(12)
               .textAlign(TextAlign.Center)
               .borderRadius(3)
+              .borderStyle(BorderStyle.Solid)
+              .borderWidth(this.isReserved(Number(item.objectId)) ? 1 : 0)
+              .borderColor('#e5e5e5')
               .onClick(() => {
 
                 const isSubscribe = !this.isReserved(Number(item.objectId))

@@ -160,6 +160,9 @@ export struct AppointmentListChildComponent {
                 .width(52)
                 .height(24)
                 .borderRadius(3)
+                .borderStyle(BorderStyle.Solid)
+                .borderWidth(this.isReserved(Number(item.objectId)) ? 1 : 0)
+                .borderColor('#e5e5e5')
                 .onClick(() => {
                   this.dialogController.open()
                 })

@@ -60,10 +60,11 @@ export class LiveDetailPageLogic {
 
      // 垫图资源
     if (this.contentDetailData.liveInfo){
-
+      if(this.contentDetailData.liveInfo.padImageUri) {
         if(this.contentDetailData.liveInfo.padImageUri.length > 0){
           this.padImageUri =this.contentDetailData.liveInfo.padImageUri
         }
+      }
       //this.padImageUri = 'https://uatjdcdnphoto.aikan.pdnews.cn/sjbj-20240515/image/display/cdb84fe86b1440d58f3fc585841b928d.jpg'
 
     }