fix:16656 人民号主页中的“+关注”与“已显示全部内容””的样式鸿蒙与安卓不一致

@@ -24,7 +24,7 @@ import PageAdModel from '../../viewmodel/PageAdvModel';
 import PageHelper from '../../viewmodel/PageHelper';
 import PageHelper from '../../viewmodel/PageHelper';
 import { PeopleShipAttentionContentListTopComponent } from './PeopleShipAttentionContentListTopComponent'
 import { PeopleShipAttentionContentListTopComponent } from './PeopleShipAttentionContentListTopComponent'
 import { CardParser } from '../CardParser'
 import { CardParser } from '../CardParser'
-import NoMoreLayout from '../page/NoMoreLayout';
+import { PeopleShipNoMoreData } from '../reusable/PeopleShipNoMoreData';
 
 
 @Preview
 @Preview
 @Component
 @Component
@@ -161,7 +161,7 @@ export struct PeopleShipMainComponent {
       // 加载更多
       // 加载更多
       ListItem() {
       ListItem() {
         if (!this.hasMore && !this.isLoading) {
         if (!this.hasMore && !this.isLoading) {
-          NoMoreLayout()
+          PeopleShipNoMoreData()
         }
         }
       }
       }
     }
     }

 import { PeopleShipRecommendHeadComponent } from './PeopleShipRecommendHeadComponent'
 import { PeopleShipRecommendHeadComponent } from './PeopleShipRecommendHeadComponent'
 import { RmhRecommendDTO } from 'wdBean';
 import { RmhRecommendDTO } from 'wdBean';
-import { Logger } from 'wdKit/Index';
-import NoMoreLayout from '../page/NoMoreLayout';
+import { PeopleShipNoMoreData } from '../reusable/PeopleShipNoMoreData';
 
 
 @Component
 @Component
 export struct PeopleShipRecommendComponent {
 export struct PeopleShipRecommendComponent {
@@ -87,7 +86,8 @@ export struct PeopleShipRecommendComponent {
       // 为你推荐
       // 为你推荐
       Button(this.rmhSelectedList.length == 0 ? '一键关注' : `一键关注 (${this.rmhSelectedList.length})`, { type: ButtonType.Normal, stateEffect: this.rmhSelectedList.length != 0 })
       Button(this.rmhSelectedList.length == 0 ? '一键关注' : `一键关注 (${this.rmhSelectedList.length})`, { type: ButtonType.Normal, stateEffect: this.rmhSelectedList.length != 0 })
         .margin({
         .margin({
-          top: '24vp'
+          top: '24vp',
+          bottom: '10vp'
         })
         })
         .width('120vp')
         .width('120vp')
         .height('36vp')
         .height('36vp')
@@ -104,7 +104,7 @@ export struct PeopleShipRecommendComponent {
           }
           }
         })
         })
       // 没有更多
       // 没有更多
-      NoMoreLayout()
+      PeopleShipNoMoreData()
     }
     }
     .width('100%')
     .width('100%')
   }
   }

@@ -18,9 +18,9 @@ import { CardParser } from '../CardParser'
 import { PageRepository } from '../../repository/PageRepository'
 import { PageRepository } from '../../repository/PageRepository'
 import { RefreshLayoutBean } from '../page/RefreshLayoutBean'
 import { RefreshLayoutBean } from '../page/RefreshLayoutBean'
 import CustomRefreshLoadLayout from '../page/CustomRefreshLoadLayout'
 import CustomRefreshLoadLayout from '../page/CustomRefreshLoadLayout'
-import { ErrorComponent } from '../view/ErrorComponent';
-import NoMoreLayout from '../page/NoMoreLayout';
+import { ErrorComponent } from '../view/ErrorComponent'
 import { CustomPullToRefresh } from '../reusable/CustomPullToRefresh'
 import { CustomPullToRefresh } from '../reusable/CustomPullToRefresh'
+import { PeopleShipNoMoreData } from '../reusable/PeopleShipNoMoreData'
 
 
 const TAG = 'PeopleShipHomeArticleListComponent';
 const TAG = 'PeopleShipHomeArticleListComponent';
 
 
@@ -104,7 +104,7 @@ export struct PeopleShipHomeArticleListComponent {
         // 加载更多
         // 加载更多
         ListItem() {
         ListItem() {
           if (!this.hasMore && !this.isLoading) {
           if (!this.hasMore && !this.isLoading) {
-            NoMoreLayout()
+            PeopleShipNoMoreData()
           }
           }
         }
         }
     }
     }

@@ -56,7 +56,7 @@ export struct PeopleShipHomePageNavComponent {
 
 
             if (this.isAttention == '0') {
             if (this.isAttention == '0') {
               // 关注
               // 关注
-              Button('+关注', { type: ButtonType.Normal, stateEffect: true })
+              Button('+ 关注', { type: ButtonType.Normal, stateEffect: true })
                 .borderRadius(4)
                 .borderRadius(4)
                 .backgroundColor($r('app.color.color_ED2800'))
                 .backgroundColor($r('app.color.color_ED2800'))
                 .width('54vp')
                 .width('54vp')

+@Component
+export struct PeopleShipNoMoreData{
+
+  @State title: string = '已显示全部内容'
+  build(){
+    Row(){
+      Text("已显示全部内容")
+        .fontColor($r('app.color.color_999999'))
+        .fontWeight(400)
+        .fontSize('14vp')
+    }
+    .justifyContent(FlexAlign.Center)
+    .alignItems(VerticalAlign.Center)
+    .width('100%')
+    .margin({top:'24vp',bottom:'24vp'})
+  }
+}