Showing
4 changed files
with
9 additions
and
8 deletions
| @@ -167,7 +167,7 @@ export struct HomePageBottomCommentComponent { | @@ -167,7 +167,7 @@ export struct HomePageBottomCommentComponent { | ||
| 167 | if (item.parentCommentVo != null) { | 167 | if (item.parentCommentVo != null) { |
| 168 | parentCommentUserName = item.parentCommentVo.fromUserName | 168 | parentCommentUserName = item.parentCommentVo.fromUserName |
| 169 | } | 169 | } |
| 170 | - data.push(new CommentListItem(item.fromUserHeader, item.fromUserName, 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)) |
| @@ -177,7 +177,7 @@ export struct HomePageBottomCommentComponent { | @@ -177,7 +177,7 @@ export struct HomePageBottomCommentComponent { | ||
| 177 | data.forEach((item) => { | 177 | data.forEach((item) => { |
| 178 | let publishTime = | 178 | let publishTime = |
| 179 | DateTimeUtils.getCommentTime(DateTimeUtils.parseDate(item.createTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)) | 179 | DateTimeUtils.getCommentTime(DateTimeUtils.parseDate(item.createTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)) |
| 180 | - this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName, item.targetTitle, | 180 | + this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, |
| 181 | publishTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType, | 181 | publishTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType, |
| 182 | item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, | 182 | item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, |
| 183 | item.parentCommentContent, item.parentCommentUserName)) | 183 | item.parentCommentContent, item.parentCommentUserName)) |
| @@ -210,7 +210,7 @@ export struct HomePageBottomCommentComponent { | @@ -210,7 +210,7 @@ export struct HomePageBottomCommentComponent { | ||
| 210 | data.forEach((item) => { | 210 | data.forEach((item) => { |
| 211 | let publishTime = | 211 | let publishTime = |
| 212 | DateTimeUtils.getCommentTime(DateTimeUtils.parseDate(item.createTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)) | 212 | DateTimeUtils.getCommentTime(DateTimeUtils.parseDate(item.createTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)) |
| 213 | - this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName, item.targetTitle, | 213 | + this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName,item.fromUserType, item.targetTitle, |
| 214 | publishTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType, | 214 | publishTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType, |
| 215 | item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, | 215 | item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, |
| 216 | item.parentCommentContent, item.parentCommentUserName)) | 216 | item.parentCommentContent, item.parentCommentUserName)) |
| @@ -172,12 +172,12 @@ export struct OtherHomePageBottomCommentComponent { | @@ -172,12 +172,12 @@ export struct OtherHomePageBottomCommentComponent { | ||
| 172 | if (item.parentCommentVo != null) { | 172 | if (item.parentCommentVo != null) { |
| 173 | parentCommentUserName = item.parentCommentVo.fromUserName | 173 | parentCommentUserName = item.parentCommentVo.fromUserName |
| 174 | } | 174 | } |
| 175 | - data.push(new CommentListItem(item.fromUserHeader, item.fromUserName, 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)) | 175 | + 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 | }) | 176 | }) |
| 177 | 177 | ||
| 178 | if(status.commentIdList.length === 0){ | 178 | if(status.commentIdList.length === 0){ |
| 179 | data.forEach((item) => { | 179 | data.forEach((item) => { |
| 180 | - this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName, 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)) | 180 | + 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 | }) | 181 | }) |
| 182 | 182 | ||
| 183 | this.data_comment.notifyDataReload() | 183 | this.data_comment.notifyDataReload() |
| @@ -206,7 +206,7 @@ export struct OtherHomePageBottomCommentComponent { | @@ -206,7 +206,7 @@ export struct OtherHomePageBottomCommentComponent { | ||
| 206 | }) | 206 | }) |
| 207 | 207 | ||
| 208 | data.forEach((item) => { | 208 | data.forEach((item) => { |
| 209 | - this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName, 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)) | 209 | + 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)) |
| 210 | }) | 210 | }) |
| 211 | 211 | ||
| 212 | this.data_comment.notifyDataReload() | 212 | this.data_comment.notifyDataReload() |
| @@ -159,7 +159,7 @@ struct VisitorCommentPage { | @@ -159,7 +159,7 @@ struct VisitorCommentPage { | ||
| 159 | let publishTime = | 159 | let publishTime = |
| 160 | DateTimeUtils.getCommentTime(DateTimeUtils.parseDate(item.createTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)) | 160 | DateTimeUtils.getCommentTime(DateTimeUtils.parseDate(item.createTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)) |
| 161 | 161 | ||
| 162 | - this.data.push(new CommentListItem(item.fromUserHeader, item.fromUserName, 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)) |
| @@ -44,9 +44,10 @@ export class CommentListItem{ | @@ -44,9 +44,10 @@ export class CommentListItem{ | ||
| 44 | isShowAll:boolean = false | 44 | isShowAll:boolean = false |
| 45 | 45 | ||
| 46 | 46 | ||
| 47 | - constructor(fromUserHeader:string,fromUserName:string,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) { |
| 48 | this.fromUserHeader = fromUserHeader | 48 | this.fromUserHeader = fromUserHeader |
| 49 | this.fromUserName = fromUserName | 49 | this.fromUserName = fromUserName |
| 50 | + this.fromUserType = fromUserType | ||
| 50 | this.commentContent = commentContent | 51 | this.commentContent = commentContent |
| 51 | this.targetTitle = targetTitle | 52 | this.targetTitle = targetTitle |
| 52 | this.createTime = createTime | 53 | this.createTime = createTime |
-
Please register or login to post a comment