From 92d43c50bcf1659c67096df98e126a014584fbfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Fri, 25 Feb 2022 14:50:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E6=83=85=E5=8C=85?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 12292 -> 14340 bytes pages/im/components/sent/sentEmoji.vue | 79 +++ pages/im/components/sent/sentText.vue | 37 +- pages/im/components/sent/sentVoice.vue | 7 +- pages/im/components/sentMessageBar.vue | 66 +- pages/im/private/chat.vue | 2 - static/.DS_Store | Bin 12292 -> 12292 bytes static/icon/emoji-icon.png | Bin 0 -> 5665 bytes static/im/emoji.js | 795 +++++++++++++++++++++++++ store/modules/im.js | 4 +- 10 files changed, 966 insertions(+), 24 deletions(-) create mode 100644 pages/im/components/sent/sentEmoji.vue create mode 100644 static/icon/emoji-icon.png create mode 100644 static/im/emoji.js diff --git a/.DS_Store b/.DS_Store index a33bf2941480e4f068c446301e80561dc4392cbd..18bfff64ba35ed521989dae50662258bec1184ab 100644 GIT binary patch delta 255 zcmZokXem%&U|?W$DortDU@!nOIe-{M3-ADmHUb!ZEstc1+9zy{`BG6O@ rRuBPn5I2x;MRwH2i|?5y^P2?n04)bOnE^-}Y|b%ZX2dj(4PqPspj$D~ diff --git a/pages/im/components/sent/sentEmoji.vue b/pages/im/components/sent/sentEmoji.vue new file mode 100644 index 0000000..cb08343 --- /dev/null +++ b/pages/im/components/sent/sentEmoji.vue @@ -0,0 +1,79 @@ + + + + + diff --git a/pages/im/components/sent/sentText.vue b/pages/im/components/sent/sentText.vue index 40b5361..81eac2f 100644 --- a/pages/im/components/sent/sentText.vue +++ b/pages/im/components/sent/sentText.vue @@ -1,7 +1,17 @@ @@ -27,7 +37,7 @@ computed: { disabled() { return this.inputTxt.length === 0 - } + }, }, mounted() { RongIMLib.getTextMessageDraft(this.conversationType, this.targetId, ({ @@ -45,9 +55,15 @@ focusState: false, inputTxt: '' } - }, + }, + created(){ + uni.$on('emojiValue', res => { + this.inputTxt = res.value + }) + }, + methods: { - sent() { + sent() { if (!this.disabled) { im.sentText(this.conversationType, this.targetId, this.inputTxt, this.sender, () => { RongIMLib.clearTextMessageDraft(this.conversationType, this.targetId) @@ -56,13 +72,16 @@ }) } }, - focus() { + focus() { this.$emit('focus') }, - blur() { + blur(e) { uni.hideKeyboard() - this.$emit('blur') + this.$emit('blur', e.detail) } + }, + destroyed() { + uni.$off('emojiValue') } } @@ -75,7 +94,7 @@ .input { background: #F3F6FB; height: 70rpx; - width: 460rpx; + width: 400rpx; border-radius: 10rpx; margin-right: 15rpx; padding: 0 20rpx; diff --git a/pages/im/components/sent/sentVoice.vue b/pages/im/components/sent/sentVoice.vue index 4de2701..a9e3903 100644 --- a/pages/im/components/sent/sentVoice.vue +++ b/pages/im/components/sent/sentVoice.vue @@ -1,7 +1,7 @@