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

@@ -17,6 +17,7 @@
     "wdDetailPlayShortVideo": "file:../../features/wdDetailPlayShortVideo",
     "wdDetailPlayShortVideo": "file:../../features/wdDetailPlayShortVideo",
     "wdRouter": "file:../../commons/wdRouter",
     "wdRouter": "file:../../commons/wdRouter",
     "wdNetwork": "file:../../commons/wdNetwork",
     "wdNetwork": "file:../../commons/wdNetwork",
-    "wdJsBridge": "file:../../commons/wdJsBridge"
+    "wdJsBridge": "file:../../commons/wdJsBridge",
+    "wdDetailPlayApi":"file:../../features/wdDetailPlayApi"
   }
   }
 }
 }

@@ -10,6 +10,7 @@ import { QueryListIsFollowedItem } from '../../../viewmodel/QueryListIsFollowedI
 import { ListHasNoMoreDataUI } from '../../reusable/ListHasNoMoreDataUI';
 import { ListHasNoMoreDataUI } from '../../reusable/ListHasNoMoreDataUI';
 import { FollowChildComponent } from './FollowChildComponent';
 import { FollowChildComponent } from './FollowChildComponent';
 import dataPreferences from '@ohos.data.preferences';
 import dataPreferences from '@ohos.data.preferences';
+import { EmptyComponent } from '../../view/EmptyComponent';
 
 
 const TAG = "FollowListDetailUI"
 const TAG = "FollowListDetailUI"
 
 
@@ -32,8 +33,9 @@ export struct FollowListDetailUI {
   build() {
   build() {
     Column() {
     Column() {
       if (this.count === 0) {
       if (this.count === 0) {
-        ListHasNoMoreDataUI({ style: 2 })
-          .height('100%')
+        EmptyComponent({emptyType:14})
+          .layoutWeight(1)
+          .width('100%')
       } else {
       } else {
         List({ space: 3 }) {
         List({ space: 3 }) {
           LazyForEach(this.data, (item: FollowListDetailItem, index: number = 0) => {
           LazyForEach(this.data, (item: FollowListDetailItem, index: number = 0) => {

@@ -95,7 +95,7 @@ export struct HomePageBottomComponent{
               WDRouterRule.jumpWithPage(WDRouterPage.followListPage,params)
               WDRouterRule.jumpWithPage(WDRouterPage.followListPage,params)
             })
             })
 
 
-            EmptyComponent({emptyType:4})
+            EmptyComponent({emptyType:14})
               .layoutWeight(1)
               .layoutWeight(1)
               .width('100%')
               .width('100%')
           }.layoutWeight(1)
           }.layoutWeight(1)

@@ -5,6 +5,7 @@ import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem';
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem';
 import { UserFollowListRequestItem } from '../../../viewmodel/UserFollowListRequestItem';
 import { UserFollowListRequestItem } from '../../../viewmodel/UserFollowListRequestItem';
 import { ListHasNoMoreDataUI } from '../../reusable/ListHasNoMoreDataUI';
 import { ListHasNoMoreDataUI } from '../../reusable/ListHasNoMoreDataUI';
+import { EmptyComponent } from '../../view/EmptyComponent';
 import { FollowChildComponent } from '../follow/FollowChildComponent';
 import { FollowChildComponent } from '../follow/FollowChildComponent';
 
 
 const TAG = "HomePageBottomComponent"
 const TAG = "HomePageBottomComponent"
@@ -30,8 +31,37 @@ export struct OtherHomePageBottomFollowComponent{
         .backgroundColor($r('app.color.color_EDEDED'))
         .backgroundColor($r('app.color.color_EDEDED'))
 
 
       if(this.count === 0){
       if(this.count === 0){
-        ListHasNoMoreDataUI({style:2})
-          .height('100%')
+        Column(){
+          Row(){
+            Text("关注更多人民号")
+              .fontWeight('400lpx')
+              .fontColor($r('app.color.color_222222'))
+              .lineHeight('38lpx')
+              .fontSize('27lpx')
+              .textAlign(TextAlign.Center)
+              .margin({right:'4lpx'})
+            Image($r('app.media.arrow_icon_right'))
+              .objectFit(ImageFit.Auto)
+              .width('27lpx')
+              .height('27lpx')
+          }.height('69lpx')
+          .width('659lpx')
+          .alignItems(VerticalAlign.Center)
+          .justifyContent(FlexAlign.Center)
+          .backgroundColor($r('app.color.color_F5F5F5'))
+          .margin({top:'31lpx',bottom:'4lpx'})
+          .onClick(()=>{
+            let params: Params = {
+              pageID: "1"
+            }
+            WDRouterRule.jumpWithPage(WDRouterPage.followListPage,params)
+          })
+
+          EmptyComponent({emptyType:14})
+            .layoutWeight(1)
+            .width('100%')
+        }.layoutWeight(1)
+        .justifyContent(FlexAlign.Start)
       }else{
       }else{
         List({ space: 3 }) {
         List({ space: 3 }) {
 
 

@@ -11,6 +11,6 @@
     "wdKit": "file:../../commons/wdKit",
     "wdKit": "file:../../commons/wdKit",
     "wdBean": "file:../../features/wdBean",
     "wdBean": "file:../../features/wdBean",
     "wdRouter": "file:../../commons/wdRouter",
     "wdRouter": "file:../../commons/wdRouter",
-    "wdNetwork": "file:../../commons/wdNetwork"
+    "wdNetwork": "file:../../commons/wdNetwork",
   }
   }
 }
 }