developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
wangliang_wd
ae9a8244 2 parents 6cc94fb9 94b52b76

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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix |> 删除测试数据
  fix |> 修复我的评论列表点击专题未跳转专题页的问题
Inline Side-by-side
Showing 5 changed files with 11 additions and 9 deletions
@@ -305,6 +305,7 @@ function getParams(item: CommentListItem) : ContentDTO{ @@ -305,6 +305,7 @@ function getParams(item: CommentListItem) : ContentDTO{
305 contentDTO.relId = item.targetRelId; 305 contentDTO.relId = item.targetRelId;
306 contentDTO.objectType = item.targetType + ""; 306 contentDTO.objectType = item.targetType + "";
307 contentDTO.newsTitle = item.targetTitle 307 contentDTO.newsTitle = item.targetTitle
  308 + contentDTO.linkUrl = item.h5Url
308 contentDTO.showComment = true 309 contentDTO.showComment = true
309 contentDTO.customParamTargetLayout = "comment" 310 contentDTO.customParamTargetLayout = "comment"
310 311
@@ -170,7 +170,7 @@ export struct HomePageBottomCommentComponent { @@ -170,7 +170,7 @@ export struct HomePageBottomCommentComponent {
170 data.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, item.createTime, 170 data.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, item.createTime,
171 commentContent, item.likeNum, 0, item.id, item.targetId, item.targetType, item.targetRelId, 171 commentContent, item.likeNum, 0, item.id, item.targetId, item.targetType, item.targetRelId,
172 item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, parentCommentContent, 172 item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, parentCommentContent,
173 - parentCommentUserName)) 173 + parentCommentUserName,item.h5Url))
174 }) 174 })
175 175
176 this.bottomCompH = DisplayUtils.getDeviceHeight() - data.length*160 - 140 176 this.bottomCompH = DisplayUtils.getDeviceHeight() - data.length*160 - 140
@@ -182,7 +182,7 @@ export struct HomePageBottomCommentComponent { @@ -182,7 +182,7 @@ export struct HomePageBottomCommentComponent {
182 this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, 182 this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle,
183 item.createTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType, 183 item.createTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType,
184 item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, 184 item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus,
185 - item.parentCommentContent, item.parentCommentUserName)) 185 + item.parentCommentContent, item.parentCommentUserName,item.h5Url))
186 }) 186 })
187 187
188 this.data_comment.notifyDataReload() 188 this.data_comment.notifyDataReload()
@@ -216,7 +216,7 @@ export struct HomePageBottomCommentComponent { @@ -216,7 +216,7 @@ export struct HomePageBottomCommentComponent {
216 this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, 216 this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle,
217 item.createTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType, 217 item.createTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType,
218 item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, 218 item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus,
219 - item.parentCommentContent, item.parentCommentUserName)) 219 + item.parentCommentContent, item.parentCommentUserName,item.h5Url))
220 }) 220 })
221 221
222 this.data_comment.notifyDataReload() 222 this.data_comment.notifyDataReload()
@@ -173,12 +173,12 @@ export struct OtherHomePageBottomCommentComponent { @@ -173,12 +173,12 @@ export struct OtherHomePageBottomCommentComponent {
173 if (item.parentCommentVo != null) { 173 if (item.parentCommentVo != null) {
174 parentCommentUserName = item.parentCommentVo.fromUserName 174 parentCommentUserName = item.parentCommentVo.fromUserName
175 } 175 }
176 - 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)) 176 + 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))
177 }) 177 })
178 178
179 if(status.commentIdList.length === 0){ 179 if(status.commentIdList.length === 0){
180 data.forEach((item) => { 180 data.forEach((item) => {
181 - 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)) 181 + 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))
182 }) 182 })
183 183
184 this.data_comment.notifyDataReload() 184 this.data_comment.notifyDataReload()
@@ -208,7 +208,7 @@ export struct OtherHomePageBottomCommentComponent { @@ -208,7 +208,7 @@ export struct OtherHomePageBottomCommentComponent {
208 }) 208 })
209 209
210 data.forEach((item) => { 210 data.forEach((item) => {
211 - 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)) 211 + 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))
212 }) 212 })
213 213
214 this.data_comment.notifyDataReload() 214 this.data_comment.notifyDataReload()
@@ -230,7 +230,7 @@ export struct OtherHomePageBottomCommentComponent { @@ -230,7 +230,7 @@ export struct OtherHomePageBottomCommentComponent {
230 }) 230 })
231 }else { 231 }else {
232 data.forEach((item) => { 232 data.forEach((item) => {
233 - 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)) 233 + 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))
234 }) 234 })
235 235
236 this.data_comment.notifyDataReload() 236 this.data_comment.notifyDataReload()
@@ -162,7 +162,7 @@ struct VisitorCommentPage { @@ -162,7 +162,7 @@ struct VisitorCommentPage {
162 this.data.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, publishTime, 162 this.data.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, publishTime,
163 commentContent, item.likeNum, 0, item.id, item.targetId, item.targetType, item.targetRelId, 163 commentContent, item.likeNum, 0, item.id, item.targetId, item.targetType, item.targetRelId,
164 item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, parentCommentContent, 164 item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, parentCommentContent,
165 - parentCommentUserName)) 165 + parentCommentUserName,item.h5Url))
166 166
167 }) 167 })
168 this.data.notifyDataReload() 168 this.data.notifyDataReload()
@@ -44,7 +44,7 @@ export class CommentListItem{ @@ -44,7 +44,7 @@ export class CommentListItem{
44 isShowAll:boolean = false 44 isShowAll:boolean = false
45 45
46 46
47 - 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) { 47 + 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) {
48 this.fromUserHeader = fromUserHeader 48 this.fromUserHeader = fromUserHeader
49 this.fromUserName = fromUserName 49 this.fromUserName = fromUserName
50 this.fromUserType = fromUserType 50 this.fromUserType = fromUserType
@@ -63,6 +63,7 @@ export class CommentListItem{ @@ -63,6 +63,7 @@ export class CommentListItem{
63 this.checkStatus = checkStatus 63 this.checkStatus = checkStatus
64 this.parentCommentContent = parentCommentContent 64 this.parentCommentContent = parentCommentContent
65 this.parentCommentUserName = parentCommentUserName 65 this.parentCommentUserName = parentCommentUserName
  66 + this.h5Url = h5Url
66 } 67 }
67 } 68 }
68 69