Merge remote-tracking branch 'origin/main'

@@ -146,6 +146,7 @@ export struct ENewspaperPageComponent {
 
 
     let ratio = this.ratio == '100%' ? 1 : 0.5
     let ratio = this.ratio == '100%' ? 1 : 0.5
     this.picWidth = this.picWidth * ratio
     this.picWidth = this.picWidth * ratio
+    this.picHeight = (this.picWidth * 506)/355
     // 默认日期
     // 默认日期
     const date = new Date()
     const date = new Date()
     const month = date.getMonth() + 1
     const month = date.getMonth() + 1

-import { LazyDataSource, SPHelper, UserDataLocal } from 'wdKit';
+import { DisplayUtils, LazyDataSource, SPHelper, UserDataLocal } from 'wdKit';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem';
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem';
@@ -23,6 +23,8 @@ export struct HomePageBottomFollowComponent {
   @State count: number = 0;
   @State count: number = 0;
   preferences: dataPreferences.Preferences | null = null;
   preferences: dataPreferences.Preferences | null = null;
   @State isGetRequest: boolean = false
   @State isGetRequest: boolean = false
+
+  @State bottomCompH:number = 200
   observer = (key: string) => {
   observer = (key: string) => {
     if (key == UserDataLocal.USER_FOLLOW_OPERATION) {
     if (key == UserDataLocal.USER_FOLLOW_OPERATION) {
       let value = SPHelper.default.getSync(UserDataLocal.USER_FOLLOW_OPERATION, "") as string
       let value = SPHelper.default.getSync(UserDataLocal.USER_FOLLOW_OPERATION, "") as string
@@ -174,7 +176,8 @@ export struct HomePageBottomFollowComponent {
       //没有更多数据  显示提示
       //没有更多数据  显示提示
       if (!this.hasMore) {
       if (!this.hasMore) {
         ListItem() {
         ListItem() {
-          ListHasNoMoreDataUI()
+          ///ToDo 数据过少时，达不到滑动条件 后续优化
+          ListHasNoMoreDataUI().height(this.bottomCompH > 150?this.bottomCompH:150)
         }
         }
       }
       }
     }
     }
@@ -230,6 +233,8 @@ export struct HomePageBottomFollowComponent {
             this.hasMore = false
             this.hasMore = false
           }
           }
         }
         }
+        this.bottomCompH = DisplayUtils.getDeviceHeight() - this.data_follow.totalCount()*100
+        console.log(TAG, `${this.bottomCompH}`);
         this.isLoading = false
         this.isLoading = false
         this.isGetRequest = true
         this.isGetRequest = true
       }).catch((err: Error) => {
       }).catch((err: Error) => {