diff --git a/src/apis/comment/comment-interfaces.ts b/src/apis/comment/comment-interfaces.ts index ae1cf901..14527a8f 100644 --- a/src/apis/comment/comment-interfaces.ts +++ b/src/apis/comment/comment-interfaces.ts @@ -18,6 +18,7 @@ export interface NewCommentReq { text: string; id: string; firstLevelId?: string; + replyToUserId?: string; type: CommentType; } diff --git a/src/pages/moment/CommentBox.vue b/src/pages/moment/CommentBox.vue index d4562767..5a334888 100644 --- a/src/pages/moment/CommentBox.vue +++ b/src/pages/moment/CommentBox.vue @@ -6,10 +6,7 @@ @click="showDeleteDialogue" /> - + - + {{ comment.user.nickname }} - · {{ displayTime(comment.createAt) }} + · {{ displayDetailTime(comment.createAt) }} @@ -81,7 +75,7 @@ @@ -125,7 +150,7 @@ function closeSelf() { .frame { overflow: scroll; position: fixed; - bottom: 0; + bottom: 16vw; left: 0; width: 100vw; max-height: 75vh; @@ -134,10 +159,18 @@ function closeSelf() { border-radius: 5vw 5vw 0 0; } +.container { + padding: calc(10 / 390 * 100vw) 0; +} + .main { - padding: calc(20 / 390 * 100vw); + padding: calc(10 / 390 * 100vw) calc(20 / 390 * 100vw); box-sizing: border-box; + &-comment { + border-bottom: 5px #eee solid; + } + .comment, .reply { display: flex; @@ -168,6 +201,13 @@ function closeSelf() { .username { margin-right: calc(10 / 390 * 100vw); + display: flex; + align-items: center; + .right-triangle-grey { + width: 15rpx; + height: 15rpx; + margin: 0 5px; + } } } @@ -189,13 +229,13 @@ function closeSelf() { align-items: center; .thumb { - background-image: url("../../static/images/like_grey_0.png"); + background-image: url("/static/images/like_grey_0.png"); width: calc(12 / 390 * 100vw); height: calc(12 / 390 * 100vw); background-size: 100% 100%; &.liked { - background-image: url("../../static/images/like_grey_1.png"); + background-image: url("/static/images/like_grey_1.png"); } } @@ -228,30 +268,24 @@ function closeSelf() { } } } - - .more-sub-replies { - color: #696969; - margin-left: calc(33 / 390 * 100vw); - display: flex; - align-items: center; - - .down-arrow { - background-image: url("../../static/images/down-black.png"); - width: calc(8 / 390 * 100vw); - height: calc(5 / 390 * 100vw); - background-size: 100% 100%; - margin-left: calc(8 / 390 * 100vw); - } - } } } - - .comment { - margin-bottom: calc(20 / 390 * 100vw); - } - - .reply { - margin: calc(20 / 390 * 100vw) 0; +} +.more-sub-replies { + position: relative; + color: #696969; + margin-left: 0; + display: flex; + left: 50rpx; + align-items: center; + font-size: calc(12 / 390 * 100vw); + + .down-arrow { + background-image: url("/static/images/down-black.png"); + width: calc(8 / 390 * 100vw); + height: calc(5 / 390 * 100vw); + background-size: 100% 100%; + margin-left: calc(8 / 390 * 100vw); } } diff --git a/src/pages/moment/WriteCommentBox.vue b/src/pages/moment/WriteCommentBox.vue index 931ace18..43f89347 100644 --- a/src/pages/moment/WriteCommentBox.vue +++ b/src/pages/moment/WriteCommentBox.vue @@ -3,9 +3,10 @@