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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix |> 删除测试数据
  fix |> 修复我的评论列表点击专题未跳转专题页的问题

@@ -305,6 +305,7 @@ function getParams(item: CommentListItem) : ContentDTO{
   contentDTO.relId = item.targetRelId;
   contentDTO.objectType = item.targetType + "";
   contentDTO.newsTitle = item.targetTitle
+  contentDTO.linkUrl = item.h5Url
   contentDTO.showComment = true
   contentDTO.customParamTargetLayout = "comment"
 

@@ -170,7 +170,7 @@ export struct HomePageBottomCommentComponent {
       data.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, item.createTime,
         commentContent, item.likeNum, 0, item.id, item.targetId, item.targetType, item.targetRelId,
         item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, parentCommentContent,
-        parentCommentUserName))
+        parentCommentUserName,item.h5Url))
     })
 
     this.bottomCompH = DisplayUtils.getDeviceHeight() - data.length*160 - 140
@@ -182,7 +182,7 @@ export struct HomePageBottomCommentComponent {
         this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle,
           item.createTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType,
           item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus,
-          item.parentCommentContent, item.parentCommentUserName))
+          item.parentCommentContent, item.parentCommentUserName,item.h5Url))
       })
 
       this.data_comment.notifyDataReload()
@@ -216,7 +216,7 @@ export struct HomePageBottomCommentComponent {
         this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle,
           item.createTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType,
           item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus,
-          item.parentCommentContent, item.parentCommentUserName))
+          item.parentCommentContent, item.parentCommentUserName,item.h5Url))
       })
 
       this.data_comment.notifyDataReload()

@@ -173,12 +173,12 @@ export struct OtherHomePageBottomCommentComponent {
       if (item.parentCommentVo != null) {
         parentCommentUserName = item.parentCommentVo.fromUserName
       }
-      data.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, item.createTime, commentContent, item.likeNum, 0, item.id, item.targetId, item.targetType, item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, parentCommentContent, parentCommentUserName))
+      data.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, item.createTime, commentContent, item.likeNum, 0, item.id, item.targetId, item.targetType, item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, parentCommentContent, parentCommentUserName,item.h5Url))
     })
 
     if(status.commentIdList.length === 0){
       data.forEach((item) => {
-        this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, item.createTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType, item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, item.parentCommentContent, item.parentCommentUserName))
+        this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, item.createTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType, item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, item.parentCommentContent, item.parentCommentUserName,item.h5Url))
       })
 
       this.data_comment.notifyDataReload()
@@ -208,7 +208,7 @@ export struct OtherHomePageBottomCommentComponent {
         })
 
         data.forEach((item) => {
-          this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, item.createTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType, item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, item.parentCommentContent, item.parentCommentUserName))
+          this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, item.createTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType, item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, item.parentCommentContent, item.parentCommentUserName,item.h5Url))
         })
 
         this.data_comment.notifyDataReload()
@@ -230,7 +230,7 @@ export struct OtherHomePageBottomCommentComponent {
       })
     }else {
       data.forEach((item) => {
-        this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, item.createTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType, item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, item.parentCommentContent, item.parentCommentUserName))
+        this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, item.createTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType, item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, item.parentCommentContent, item.parentCommentUserName,item.h5Url))
       })
 
       this.data_comment.notifyDataReload()

@@ -162,7 +162,7 @@ struct VisitorCommentPage {
             this.data.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, publishTime,
               commentContent, item.likeNum, 0, item.id, item.targetId, item.targetType, item.targetRelId,
               item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, parentCommentContent,
-              parentCommentUserName))
+              parentCommentUserName,item.h5Url))
 
           })
           this.data.notifyDataReload()

@@ -44,7 +44,7 @@ export class CommentListItem{
   isShowAll:boolean = false
 
 
-  constructor(fromUserHeader:string,fromUserName:string,fromUserType: number,targetTitle:string,createTime:string,commentContent:string,likeNum:number,like_status:number,id:number,targetId:string,targetType:number,targetRelId: string,targetRelObjectId: string,targetRelType: number,targetStatus: number,checkStatus:number,parentCommentContent:string,parentCommentUserName:string) {
+  constructor(fromUserHeader:string,fromUserName:string,fromUserType: number,targetTitle:string,createTime:string,commentContent:string,likeNum:number,like_status:number,id:number,targetId:string,targetType:number,targetRelId: string,targetRelObjectId: string,targetRelType: number,targetStatus: number,checkStatus:number,parentCommentContent:string,parentCommentUserName:string,h5Url:string) {
     this.fromUserHeader = fromUserHeader
     this.fromUserName = fromUserName
     this.fromUserType = fromUserType
@@ -63,6 +63,7 @@ export class CommentListItem{
     this.checkStatus = checkStatus
     this.parentCommentContent = parentCommentContent
     this.parentCommentUserName = parentCommentUserName
+    this.h5Url = h5Url
   }
 }