Merge remote-tracking branch 'origin/main'

@@ -86,7 +86,7 @@ export struct FollowFirstTabsComponent{
       if(!this.isConnectNetwork){
       if(!this.isConnectNetwork){
         EmptyComponent({ emptyType: 1,emptyHeight:"100%" ,retry: () => {
         EmptyComponent({ emptyType: 1,emptyHeight:"100%" ,retry: () => {
           this.reloadNetWork()
           this.reloadNetWork()
-        },})
+        }})
           .layoutWeight(1)
           .layoutWeight(1)
           .width('100%')
           .width('100%')
       }else{
       }else{

 import router from '@ohos.router'
 import router from '@ohos.router'
 import { PeopleShipHomePageNavComponent } from '../peopleShipHomePage/PeopleShipHomeNavComponent'
 import { PeopleShipHomePageNavComponent } from '../peopleShipHomePage/PeopleShipHomeNavComponent'
 import { PeopleShipHomePageTopComponent } from '../peopleShipHomePage/PeopleShipHomePageTopComponent'
 import { PeopleShipHomePageTopComponent } from '../peopleShipHomePage/PeopleShipHomePageTopComponent'
-import { Logger, WindowModel } from 'wdKit'
+import { Logger, NetworkUtil, WindowModel } from 'wdKit'
 import { PeopleShipHomePageDataModel } from '../../viewmodel/PeopleShipHomePageDataModel'
 import { PeopleShipHomePageDataModel } from '../../viewmodel/PeopleShipHomePageDataModel'
 import { PeopleShipHomeListComponent } from '../peopleShipHomePage/PeopleShipHomeListComponent'
 import { PeopleShipHomeListComponent } from '../peopleShipHomePage/PeopleShipHomeListComponent'
 import { QueryListIsFollowedItem } from '../../viewmodel/QueryListIsFollowedItem'
 import { QueryListIsFollowedItem } from '../../viewmodel/QueryListIsFollowedItem'
@@ -14,6 +14,7 @@ import {
   ArticleCountData
   ArticleCountData
 } from 'wdBean'
 } from 'wdBean'
 import { EmptyComponent } from '../view/EmptyComponent'
 import { EmptyComponent } from '../view/EmptyComponent'
+import { CustomTitleUI } from '../reusable/CustomTitleUI'
 
 
 @Entry
 @Entry
 @Component
 @Component
@@ -39,8 +40,10 @@ struct PeopleShipHomePage {
   @Provide topHeight: number = 214
   @Provide topHeight: number = 214
   @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()
 
 
   build() {
   build() {
+    if(this.isConnectNetwork){
       Stack({ alignContent: Alignment.TopStart }) {
       Stack({ alignContent: Alignment.TopStart }) {
         Stack({ alignContent: Alignment.Top }){
         Stack({ alignContent: Alignment.Top }){
           // 顶部图片
           // 顶部图片
@@ -61,8 +64,6 @@ struct PeopleShipHomePage {
             .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
             .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
         }
         }
 
 
-
-
         Column(){
         Column(){
           // 头部返回
           // 头部返回
           PeopleShipHomePageNavComponent({
           PeopleShipHomePageNavComponent({
@@ -122,7 +123,6 @@ struct PeopleShipHomePage {
 
 
             })
             })
           }
           }
-
         }
         }
         .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
         .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
         .alignItems(HorizontalAlign.Start)
         .alignItems(HorizontalAlign.Start)
@@ -130,7 +130,21 @@ struct PeopleShipHomePage {
         .width('100%')
         .width('100%')
       }
       }
       .width('100%')
       .width('100%')
-
+    }else{
+      Column(){
+        CustomTitleUI({ titleName: "" })
+        EmptyComponent({ emptyType: 1,emptyHeight:"100%" ,retry: () => {
+          this.isConnectNetwork = NetworkUtil.isNetConnected()
+          if(this.isConnectNetwork){
+            this.detailModel = {} as PeopleShipUserDetailData
+            this.getData()
+          }
+        }})
+          .height('calc(100% - 84lpx)')
+          .width('100%')
+      }.width("100%")
+      .height("100%")
+    }
   }
   }
 
 
    aboutToAppear() {
    aboutToAppear() {