diff --git a/src/pages/message/Message.vue b/src/pages/message/Message.vue index 23a71f9..cc3232f 100644 --- a/src/pages/message/Message.vue +++ b/src/pages/message/Message.vue @@ -22,7 +22,6 @@
- @@ -335,19 +361,27 @@ import Search from "../../components/Search"; import FromBottomDialog from '../../components/dialog/FromBottomDialog' import Check from "../../components/Check"; import {mapState} from "vuex"; +import Peoples from "../people/components/Peoples"; +import Mask from "../../components/Mask"; +import Scroll from "../../components/Scroll"; export default { name: "Message", components: { + Scroll, + Mask, Footer, Search, FromBottomDialog, - Check + Check, + Peoples }, data() { return { + isShowRecommend: false, createChatSearchKey: '', showJoinedChat: false, + loading: false, createChatDialog: false, isShowText: false, text: 'AAAAAAAAA、BBBBBBBBBBBBB、CCCCCCCC', @@ -401,7 +435,8 @@ export default { // select: false // }, // ], - searchFriends: [] + searchFriends: [], + recommend: [], } }, computed: { @@ -424,9 +459,24 @@ export default { } }, created() { - console.log(22) + this.recommend = this.$clone(this.friends.all) + this.recommend.map(v => { + v.type = -2 + }) }, - methods: {} + methods: { + async loadRecommendData() { + if (this.loading) return + this.loading = true + await this.$sleep(500) + this.loading = false + let temp = this.$clone(this.friends.all) + temp.map(v => { + v.type = -2 + }) + this.recommend = this.recommend.concat(temp) + } + } } @@ -443,8 +493,7 @@ export default { bottom: 0; left: 0; right: 0; - //height: 100%; - //width: 100%; + font-size: 1.4rem; overflow: auto; background: @main-bg; padding-bottom: 6rem; @@ -699,7 +748,6 @@ export default { .content { padding-top: @header-height; - } .friends { @@ -976,5 +1024,74 @@ export default { } } + + .recommend-dialog { + position: fixed; + z-index: 11; + top: 0; + left: 0; + width: 100vw; + height: 100vh; + display: flex; + align-items: center; + justify-content: center; + + .dialog-content { + position: relative; + z-index: 4; + background: white; + width: 85vw; + height: 80vh; + border-radius: 1.2rem; + overflow: hidden; + + .dialog-header { + color: black; + border-bottom: 1px solid whitesmoke; + padding: @padding-page; + display: flex; + align-items: center; + justify-content: space-between; + + .title { + display: flex; + align-items: center; + + & > img { + margin-left: .3rem; + width: 1.5rem; + } + } + + & > img { + width: 2rem; + } + + } + + .dialog-body { + padding: @padding-page; + padding-top: 0; + height: calc(80vh - 5rem); + overflow: auto; + + .scroll { + height: calc(80vh - 5rem); + } + + .l-button { + color: white; + } + + .name { + color: black !important; + } + + /deep/ .People .content .left .name { + color: black !important; + } + } + } + } } diff --git a/src/pages/message/notice/NoticeSetting.vue b/src/pages/message/notice/NoticeSetting.vue index 19a2adb..cf6f513 100644 --- a/src/pages/message/notice/NoticeSetting.vue +++ b/src/pages/message/notice/NoticeSetting.vue @@ -92,7 +92,7 @@ export default { option5: false, option6: false, option7: true, - option8: false, + option8: true, option9: false, option10: false, option11: false, diff --git a/src/pages/people/components/People.vue b/src/pages/people/components/People.vue index 543c683..e04fcdb 100644 --- a/src/pages/people/components/People.vue +++ b/src/pages/people/components/People.vue @@ -42,6 +42,9 @@