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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix:[17891]点赞样式设置-祈福或默哀，详情页点赞后，数字不应为红色
  fix:[17757]当天开播时间应显示为今天

@@ -117,7 +117,8 @@ export struct ImageAndTextPageComponent {
                     if (this.likeNum > 0) {
                       Text(NumberFormatterUtils.formatNumberWithWan(this.likeNum))
                         .fontSize(16)
-                        .fontColor(this.newsStatusOfUser?.likeStatus == '1' ? '#ED2800' : '#999999')
+                        //.fontColor(this.newsStatusOfUser?.likeStatus == '1' ? '#ED2800' : '#999999')
+                        .fontColor((this.likeNumTextColor()))
                         .fontFamily('PingFang SC-Regular')
                         .fontWeight(400)
                         .margin({ left: 5 })
@@ -267,6 +268,14 @@ export struct ImageAndTextPageComponent {
     .backgroundColor(Color.White)
   }
 
+  private likeNumTextColor() {
+    if(this.newsStatusOfUser?.likeStatus == '1'){
+      //已点赞状态  祈福和默哀为黑色  其余为红色
+      return (this.contentDetailData?.likesStyle == 2 || this.contentDetailData?.likesStyle == 3) ? '#222222' : '#ED2800'
+    }
+    return '#999999'
+  }
+
   private async getDetail() {
     this.isNetConnected = NetworkUtil.isNetConnected()
     if (!this.isNetConnected) {

@@ -200,12 +200,13 @@ export struct AppointmentListUI {
       let time = arr[0].split("-");
       if (time.length === 3) {
         let month = time[1].indexOf("0") === 0 ? time[1].substring(1) : time[1]
-        let day = time[2]
+        // let day = time[2]
+        let day = time[2].indexOf("0") === 0 ? time[2].substring(1) : time[2]
 
         dealData[0] = `${month}月${day}日`
         let today = `${new Date().getMonth() + 1}月${new Date().getDate()}日`
         if (dealData[0] === today) {
-          dealData[0] = "今日"
+          dealData[0] = "今天"
         }
       }
     }