fix:bug[17984,18069] 消息中的预约消息预约已开始和预约已结束的状态鸿蒙与安卓状态不一致, 预约列表鸿蒙版缺少下拉刷新

@@ -38,25 +38,32 @@ export struct AppointmentListChildComponent {
           .interpolation(ImageInterpolation.High)
           .interpolation(ImageInterpolation.High)
 
 
 
 
-        if (this.item.relType === 1) {
+        if (this.item.status == "wait") {
           Row() {
           Row() {
             Row() {
             Row() {
               Image($r('app.media.reserve_icon'))
               Image($r('app.media.reserve_icon'))
-                .width('42lpx')
-                .height('35lpx')
+                .width('27lpx')
+                .height('27lpx')
                 .objectFit(ImageFit.Auto)
                 .objectFit(ImageFit.Auto)
                 .interpolation(ImageInterpolation.High)
                 .interpolation(ImageInterpolation.High)
+                .margin({right:"6lpx"})
 
 
               Text("预约")
               Text("预约")
                 .fontWeight(400)
                 .fontWeight(400)
-                .fontSize('21lpx')
-                .backgroundColor($r('app.color.color_4D000000'))
+                .fontSize('23lpx')
+                .textShadow({
+                  radius: 2,
+                  color: `rgba(0,0,0,0.3)`,
+                  offsetY:2,
+                  offsetX:0
+                })
                 .fontColor($r('app.color.white'))
                 .fontColor($r('app.color.white'))
                 .lineHeight('31lpx')
                 .lineHeight('31lpx')
                 .layoutWeight(1)
                 .layoutWeight(1)
-                .textAlign(TextAlign.Center)
+                .textAlign(TextAlign.Start)
             }.width('94lpx')
             }.width('94lpx')
             .margin({ bottom: '15lpx', right: '15lpx' })
             .margin({ bottom: '15lpx', right: '15lpx' })
+            .alignItems(VerticalAlign.Center)
           }.width('100%')
           }.width('100%')
           .height('100%')
           .height('100%')
           .alignItems(VerticalAlign.Bottom)
           .alignItems(VerticalAlign.Bottom)
@@ -78,7 +85,7 @@ export struct AppointmentListChildComponent {
           .width('100%')
           .width('100%')
         Row() {
         Row() {
           Row() {
           Row() {
-            if (this.item.relType === 2) {
+            if (this.item.status == "end") {
               Image($r('app.media.play_status_history_icon'))
               Image($r('app.media.play_status_history_icon'))
                 .objectFit(ImageFit.Auto)
                 .objectFit(ImageFit.Auto)
                 .interpolation(ImageInterpolation.High)
                 .interpolation(ImageInterpolation.High)
@@ -88,6 +95,16 @@ export struct AppointmentListChildComponent {
               Text('已结束').fontColor($r('app.color.color_999999'))
               Text('已结束').fontColor($r('app.color.color_999999'))
                 .fontWeight('500lpx')
                 .fontWeight('500lpx')
                 .fontSize('23lpx')
                 .fontSize('23lpx')
+            }else if(this.item.status == "running"){
+              Image($r('app.media.play_status_icon'))
+                .objectFit(ImageFit.Auto)
+                .interpolation(ImageInterpolation.High)
+                .width('38lpx')
+                .height('38lpx')
+                .margin({ right: '12lpx' })
+              Text('已开始').fontColor($r('app.color.color_999999'))
+                .fontWeight('500lpx')
+                .fontSize('23lpx')
             } else {
             } else {
               Image($r('app.media.play_status_icon'))
               Image($r('app.media.play_status_icon'))
                 .objectFit(ImageFit.Auto)
                 .objectFit(ImageFit.Auto)
@@ -118,7 +135,7 @@ export struct AppointmentListChildComponent {
 
 
           Blank()
           Blank()
             .layoutWeight(1)
             .layoutWeight(1)
-          if (this.item.relType === 1) {
+          if (this.item.status === "wait") {
             Text(this.item.isAppointment ? "已预约" : "预约")
             Text(this.item.isAppointment ? "已预约" : "预约")
               .fontWeight(400)
               .fontWeight(400)
               .fontSize('23lpx')
               .fontSize('23lpx')
@@ -132,8 +149,19 @@ export struct AppointmentListChildComponent {
               .onClick(() => {
               .onClick(() => {
                 this.dialogController.open()
                 this.dialogController.open()
               })
               })
+          }else if(this.item.status == "running"){
+            Text("去观看" )
+              .fontWeight(400)
+              .fontSize('23lpx')
+              .backgroundColor($r('app.color.color_ED2800'))
+              .fontColor($r('app.color.white'))
+              .lineHeight('31lpx')
+              .textAlign(TextAlign.Center)
+              .width('100lpx')
+              .height('46lpx')
+              .borderRadius('6lpx')
           } else {
           } else {
-            Text(this.item.relType === 2 ? "去观看" : "看回放")
+            Text("看回放")
               .fontWeight(400)
               .fontWeight(400)
               .fontSize('23lpx')
               .fontSize('23lpx')
               .backgroundColor($r('app.color.color_ED2800'))
               .backgroundColor($r('app.color.color_ED2800'))

@@ -7,17 +7,20 @@ import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import { EmptyComponent } from '../../view/EmptyComponent';
 import { EmptyComponent } from '../../view/EmptyComponent';
 import { Action } from 'wdBean/Index';
 import { Action } from 'wdBean/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
+import { CustomPullToRefresh } from '../../reusable/CustomPullToRefresh';
 
 
 const TAG = "AppointmentListUI"
 const TAG = "AppointmentListUI"
 
 
 @Component
 @Component
 export struct AppointmentListUI {
 export struct AppointmentListUI {
   @State data: LazyDataSource<MineAppointmentItem> = new LazyDataSource();
   @State data: LazyDataSource<MineAppointmentItem> = new LazyDataSource();
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State count: number = 0;
   @State count: number = 0;
   @State isLoading: boolean = false
   @State isLoading: boolean = false
   @State hasMore: boolean = true
   @State hasMore: boolean = true
   curPageNum: number = 1;
   curPageNum: number = 1;
   @State isGetRequest: boolean = false
   @State isGetRequest: boolean = false
+  private scroller: Scroller = new Scroller();
 
 
   aboutToAppear() {
   aboutToAppear() {
     this.getNewPageData()
     this.getNewPageData()
@@ -35,9 +38,40 @@ export struct AppointmentListUI {
         }
         }
 
 
       } else {
       } else {
-        //刷新控件 TODO
-        //List
-        List({ space: '6lpx' }) {
+
+        CustomPullToRefresh({
+          alldata:this.data,
+          scroller:this.scroller,
+          customList:()=>{
+            this.ListLayout()
+          },
+          onRefresh:(resolve)=>{
+            this.curPageNum = 1;
+            this.hasMore = true
+            this.isGetRequest = false
+            this.data.clear()
+
+            if (!this.isLoading){
+              this.getNewPageData()
+              if(resolve) resolve('刷新成功')
+            }
+          },
+          onLoadMore:(resolve)=> {
+            if (!this.isLoading) {
+              this.isLoading = true
+              this.getNewPageData()
+            }
+          }
+        })
+      }
+    }
+    .backgroundColor($r('app.color.color_F9F9F9'))
+    .height('100%')
+    .width('100%')
+  }
+
+  @Builder ListLayout(){
+    List({ space:6,scroller: this.scroller }) {
       LazyForEach(this.data, (item: MineAppointmentItem, index: number) => {
       LazyForEach(this.data, (item: MineAppointmentItem, index: number) => {
         ListItem() {
         ListItem() {
           AppointmentListChildComponent({ item: item })
           AppointmentListChildComponent({ item: item })
@@ -62,25 +96,14 @@ export struct AppointmentListUI {
       if (!this.hasMore) {
       if (!this.hasMore) {
         ListItem() {
         ListItem() {
           ListHasNoMoreDataUI()
           ListHasNoMoreDataUI()
-            }
+        }.padding({bottom:px2vp(this.bottomSafeHeight) + 20})
       }
       }
     }
     }
     .cachedCount(4)
     .cachedCount(4)
     .scrollBar(BarState.Off)
     .scrollBar(BarState.Off)
-        .margin({ top: '23lpx', left: '23lpx', right: '23lpx' })
+    .edgeEffect(EdgeEffect.None)
+    .margin({ top: '23lpx', left: '23lpx', right: '23lpx'})
     .layoutWeight(1)
     .layoutWeight(1)
-        .onReachEnd(() => {
-          console.log(TAG, "触底了");
-          if (!this.isLoading) {
-            //加载分页数据
-            this.getNewPageData()
-          }
-        })
-      }
-    }
-    .backgroundColor($r('app.color.color_F9F9F9'))
-    .height('100%')
-    .width('100%')
   }
   }
 
 
   getNewPageData() {
   getNewPageData() {