diff --git a/pages.json b/pages.json index 36e7ed8..a7aaca0 100644 --- a/pages.json +++ b/pages.json @@ -636,7 +636,7 @@ } ], "tabBar": { - "borderStyle": "black", + "borderStyle": "white", "selectedColor": "#34CE98", "list": [{ "iconPath": "static/tabBar/tabBar_00.png", diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue index f4f2711..e599250 100644 --- a/pages/im/components/groupUserList.vue +++ b/pages/im/components/groupUserList.vue @@ -4,27 +4,25 @@ - + 管理 群主 {{ item.name }} - - + 邀请好友 - - - + + + - + @select="handleAction" :show="actionShow" /> @@ -277,7 +275,7 @@ background-color: $main-color; transform: rotate(45deg); color: #ffffff; - font-size: 12rpx; + font-size: 16rpx; width: 100rpx; padding-top: 30rpx; text-align: center; @@ -290,7 +288,7 @@ background-color: $text-price; transform: rotate(45deg); color: #ffffff; - font-size: 12rpx; + font-size: 16rpx; width: 100rpx; padding-top: 30rpx; text-align: center; @@ -301,14 +299,16 @@ } .name { - color: $text-gray-m; + color: 20rpx; width: 126rpx; + padding-top: 6rpx; text-align: center; - font-size: 26rpx; + font-size: 22rpx !important; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; word-break: break-word; + color: $text-gray-m !important; } } diff --git a/pages/im/components/messageCell.vue b/pages/im/components/messageCell.vue index 4e37bcc..60cc614 100644 --- a/pages/im/components/messageCell.vue +++ b/pages/im/components/messageCell.vue @@ -6,8 +6,7 @@ - {{ contact(item.targetId).name }} [群] + {{ contact(item.targetId).name }} [群] {{ item.sentTime|timeCustomCN }} - - {{ item.content.message }} - + {{ item.content.message }} @@ -168,8 +166,8 @@ flex: 1; .body { - flex: 1; + flex: 1; .cell { padding: 10rpx 30rpx; diff --git a/pages/im/private/chat.nvue b/pages/im/private/chat.nvue index 87d0922..ea795d3 100644 --- a/pages/im/private/chat.nvue +++ b/pages/im/private/chat.nvue @@ -3,15 +3,19 @@ - {{ customCN(item.sentTime) }} + {{ customCN(item.sentTime) }} - + - - - + + + - {{ item.sentStatus == 50 ? '已读': '未读'}} + {{ item.sentStatus == 50 ? '已读': '未读'}} @@ -55,19 +59,19 @@ } }, computed: { - latestMessage() { - if (this.messages.length) { - return this.messages[this.messages.length - 1] - } else { - return { - sentTime: 0 - } + latestMessage() { + if (this.messages.length) { + return this.messages[this.messages.length - 1] + } else { + return { + sentTime: 0 + } + } + }, + contact() { + return function(targetId) { + return this.$store.getters.contactInfo(targetId) } - }, - contact() { - return function(targetId) { - return this.$store.getters.contactInfo(targetId) - } } }, onLoad(e) { @@ -104,18 +108,18 @@ customCN(val) { return timeCustomCN(val) }, - getNewMessage() { - im.getMessageList( - this.conversationType, - this.targetId, - this.latestMessage.sentTime || 0, - 1, - false, - (messages) => { - console.log(messages); - this.messages = this.messages.concat(messages) - this.scrollBottom() - }) + getNewMessage() { + im.getMessageList( + this.conversationType, + this.targetId, + this.latestMessage.sentTime || 0, + 1, + false, + (messages) => { + console.log(messages); + this.messages = this.messages.concat(messages) + this.scrollBottom() + }) }, // 获取消息列表 getMessageList() { @@ -125,7 +129,7 @@ 0, 100, true, - (messages) => { + (messages) => { console.log(messages); this.messages = messages.reverse() this.scrollBottom() @@ -167,6 +171,7 @@ background: $window-color; flex: 1; + .body { flex: 1; @@ -192,7 +197,6 @@ width: 690rpx; justify-content: flex-start; - &.left { flex-direction: row; } @@ -213,8 +217,13 @@ padding-top: 10rpx; .state-text { - font-size: 24rpx; - color: #666; + font-size: $title-size-m - 2; + color: rgba($color: $main-color, $alpha: 0.3) + } + + .state-text-active { + font-size: $title-size-m - 2; + color: #cecece; } } }