diff --git a/im-uniapp/pages.json b/im-uniapp/pages.json index dd86682..68c9b75 100644 --- a/im-uniapp/pages.json +++ b/im-uniapp/pages.json @@ -78,26 +78,26 @@ "backgroundColor": "#ffffff", "list": [{ "pagePath": "pages/chat/chat", - "iconPath": "static/tarbar/chat.png", - "selectedIconPath": "static/tarbar/chat_active.png", + "iconPath": "static/tab/chat.png", + "selectedIconPath": "static/tab/chat_active.png", "text": "消息" }, { "pagePath": "pages/friend/friend", - "iconPath": "static/tarbar/friend.png", - "selectedIconPath": "static/tarbar/friend_active.png", + "iconPath": "static/tab/friend.png", + "selectedIconPath": "static/tab/friend_active.png", "text": "好友" }, { "pagePath": "pages/group/group", - "iconPath": "static/tarbar/group.png", - "selectedIconPath": "static/tarbar/group_active.png", + "iconPath": "static/tab/group.png", + "selectedIconPath": "static/tab/group_active.png", "text": "群聊" }, { "pagePath": "pages/mine/mine", - "iconPath": "static/tarbar/mine.png", - "selectedIconPath": "static/tarbar/mine_active.png", + "iconPath": "static/tab/mine.png", + "selectedIconPath": "static/tab/mine_active.png", "text": "我的" } ] diff --git a/im-uniapp/static/tarbar/chat.png b/im-uniapp/static/tab/chat.png similarity index 100% rename from im-uniapp/static/tarbar/chat.png rename to im-uniapp/static/tab/chat.png diff --git a/im-uniapp/static/tab/chat_active.png b/im-uniapp/static/tab/chat_active.png new file mode 100644 index 0000000..3ae1599 Binary files /dev/null and b/im-uniapp/static/tab/chat_active.png differ diff --git a/im-uniapp/static/tarbar/friend.png b/im-uniapp/static/tab/friend.png similarity index 100% rename from im-uniapp/static/tarbar/friend.png rename to im-uniapp/static/tab/friend.png diff --git a/im-uniapp/static/tab/friend_active.png b/im-uniapp/static/tab/friend_active.png new file mode 100644 index 0000000..a033da3 Binary files /dev/null and b/im-uniapp/static/tab/friend_active.png differ diff --git a/im-uniapp/static/tarbar/group.png b/im-uniapp/static/tab/group.png similarity index 100% rename from im-uniapp/static/tarbar/group.png rename to im-uniapp/static/tab/group.png diff --git a/im-uniapp/static/tab/group_active.png b/im-uniapp/static/tab/group_active.png new file mode 100644 index 0000000..733e2a8 Binary files /dev/null and b/im-uniapp/static/tab/group_active.png differ diff --git a/im-uniapp/static/tab/mine.png b/im-uniapp/static/tab/mine.png new file mode 100644 index 0000000..06dcc7f Binary files /dev/null and b/im-uniapp/static/tab/mine.png differ diff --git a/im-uniapp/static/tab/mine_active.png b/im-uniapp/static/tab/mine_active.png new file mode 100644 index 0000000..4c73eac Binary files /dev/null and b/im-uniapp/static/tab/mine_active.png differ diff --git a/im-uniapp/static/tarbar/chat_active.png b/im-uniapp/static/tarbar/chat_active.png deleted file mode 100644 index 4050f46..0000000 Binary files a/im-uniapp/static/tarbar/chat_active.png and /dev/null differ diff --git a/im-uniapp/static/tarbar/friend_active.png b/im-uniapp/static/tarbar/friend_active.png deleted file mode 100644 index 3402ded..0000000 Binary files a/im-uniapp/static/tarbar/friend_active.png and /dev/null differ diff --git a/im-uniapp/static/tarbar/group_active.png b/im-uniapp/static/tarbar/group_active.png deleted file mode 100644 index b69ca7e..0000000 Binary files a/im-uniapp/static/tarbar/group_active.png and /dev/null differ diff --git a/im-uniapp/static/tarbar/mine.png b/im-uniapp/static/tarbar/mine.png deleted file mode 100644 index b51be26..0000000 Binary files a/im-uniapp/static/tarbar/mine.png and /dev/null differ diff --git a/im-uniapp/static/tarbar/mine_active.png b/im-uniapp/static/tarbar/mine_active.png deleted file mode 100644 index b0ad923..0000000 Binary files a/im-uniapp/static/tarbar/mine_active.png and /dev/null differ diff --git a/im-web/src/components/chat/ChatBox.vue b/im-web/src/components/chat/ChatBox.vue index 81dce21..9bdd18b 100644 --- a/im-web/src/components/chat/ChatBox.vue +++ b/im-web/src/components/chat/ChatBox.vue @@ -399,9 +399,7 @@ export default { return; } let sendText = this.isReceipt ? "【回执消息】" : ""; - let promiseList = []; - for (let i = 0; i < fullList.length; i++) { - let msg = fullList[i]; + fullList.forEach(async msg => { switch (msg.type) { case "text": await this.sendTextMessage(sendText + msg.content, msg.atUserIds); @@ -413,8 +411,7 @@ export default { await this.sendFileMessage(msg.content.file); break; } - - } + }) }, sendImageMessage(file) { return new Promise((resolve, reject) => { diff --git a/im-web/src/components/chat/ChatInput.vue b/im-web/src/components/chat/ChatInput.vue index c451fe5..37be300 100644 --- a/im-web/src/components/chat/ChatInput.vue +++ b/im-web/src/components/chat/ChatInput.vue @@ -1,8 +1,9 @@