diff --git a/src/assets/img/detail/icon_quote_e.gif b/src/assets/img/detail/icon_quote_e.gif
new file mode 100644
index 0000000..572c35c
Binary files /dev/null and b/src/assets/img/detail/icon_quote_e.gif differ
diff --git a/src/assets/img/detail/icon_quote_s.gif b/src/assets/img/detail/icon_quote_s.gif
new file mode 100644
index 0000000..59087d0
Binary files /dev/null and b/src/assets/img/detail/icon_quote_s.gif differ
diff --git a/src/assets/img/detail/quotation-left.png b/src/assets/img/detail/quotation-left.png
new file mode 100644
index 0000000..b027c97
Binary files /dev/null and b/src/assets/img/detail/quotation-left.png differ
diff --git a/src/assets/img/detail/quotation-right.png b/src/assets/img/detail/quotation-right.png
new file mode 100644
index 0000000..4337352
Binary files /dev/null and b/src/assets/img/detail/quotation-right.png differ
diff --git a/src/components/DetailReply.vue b/src/components/DetailReply.vue
index a49b199..daef92b 100755
--- a/src/components/DetailReply.vue
+++ b/src/components/DetailReply.vue
@@ -13,7 +13,7 @@
@@ -33,16 +33,15 @@
-
+
{{ 500 - commentContent.length }}

@@ -337,6 +335,7 @@ export default {
// avatar: "https://oss.gter.net/avatar/97KwEWANd_4DHWiY6VbnSUFSCKroYWFjYQ~~/middle",
// content: "评论回复",
// },
+ editCommentPid: null,
popState: "", // discussionSingle discussionMulti
coinConfig: {
strategy: {
@@ -493,18 +492,13 @@ export default {
return match.replace(/width="[^"]*"/g, '').replace(/height="[^"]*"/g, '');
})
- info["messageList"] = []
-
info['message'] = info['message'].replaceAll("[hide]作者设置了回复可见[/hide]", `

作者设置了回复可见
`)
// if (info.message.indexOf("[hide]作者设置了回复可见[/hide]")) {
// `

作者设置了回复可见
`
// }
- // console.log(info['message']);
-
// info['message'] = this.$sanitize(info['message'])
- // console.log(info['message']);
data.type == 0 ? this.$refs['vHtmlMessage'] ? this.$refs.vHtmlMessage.innerHTML = info['message'] : "" : ""
@@ -531,7 +525,8 @@ export default {
else if (this.type == 3) this.getTenementDetails()
else if (this.type == 2) this.getInterviewDetails()
- info['ispost'] != 0 ? this.getPostList() : ''
+ // info['ispost'] != 0 ? this.getPostList() : ''
+ this.getPostList()
}).finally(() => {
this.$closeUnderLoading(this)
@@ -629,6 +624,7 @@ export default {
// tid: 2322145,
// uniqid: "--G1tS2SCTOQyoOMiedlLKxTnFvHWjBwQezsJjvVJFwgqOtOFeYr4_LAAG5RV37ETvMl2Zd4tSCc-_dqeKpERxXsx-tPfXrUs0kUysTGLzgxYzU~",
// token: "5e3c42209eebfbab66e6f0d6c70a53c7",
+ tid: this.tid,
token: this.token
}, "tenement").then(res => {
// console.log(res);
@@ -654,25 +650,52 @@ export default {
this.postList.count = data.count
})
+ },
+ // 打开编辑评论
+ openEditPop(item) {
+ console.log(item);
+ let message = item.message
+ message = message.replace(/
]*>[\s\S]*?<\/div>/gi, '');
+ message = message.trim()
+ this.commentContent = message
+ this.editCommentPid = item.pid
+
+ this.popState = "discussionMulti"
},
// 处理回复点击弹出弹窗
handleReplyPop(item) {
+ this.twoCommentData = {
+ avatar: item.avatar,
+ content: item.message,
+ pid: item.pid
+ }
this.popState = "discussionSingle"
},
// 集中处理回复帖子
postComment(message) {
- this.$http.post("/api/operation/reply", {
+ let url = ""
+
+ if (this.editCommentPid) url = "/api/operation/redactPost" // 回复评论或者评论
+ else url = "/api/operation/reply" // 编辑评论
+
+ this.$http.post(url, {
token: this.token,
- message: this.commentContent
+ message: this.commentContent,
+ pid: this.editCommentPid || (this.twoCommentData && this.twoCommentData.pid)
}).then(res => {
if (res.code != 200) return
- // let data = res.data
- // console.log(data);
this.popState = ""
+ this.twoCommentData = null
+ if (this.editCommentPid) this.$router.go(0)
+
+ this.editCommentPid = null
+
+
+
let { count, limit } = this.postList
let page = Math.ceil((count + 1) / limit)
@@ -714,7 +737,6 @@ export default {
else if (key == "uncollect") url = "/api/operation/threadunFav"
this.$http.post(url, { tid: this.tid }).then(res => {
- console.log(res);
if (res.code != 200) return
if (key == "like") this.info.islike = 1
if (key == "collect") this.info.isfav = 1
@@ -903,7 +925,6 @@ export default {
.edit-icom {
width: .4rem;
- // height: .4rem;
}
}
}
@@ -921,44 +942,54 @@ export default {
width: 100% !important;
height: auto !important;
}
- }
- .quotation {
- width: 100%;
- color: #333;
- font-size: .32rem;
- border-radius: .16rem;
- background: rgb(246, 246, 246);
- padding: .36rem .24rem;
- box-sizing: border-box;
- margin-bottom: .48rem;
+ .quote {
+ width: 100%;
+ color: #333;
+ font-size: .32rem;
+ border-radius: .16rem;
+ background: rgb(246, 246, 246) url(@/assets/img/detail/quotation-left.png) no-repeat .4rem .2666rem;
- .quotation-wenzi {
- line-height: .52rem;
- }
+ padding: .1333rem .1333rem .1333rem 1rem;
- .quotation-icon {
- width: .32rem;
- height: .26rem;
- }
+ // padding: .36rem .24rem;
+ box-sizing: border-box;
+ margin-bottom: .48rem;
- .quotation-right {
- flex-direction: column;
- margin-left: .28rem;
+ blockquote {
+ margin: 0;
+ padding: 0 .8667rem .0667rem 0;
+ background: url(@/assets/img/detail/quotation-right.png) no-repeat 100% 100%;
+ line-height: 1.6;
+ zoom: 1;
+ display: inline;
+ }
- .quotation-bottom {
- color: #7F7F7F;
- font-size: .28rem;
- margin-top: .258rem;
+ .quotation-wenzi {
+ line-height: .52rem;
+ }
- .quotation-icon {
- margin-left: .2rem;
+ .quotation-icon {
+ width: .32rem;
+ height: .26rem;
+ }
+
+ .quotation-right {
+ flex-direction: column;
+ margin-left: .28rem;
+
+ .quotation-bottom {
+ color: #7F7F7F;
+ font-size: .28rem;
+ margin-top: .258rem;
+
+ .quotation-icon {
+ margin-left: .2rem;
+ }
}
}
}
- }
- /deep/ {
.content-unlock {
&.content-unlock-no {
height: 3.2rem;
@@ -1000,6 +1031,8 @@ export default {
}
}
+
+
}
diff --git a/src/views/index/allSections/AllSections.vue b/src/views/index/allSections/AllSections.vue
index 58bea61..83f2cb5 100755
--- a/src/views/index/allSections/AllSections.vue
+++ b/src/views/index/allSections/AllSections.vue
@@ -100,7 +100,6 @@ export default {
methods: {
// 处理 query 的参数
handQuery() {
- console.log(this.list);
if (this.list.length >= 2) {
let list = this.list
list.forEach((el, index) => {
@@ -119,10 +118,6 @@ export default {
})
- console.log(this.allActive, "allActive");
-
-
-
} else {
setTimeout(() => {
this.handQuery()
@@ -196,8 +191,8 @@ export default {
this.$router.push({ path: `/allSections`, query: { fid: this.fid, invitationPage: this.invitationPage } })
},
+ // 点击回归板块列表
flybackAll() {
- console.log("jkldfgjklfggfdjklgfjkl");
this.isPlateListState = true
},