diff --git a/public/index.html b/public/index.html index f012ac9..04fdd63 100755 --- a/public/index.html +++ b/public/index.html @@ -1,18 +1,37 @@ - - - - - - - 寄托论坛 - - - -
- - - + + + + + + + + 寄托论坛 + + + + +
+
+ + +
+ + + + + + \ No newline at end of file diff --git a/src/assets/emojiList.json b/src/assets/emojiList.json new file mode 100644 index 0000000..ae4ab99 --- /dev/null +++ b/src/assets/emojiList.json @@ -0,0 +1,9 @@ +{ + "{:1_1:}": "https://bbs.gter.net/static/image/smiley/default/smile.gif", + ":(": "https://bbs.gter.net/static/image/smiley/default/frown.gif", + ":@": "https://bbs.gter.net/static/image/smiley/default/default.gif", + ":O": "https://bbs.gter.net/static/image/smiley/default/shocked.gif", + ":p": "https://bbs.gter.net/static/image/smiley/default/frown.gif", + ":(": "https://bbs.gter.net/static/image/smiley/default/frown.gif", + ":(": "https://bbs.gter.net/static/image/smiley/default/frown.gif" +} \ No newline at end of file diff --git a/src/views/detail/detailIndex.vue b/src/views/detail/detailIndex.vue index 8b0a44b..3e23ff9 100755 --- a/src/views/detail/detailIndex.vue +++ b/src/views/detail/detailIndex.vue @@ -226,7 +226,7 @@ import DetailReply from '@/components/DetailReply' import Coins from '@/components/unlock/Coins' import { coinNo } from '@/utils/bizarreUrl' - +import emojiList from '@/assets/emojiList.json' export default { name: 'detailIndex', data() { @@ -369,6 +369,8 @@ export default { message: "" }, + isloginBtnState: false, + }; @@ -390,11 +392,15 @@ export default { } }, immediate: true - } + }, + isloginBtnState(newV, oldV) { + if (newV) this.$goTologin() + }, }, mounted() { window.scrollTo(0, 0); + }, methods: { @@ -418,7 +424,8 @@ export default { }) // 回复和投币可见解锁前的html - let replyVisibleHtml = `
作者设置了${this.islogin ? '回复' : '登录'}可见
` + // let replyVisibleHtml = `
作者设置了${this.islogin ? '回复' : '登录'}可见
` + let replyVisibleHtml = `
作者设置了${this.islogin ? '回复' : '登录'}可见
` let coinVisibleHtml = `
作者设置了投币可见
` // 回复和投币可见解锁后的html @@ -530,6 +537,18 @@ export default { this.popState = data.mybalance > price ? "coindisplayuser" : "coinNo" }) } + let registerVisibleList = document.getElementsByClassName("registerVisible") + if (!Array.isArray(registerVisibleList)) { + for (let i = 0; i < registerVisibleList.length; i++) { + registerVisibleList[i].addEventListener('click', () => { + this.$emit("registerVisibleClick") + }) + } + this.$on('registerVisibleClick', () => { + console.log("fkfkfkf"); + this.isloginBtnState = true + }) + } this.info = info this.type = data.type @@ -665,6 +684,13 @@ export default { }).then(res => { if (res.code != 200) return let data = res.data + + data.data.forEach(el => { + for (const key in emojiList) { + el.message = el.message.replaceAll(key, ``) + } + }) + this.postList.list = data.data this.postList.page = data.page this.postList.limit = data.limit @@ -718,29 +744,42 @@ export default { pid: this.editCommentPid || (this.twoCommentData && this.twoCommentData.pid) }).then(res => { if (res.code != 200) return + + this.$Message.success("发布成功") + this.popState = "" this.twoCommentData = null - if (this.editCommentPid) this.$router.go(0) + if (this.editCommentPid) { // 编辑 状态 + setTimeout(() => { + this.$router.go(0) + }, 800); + return + } this.editCommentPid = null - - let { count, limit } = this.postList let page = Math.ceil((count + 1) / limit) - if (page == this.postList.page) { - this.$router.go(0) - return - } + setTimeout(() => { + + if (page == this.postList.page) { + this.$router.go(0) + clearTimeout(timer) + return + } + + let query = { + page, + tid: this.tid + } + + this.$router.push({ path: `/detailIndex`, query }) + + }, 800); - let query = { - page, - tid: this.tid - } - this.$router.push({ path: `/detailIndex`, query }) }) }, @@ -832,7 +871,6 @@ export default { components: { DetailReply, Coins - } }; @@ -907,7 +945,7 @@ export default { color: #000; font-size: .56rem; font-weight: 650; - line-height: .56rem; + line-height: .86rem; .detail-title-item { font-size: .32rem; @@ -932,8 +970,8 @@ export default { padding: 0 .16rem; display: inline-flex; border-radius: .16rem; - // vertical-align: middle; - vertical-align: top; + vertical-align: middle; + // vertical-align: top; } } @@ -1019,6 +1057,10 @@ export default { img { width: 100% !important; height: auto !important; + + &.gif { + width: auto !important; + } } .quote { @@ -1027,10 +1069,8 @@ export default { font-size: .32rem; border-radius: .16rem; background: rgb(246, 246, 246) url(@/assets/img/detail/quotation-left.png) no-repeat .32rem .2666rem; - padding: .1333rem .1333rem .1333rem 1rem; - // padding: .36rem .24rem; box-sizing: border-box; margin-bottom: .48rem; @@ -1444,5 +1484,14 @@ export default { } + .loginBtn { + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; + // background: #50e3c2; + } + } \ No newline at end of file diff --git a/src/views/index/collect/Collect.vue b/src/views/index/collect/Collect.vue index 283db02..b7b80c3 100755 --- a/src/views/index/collect/Collect.vue +++ b/src/views/index/collect/Collect.vue @@ -303,7 +303,8 @@ export default { } .setting-container { - position: absolute; + // position: absolute; + position: fixed; bottom: 0; left: 0; background-color: #fff; diff --git a/src/views/user/UserIndex.vue b/src/views/user/UserIndex.vue index 00f942f..0719505 100755 --- a/src/views/user/UserIndex.vue +++ b/src/views/user/UserIndex.vue @@ -177,10 +177,11 @@ export default { this.$store.commit('setFavoriteList', []) this.$store.commit('setHomeRequestState', false) - this.$clearCookies(); - - this.$router.push("/") + this.$http.post("/api/user/Logout").then(res => { + this.$clearCookies(); + this.$router.push("/") + })