From a3ddf46f885338150ff6c1bb297fdcc0b8a0e413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Tue, 8 Feb 2022 13:33:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 12292 -> 12292 bytes lib/emoji.js | 33 +++++++++++++++++++++++++++++ pages/im/components/sentText.nvue | 13 ++++++++++-- pages/im/components/sentVoice.nvue | 2 +- pages/im/private/chat.nvue | 30 ++++++++++++-------------- static/.DS_Store | Bin 10244 -> 10244 bytes 6 files changed, 58 insertions(+), 20 deletions(-) create mode 100644 lib/emoji.js diff --git a/.DS_Store b/.DS_Store index 2a302a8794f4b5c8a10dbb656d9dac78105832bc..29b9dbd7ef013fcc859b955544c1dccf51fdc8b0 100644 GIT binary patch delta 223 zcmZokXi1ph&lo;2Af9zS0|Udnja$O`8I?El2&k}3R#0M@{6Ud-a=D23od%1Sii_(U?46RbcXO74FG*R1QsUQ4^kgSCxD69@UeK w-J9Fg5*a5S6qf|~S`x(%o;mr+P(KK4X3_Y`!cq+M)?`mr`N?jo5o8$y0DV+(9RL6T diff --git a/lib/emoji.js b/lib/emoji.js new file mode 100644 index 0000000..53a62a2 --- /dev/null +++ b/lib/emoji.js @@ -0,0 +1,33 @@ +export default [ + "😀", "😁", "😃", "😄", "😅", "😆", "😉", "😊", "😋", "😎", "😍", + "😘", "😗", "😙", "😚", "â˜ș", "😇", "😐", "😑", "đŸ˜¶", "😏", "😣", "đŸ˜„", "😼", "😯", "đŸ˜Ș", + "đŸ˜«", "😮", "😌", "😛", "😜", "😝", "😒", "😓", "😔", "😕", "đŸ˜Č", "đŸ˜·", "😖", "😞", "😟", + "đŸ˜€", "😱", "😭", "😩", "😧", "😹", "😬", "😰", "đŸ˜±", "😳", "đŸ˜”", "😡", "😠", + "👩", "👧", "👹", "đŸ‘©", "👮", "đŸ‘”", "đŸ‘¶", "đŸ‘±", "👼", "đŸ‘Č", "👳", "đŸ‘·", "👾", "💂", "🎅", "👰", "đŸ‘Œ", + "💆", "💇", "🙍", "🙎", "🙅", "🙆", "💁", "🙋", "🙇", "🙌", "🙏", "đŸ‘€", "đŸ‘„", "đŸš¶", "🏃", "👯", + "💃", "đŸ‘«", "👬", "👭", "💏", "💑", "đŸ‘Ș", "đŸ’Ș", "👈", "👉", "☝", "👆", "👇", "✌", "✋", "👌", + "👍", "👎", "✊", "👊", "👋", "👏", "👐", "✍", "👣", "👀", "👂", "👃", "👅", "👄", "💋", "👓", + "👔", "👙", "👛", "👜", "👝", "🎒", "đŸ’Œ", "👞", "👟", "👠", "👡", "👱", "👑", + "👒", "đŸŽ©", "🎓", "💄", "💅", "💍", "🌂", "đŸ“¶", "📳", "📮", "♻", "🏧","🚼", "🚰", "♿", "đŸšč", "đŸšș", + "đŸš»", "đŸšŒ", "đŸšŸ", "⚠", "🚾", "⛔", "đŸš«", "🚳", "🚭", "🚯", "đŸš±", "đŸš·", "🔞", "💈", + "🙈", "🐒", "đŸ¶", "🐕", "đŸ©", "đŸș", "đŸ±","🐈", "🐯", "🐅", "🐆", "🐮", "🐎", "🐼", "🐂", + "🐃","🐄","đŸ·","🐖","🐗","đŸœ","🐏","🐑","🐐","đŸȘ","đŸ«","🐘","🐭", + "🐁","🐀","đŸč","🐰","🐇","đŸ»","🐹","đŸŒ","đŸŸ","🐔","🐓","🐣","đŸ€","đŸ„", + "🐩", "🐧", "🐾", "🐊","🐱", "🐍", "đŸČ", "🐉", "🐳", "🐋", "🐬", "🐟", "🐠", "🐡", + "🐙", "🐚", "🐌", "🐛", "🐜", "🐝", "🐞", "🩋", "💐", "🌾", "💼", "đŸŒč", "đŸŒș", + "đŸŒ»", "đŸŒŒ", "đŸŒ·", "đŸŒ±", "đŸŒČ", "🌳", "🌮", "đŸŒ”", "đŸŒŸ", "🌿", "🍀", "🍁", "🍂", "🍃", + "🌍","🌎","🌏","🌐","🌑","🌒","🌓","🌔","🌕","🌖","🌗","🌘","🌙","🌚", + "🌛","🌜","☀","🌝","🌞","⭐","🌟","🌠","☁","⛅","☔","⚡","❄","đŸ”„","💧","🌊", + "🏀", "🏈", "🏉", "đŸŽŸ", "đŸŽ±", "🎳", "⛳", "🎣", "đŸŽœ", "🎿", + "😈", "👿", "đŸ‘č", "đŸ‘ș", "💀", "☠", "đŸ‘»", "đŸ‘œ", "đŸ‘Ÿ", "💣", + "🌋", "đŸ—»", "🏠", "🏡", "🏱", "🏣", "đŸ€", "đŸ„", "🏩", "🏹", + "â›Č", "🌁", "🌃", "🌆", "🌇", "🎠", "🎡", "🎱", "🚂", + "🚌", "🚍", "🚎", "🚏", "🚐", "🚑", "🚒", "🚓", "🚔", "🚕", "🚖", "🚗", "🚘", + "💌", "💎", "đŸ”Ș", "💈", "đŸšȘ", "đŸšœ", "🚿", "🛁", "⌛", "⏳", "⌚", "⏰", "🎈", "🎉", + "đŸ’€", "💱", "💬", "💭", "♹", "🌀", "🔔", "🔕", "✡", "✝", "🔯", "📛", "🔰", "đŸ”±", "⭕", "✅", + "☑", "✔", "✖", "❌", "❎", "➕", "➖", "➗", "➰", "➿", "ă€œ", "✳", "✮", "❇", "‌", "⁉", "❓", "❔", "❕", "❗", + "🕛", "🕧", "🕐", "🕜", "🕑", "🕝", "🕒", "🕞", "🕓", "🕟", "🕔", "🕠", "🕕", "🕡", + "🕖", "🕱", "🕗", "🕣", "🕘", "đŸ•€", "🕙", "đŸ•„", "🕚", "🕩", "⏱", "âČ", "🕰", + "💘", "❀", "💓", "💔", "💕", "💖", "💗", "💙", "💚", "💛", "💜", "💝", "💞", "💟❣", + "🍇", "🍈", "🍉", "🍊", "🍋", "🍌", "🍍", "🍎", "🍏", "🍐", "🍑", "🍒", "🍓", +] \ No newline at end of file diff --git a/pages/im/components/sentText.nvue b/pages/im/components/sentText.nvue index 4bea6a9..c787f6f 100644 --- a/pages/im/components/sentText.nvue +++ b/pages/im/components/sentText.nvue @@ -1,6 +1,15 @@ @@ -71,7 +80,7 @@ .input { background: #F3F6FB; height: 70rpx; - width: 460rpx; + width: 500rpx; border-radius: 10rpx; margin-right: 15rpx; padding: 0 20rpx; diff --git a/pages/im/components/sentVoice.nvue b/pages/im/components/sentVoice.nvue index 197d54a..8ab1148 100644 --- a/pages/im/components/sentVoice.nvue +++ b/pages/im/components/sentVoice.nvue @@ -102,7 +102,7 @@ line-height: 70rpx; justify-content: center; align-items: center; - width: 460rpx; + width: 500rpx; border-radius: 10rpx; margin-right: 15rpx; diff --git a/pages/im/private/chat.nvue b/pages/im/private/chat.nvue index f91fb03..f94ae6c 100644 --- a/pages/im/private/chat.nvue +++ b/pages/im/private/chat.nvue @@ -36,13 +36,12 @@ @success="getMessageList" /> - + - + @@ -148,10 +147,14 @@ }) }, // æ»šćŠšćˆ°ćș•éƒš - scrollBottom() { + scrollBottom(type) { + if(type === 'msgPopups'){ + this.showPopups = !this.showPopups + } setTimeout(() => { let el = this.$refs.chatBottom - ChatList.scrollToElement(el, { + ChatList.scrollToElement(el, { + offset: 0, animated: false }) }, 50) @@ -165,19 +168,14 @@ .chat { background: $window-color; flex: 1; - - - .body { - flex: 1; - - .cell { + .body { + flex: 1; + .cell { padding: 10rpx 30rpx; - .time { justify-content: center; align-items: center; - padding-bottom: 20rpx; - + padding-bottom: 20rpx; .text { background: #fff; font-size: 24rpx; @@ -238,12 +236,10 @@ padding: 20rpx 30rpx; display: flex; justify-content: space-between; - flex-direction: row; - + flex-direction: row; .msg-type { width: 70rpx; height: 70rpx; - .icon { margin: 5rpx; width: 60rpx; diff --git a/static/.DS_Store b/static/.DS_Store index 9cef02d4feac8305cdf1df5756e8c53c40f8e6d2..a81ade7433a38163cee5ca2c259b24132f6990d5 100644 GIT binary patch delta 227 zcmZn(XbIR*A2B_==7q@6#ule;?$DKVj{lvAQc(;<(@!Y0Y#~0nW^Pq6~P6G$(ecS%Jv@^z(Cm{ z0LIXOFa#KsAq)lvWrq+4Fq=bwF(fZPFO`#1*})qs%fX<{;K<;`5X_LlP|ncDFpFUg v!w!a{47V8GFnnW_WMLFzRASU-G-0%5v}g2S3}g&q3}K99jN1H3L`WC_bSgFj delta 227 zcmZn(XbIR*A?oF{JhD$BEIzznLsVUnN_J^rNIS>$(ecS%Jv@^z<^WP zK?A}PU{HoI7#NftLLp2J0mhKL{Jd14ssMV|dK)mEk`lFQXWv5~DVwjsT-6qdB7kqbH*mqYq;sW6