diff --git a/src/App.vue b/src/App.vue index e3be247..4764dbe 100644 --- a/src/App.vue +++ b/src/App.vue @@ -55,6 +55,8 @@ export default { '/message/share-to-friend', '/message/joined-group-chat', '/message/fans', + '/message/all', + '/message/visitors', '/country-choose', '/edit-userinfo', diff --git a/src/assets/img/icon/components/gray-close.png b/src/assets/img/icon/components/gray-close - 副本.png similarity index 100% rename from src/assets/img/icon/components/gray-close.png rename to src/assets/img/icon/components/gray-close - 副本.png diff --git a/src/assets/img/icon/components/gray-close-full2.png b/src/assets/img/icon/components/gray-close-full2.png new file mode 100644 index 0000000..af9b5f1 Binary files /dev/null and b/src/assets/img/icon/components/gray-close-full2.png differ diff --git a/src/assets/img/icon/message/call-gray.png b/src/assets/img/icon/message/call-gray.png new file mode 100644 index 0000000..381c806 Binary files /dev/null and b/src/assets/img/icon/message/call-gray.png differ diff --git a/src/assets/img/icon/message/call-message.webp b/src/assets/img/icon/message/call-message.webp new file mode 100644 index 0000000..f9a01b0 Binary files /dev/null and b/src/assets/img/icon/message/call-message.webp differ diff --git a/src/assets/img/icon/message/comment-gray.png b/src/assets/img/icon/message/comment-gray.png new file mode 100644 index 0000000..5837400 Binary files /dev/null and b/src/assets/img/icon/message/comment-gray.png differ diff --git a/src/assets/img/icon/message/comment-message.webp b/src/assets/img/icon/message/comment-message.webp new file mode 100644 index 0000000..7f03307 Binary files /dev/null and b/src/assets/img/icon/message/comment-message.webp differ diff --git a/src/assets/img/icon/message/display1.webp b/src/assets/img/icon/message/display1.webp new file mode 100644 index 0000000..4f4e836 Binary files /dev/null and b/src/assets/img/icon/message/display1.webp differ diff --git a/src/assets/img/icon/message/display2.webp b/src/assets/img/icon/message/display2.webp new file mode 100644 index 0000000..1fc837a Binary files /dev/null and b/src/assets/img/icon/message/display2.webp differ diff --git a/src/assets/img/icon/message/done-gray.png b/src/assets/img/icon/message/done-gray.png new file mode 100644 index 0000000..d7654c1 Binary files /dev/null and b/src/assets/img/icon/message/done-gray.png differ diff --git a/src/assets/img/icon/message/like-gray.png b/src/assets/img/icon/message/like-gray.png new file mode 100644 index 0000000..a78123f Binary files /dev/null and b/src/assets/img/icon/message/like-gray.png differ diff --git a/src/assets/img/icon/message/love-message.webp b/src/assets/img/icon/message/love-message.webp new file mode 100644 index 0000000..3295ca3 Binary files /dev/null and b/src/assets/img/icon/message/love-message.webp differ diff --git a/src/assets/img/icon/message/peoples-black.png b/src/assets/img/icon/message/peoples-black.png new file mode 100644 index 0000000..7aee85c Binary files /dev/null and b/src/assets/img/icon/message/peoples-black.png differ diff --git a/src/assets/img/icon/message/peoples-black2.png b/src/assets/img/icon/message/peoples-black2.png new file mode 100644 index 0000000..86d4794 Binary files /dev/null and b/src/assets/img/icon/message/peoples-black2.png differ diff --git a/src/assets/img/icon/message/remove.png b/src/assets/img/icon/message/remove.png new file mode 100644 index 0000000..8bae327 Binary files /dev/null and b/src/assets/img/icon/message/remove.png differ diff --git a/src/assets/less/color.less b/src/assets/less/color.less index 9d04fb8..916f94c 100644 --- a/src/assets/less/color.less +++ b/src/assets/less/color.less @@ -4,11 +4,16 @@ @second-btn-color: rgb(58, 58, 70); @second-btn-color-tran: rgba(58, 58, 70, .4); @line-color: rgb(37, 45, 66); -@line-color2: rgb(56,54,67); +@line-color2: rgb(56, 54, 67); @primary-btn-color: rgb(252, 47, 86); @disable-primary-btn-color: rgba(252, 47, 86, .5); +@mask-dark: #000000bb; +@mask-light:transparent; +@mask-white:transparent; +@mask-lightgray:rgba(0, 0, 0, 0.25); + .second-text-color { color: @second-text-color; } diff --git a/src/components/Mask.vue b/src/components/Mask.vue index 6a36a63..ae42bab 100644 --- a/src/components/Mask.vue +++ b/src/components/Mask.vue @@ -18,6 +18,8 @@ export default { diff --git a/src/components/Scroll.vue b/src/components/Scroll.vue index 7fda0db..cb771c0 100644 --- a/src/components/Scroll.vue +++ b/src/components/Scroll.vue @@ -1,26 +1,88 @@ + + diff --git a/src/pages/message/Message.vue b/src/pages/message/Message.vue index d75abdf..825ffb2 100644 --- a/src/pages/message/Message.vue +++ b/src/pages/message/Message.vue @@ -44,7 +44,7 @@ -
+
@@ -714,7 +714,6 @@ export default { } .messages { - margin-top: 5px; .message { display: flex; @@ -725,7 +724,7 @@ export default { } &:active { - background: #353a4f; + background: @active-main-bg; } .avatar { diff --git a/src/pages/message/Visitors.vue b/src/pages/message/Visitors.vue new file mode 100644 index 0000000..cf209a5 --- /dev/null +++ b/src/pages/message/Visitors.vue @@ -0,0 +1,286 @@ + + + + diff --git a/src/pages/people/components/People.vue b/src/pages/people/components/People.vue index 98a63cb..2b31d12 100644 --- a/src/pages/people/components/People.vue +++ b/src/pages/people/components/People.vue @@ -63,6 +63,26 @@
+ +
@@ -163,7 +183,7 @@ export default { .left { .name { - font-size: 1.2rem; + font-size: 1.4rem; margin-bottom: .2rem; color: white; } diff --git a/src/pages/people/components/Peoples.vue b/src/pages/people/components/Peoples.vue index 00c5b25..12d68c9 100644 --- a/src/pages/people/components/Peoples.vue +++ b/src/pages/people/components/Peoples.vue @@ -76,6 +76,9 @@ export default { this.localList.splice(index, 1) }, follow(index) { + if (this.mode === 'visitor') { + this.localList[index].type = this.RELATE_ENUM.FOLLOW_HE + } if (this.mode === 'recommend') { this.localList[index].type = this.RELATE_ENUM.FOLLOW_HE } @@ -86,6 +89,9 @@ export default { } }, unfollow(index) { + if (this.mode === 'visitor') { + this.localList[index].type = this.RELATE_ENUM.FOLLOW_ME + } if (this.mode === 'recommend') { this.localList[index].type = this.RELATE_ENUM.RECOMMEND } diff --git a/src/router/index.js b/src/router/index.js index d89e325..e7e6036 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -59,6 +59,8 @@ import MyMusic from "../pages/me/MyMusic"; import FollowAndFans from "../pages/people/FollowAndFans"; import MyRequestUpdate from "../pages/me/MyRequestUpdate"; import Fans from "../pages/message/Fans"; +import AllMessage from "../pages/message/AllMessage"; +import Visitors from "../pages/message/Visitors"; const routes = [ // {path: '', component: Music}, @@ -88,6 +90,8 @@ const routes = [ {path: '/message/chat', component: Chat}, {path: '/message/chat-detail', component: ChatDetail}, {path: '/message/fans', component: Fans}, + {path: '/message/all', component: AllMessage}, + {path: '/message/visitors', component: Visitors}, {path: '/edit-userinfo', component: EditUserInfo},