Merge remote-tracking branch 'origin/main'

@@ -6,6 +6,7 @@ import { CommentCustomDialog } from './CommentCustomDialog';
 import { publishCommentModel } from '../model/PublishCommentModel';
 import { publishCommentModel } from '../model/PublishCommentModel';
 import { HttpUtils } from 'wdNetwork/Index';
 import { HttpUtils } from 'wdNetwork/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
+import NoMoreLayout from '../../page/NoMoreLayout';
 import { EmptyComponent } from '../../view/EmptyComponent';
 import { EmptyComponent } from '../../view/EmptyComponent';
 
 
 const TAG = 'CommentComponent';
 const TAG = 'CommentComponent';
@@ -18,7 +19,7 @@ const testString = '因为读书的人\n是低着头向上看的人\n身处一
 export struct CommentComponent {
 export struct CommentComponent {
   @State hasMore: boolean = true;
   @State hasMore: boolean = true;
   @State currentPage: number = 1;
   @State currentPage: number = 1;
-  // @State private browSingModel: commentListModel = new commentListModel()
+  @State isComments: boolean = true
   /*必传*/
   /*必传*/
   @ObjectLink publishCommentModel: publishCommentModel
   @ObjectLink publishCommentModel: publishCommentModel
   listScroller: ListScroller = new ListScroller(); // scroller控制器
   listScroller: ListScroller = new ListScroller(); // scroller控制器
@@ -27,6 +28,8 @@ export struct CommentComponent {
   @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
   @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
   @State dialogController: CustomDialogController | null = null;
   @State dialogController: CustomDialogController | null = null;
 
 
+  // @State private browSingModel: commentListModel = new commentListModel()
+
   // 在自定义组件即将析构销毁时将dialogControlle置空
   // 在自定义组件即将析构销毁时将dialogControlle置空
   aboutToDisappear() {
   aboutToDisappear() {
     this.dialogController = null // 将dialogController置空
     this.dialogController = null // 将dialogController置空
@@ -137,9 +140,16 @@ export struct CommentComponent {
       List({ scroller: this.listScroller }) {
       List({ scroller: this.listScroller }) {
         ListItemGroup({ header: this.titleHeader() })
         ListItemGroup({ header: this.titleHeader() })
 
 
+        if (!this.isComments) {
+          EmptyComponent({ emptyType: 17 })
+            .height(300)
+        } else {
           LazyForEach(this.allDatas, (item: commentItemModel, index: number) => {
           LazyForEach(this.allDatas, (item: commentItemModel, index: number) => {
             if (item.hasMore) {
             if (item.hasMore) {
-            ListItemGroup({ header: this.CommentHeaderItem(item, index), footer: this.GroupFooterView(item, index) }) {
+              ListItemGroup({
+                header: this.CommentHeaderItem(item, index),
+                footer: this.GroupFooterView(item, index)
+              }) {
                 LazyForEach(item.childCommentsLazyDataSource, (childItem: commentItemModel, subIndex: number) => {
                 LazyForEach(item.childCommentsLazyDataSource, (childItem: commentItemModel, subIndex: number) => {
                   ListItem() {
                   ListItem() {
                     ChildCommentItem({
                     ChildCommentItem({
@@ -174,18 +184,16 @@ export struct CommentComponent {
           // 加载更多
           // 加载更多
           ListItem() {
           ListItem() {
             if (this.hasMore === false) {
             if (this.hasMore === false) {
-            // NoMoreLayout()
-            EmptyComponent({ emptyType: 17 })
-              .height(300)
+              NoMoreLayout()
+            }
           }
           }
-
         }
         }
+
       }
       }
       .onReachEnd(() => {
       .onReachEnd(() => {
         if (this.hasMore) {
         if (this.hasMore) {
           this.getData()
           this.getData()
         }
         }
-
       })
       })
       .enableScrollInteraction(false)
       .enableScrollInteraction(false)
     }
     }
@@ -204,6 +212,10 @@ export struct CommentComponent {
           this.publishCommentModel.totalCommentNumer = commentListModel.totalCommentNum + ''
           this.publishCommentModel.totalCommentNumer = commentListModel.totalCommentNum + ''
         }
         }
 
 
+        if (commentListModel.list.length === 0) {
+          this.isComments = false
+        }
+
         if (commentListModel.hasNext === 0) {
         if (commentListModel.hasNext === 0) {
           this.hasMore = false;
           this.hasMore = false;
         } else {
         } else {
@@ -226,7 +238,6 @@ export struct CommentComponent {
           this.hasMore = false
           this.hasMore = false
         }
         }
       })
       })
-
   }
   }
 }
 }