Merge remote-tracking branch 'origin/main'

@@ -13,7 +13,7 @@ import {
   PeopleShipUserDetailData,
   PeopleShipUserDetailData,
   ArticleCountData
   ArticleCountData
 } from 'wdBean'
 } from 'wdBean'
-import { EmptyComponent } from '../view/EmptyComponent'
+import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent'
 import { CustomTitleUI } from '../reusable/CustomTitleUI'
 import { CustomTitleUI } from '../reusable/CustomTitleUI'
 
 
 @Entry
 @Entry
@@ -41,6 +41,7 @@ struct PeopleShipHomePage {
   @State isLoading: boolean = true
   @State isLoading: boolean = true
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   @State isConnectNetwork : boolean = NetworkUtil.isNetConnected()
   @State isConnectNetwork : boolean = NetworkUtil.isNetConnected()
+  @State isHasHomePage: boolean = true
 
 
   onPageShow(): void {
   onPageShow(): void {
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff'})
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff'})
@@ -60,6 +61,7 @@ struct PeopleShipHomePage {
 
 
   build() {
   build() {
     if(this.isConnectNetwork){
     if(this.isConnectNetwork){
+      if (this.isHasHomePage){
         Stack({ alignContent: Alignment.TopStart }) {
         Stack({ alignContent: Alignment.TopStart }) {
           Stack({ alignContent: Alignment.Top }){
           Stack({ alignContent: Alignment.Top }){
             // 顶部图片
             // 顶部图片
@@ -145,6 +147,14 @@ struct PeopleShipHomePage {
           .margin({top:px2vp(this.topSafeHeight)})
           .margin({top:px2vp(this.topSafeHeight)})
         }
         }
         .width('100%')
         .width('100%')
+      }else {
+        Column(){
+          CustomTitleUI({ titleName: "" })
+          EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoUserHomepage}).height('70%')
+        }.width("100%")
+        .height("100%")
+        .padding({top:px2vp(this.topSafeHeight)})
+      }
     }else{
     }else{
       Column(){
       Column(){
         CustomTitleUI({ titleName: "" })
         CustomTitleUI({ titleName: "" })
@@ -184,6 +194,7 @@ struct PeopleShipHomePage {
 
 
     } catch (exception) {
     } catch (exception) {
       this.isLoading = false
       this.isLoading = false
+      this.isHasHomePage = false
     }
     }
   }
   }
 
 

@@ -44,7 +44,9 @@ export const enum WDViewDefaultType {
   //  17. 暂无评论快来抢沙发
   //  17. 暂无评论快来抢沙发
   WDViewDefaultType_NoComment1,
   WDViewDefaultType_NoComment1,
   //  18. 内容找不到了
   //  18. 内容找不到了
-  WDViewDefaultType_NoContent2
+  WDViewDefaultType_NoContent2,
+  //  19. 暂时无法查看该创作者主页
+  WDViewDefaultType_NoUserHomepage
 }
 }
 
 
 /**
 /**
@@ -214,6 +216,8 @@ export struct EmptyComponent {
       contentString = '暂无评论，快来抢沙发'
       contentString = '暂无评论，快来抢沙发'
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoContent2) {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoContent2) {
       contentString = '内容找不到了'
       contentString = '内容找不到了'
+    } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoUserHomepage){
+      contentString = '暂时无法查看该创作者主页'
     }
     }
 
 
     return contentString
     return contentString
@@ -250,6 +254,8 @@ export struct EmptyComponent {
       this.emptyType === WDViewDefaultType.WDViewDefaultType_NoFollow ||
       this.emptyType === WDViewDefaultType.WDViewDefaultType_NoFollow ||
       this.emptyType === WDViewDefaultType.WDViewDefaultType_NoContent2) {
       this.emptyType === WDViewDefaultType.WDViewDefaultType_NoContent2) {
       imageString = $r('app.media.icon_no_appointmentMade1')
       imageString = $r('app.media.icon_no_appointmentMade1')
+    }else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoUserHomepage){
+      imageString = $r('app.media.icon_no_master1')
     }
     }
     return imageString
     return imageString
   }
   }