Merge remote-tracking branch 'origin/main'

@@ -3,12 +3,40 @@
  */
  */
 import { RmhInfoDTO } from 'wdBean'
 import { RmhInfoDTO } from 'wdBean'
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
-import { DateTimeUtils } from 'wdKit';
+import { DateTimeUtils, SPHelper } from 'wdKit';
+import { SpConstants } from 'wdConstant/Index'
+import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
+import router from '@ohos.router'
 
 
 @Component
 @Component
 export struct RmhTitle {
 export struct RmhTitle {
   @Prop rmhInfo: RmhInfoDTO
   @Prop rmhInfo: RmhInfoDTO
   @Prop publishTime: string | undefined
   @Prop publishTime: string | undefined
+  @Prop hideTime: boolean
+
+  async appointReq() {
+    // 未登录，跳转登录
+    const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
+    if (!user_id) {
+      WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+      return
+    }
+  }
+
+  aboutToAppear(): void {
+    let page = router.getState();
+    if (page.path.includes('/page/PeopleShipHomePage')) {
+      this.hideTime = true;
+    }
+  }
+
+  getDaysBetweenDates(date: number) {
+    const oneDay = 24 * 60 * 60 * 1000; // 一天的毫秒数
+    const time1 = new Date().getTime(); // 今天日期的时间戳
+    const time2 = new Date(date).getTime(); // 要比较日期的时间戳
+    const diffDays = Math.round(Math.abs((time1 - time2) / oneDay)); // 两个日期时间戳差值除以一天的毫秒数得到天数，取绝对值并四舍五入
+    return Math.ceil(diffDays);
+  }
 
 
   build() {
   build() {
     Flex() {
     Flex() {
@@ -33,15 +61,17 @@ export struct RmhTitle {
           .alignSelf(ItemAlign.Start)
           .alignSelf(ItemAlign.Start)
         Flex({alignContent: FlexAlign.Start, wrap: FlexWrap.NoWrap}) {
         Flex({alignContent: FlexAlign.Start, wrap: FlexWrap.NoWrap}) {
           Row() {
           Row() {
-            if (this.publishTime) {
-              Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.publishTime)))
-                .fontSize($r("app.float.font_size_12"))
-                .fontColor($r("app.color.color_B0B0B0"))
-            }
-            if (this.publishTime && this.rmhInfo.rmhDesc) {
-              Image($r('app.media.point'))
-                .width(16)
-                .height(16)
+            if (!(this.hideTime && this.getDaysBetweenDates(Number(this.publishTime)) > 2)) {
+              if (this.publishTime) {
+                Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.publishTime)))
+                  .fontSize($r("app.float.font_size_12"))
+                  .fontColor($r("app.color.color_B0B0B0"))
+              }
+              if (this.publishTime && this.rmhInfo.rmhDesc) {
+                Image($r('app.media.point'))
+                  .width(16)
+                  .height(16)
+              }
             }
             }
             Text(this.rmhInfo.rmhDesc)
             Text(this.rmhInfo.rmhDesc)
               .fontSize($r("app.float.font_size_12"))
               .fontSize($r("app.float.font_size_12"))
@@ -68,7 +98,7 @@ export struct RmhTitle {
         .flexShrink(0)
         .flexShrink(0)
         .alignSelf(ItemAlign.Center)
         .alignSelf(ItemAlign.Center)
         .onClick(() => {
         .onClick(() => {
-          // TODO 调用关注接口
+          this.appointReq();
         })
         })
       }
       }
     }
     }