From 3a28e34c3d1b1e64f8b44f6656a99a41183c95c1 Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Fri, 25 Feb 2022 13:56:17 +0800 Subject: [PATCH 1/3] tongbug --- manifest.json | 46 +++++++++++++++++++++++----------------------- pages/im/index.vue | 3 ++- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/manifest.json b/manifest.json index 162cdcd..f30f418 100644 --- a/manifest.json +++ b/manifest.json @@ -1,4 +1,4 @@ -{ + { "name" : "ZH-HEALTH", "appid" : "__UNI__C29473D", "description" : "ZH-HEALTH,您手上的健康管理专家", @@ -104,33 +104,33 @@ }, "icons" : { "android" : { - "hdpi" : "unpackage/res/icons/72x72.png", - "xhdpi" : "unpackage/res/icons/96x96.png", - "xxhdpi" : "unpackage/res/icons/144x144.png", - "xxxhdpi" : "unpackage/res/icons/192x192.png" + "hdpi" : "", + "xhdpi" : "", + "xxhdpi" : "", + "xxxhdpi" : "" }, "ios" : { - "appstore" : "unpackage/res/icons/1024x1024.png", + "appstore" : "", "ipad" : { - "app" : "unpackage/res/icons/76x76.png", - "app@2x" : "unpackage/res/icons/152x152.png", - "notification" : "unpackage/res/icons/20x20.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "proapp@2x" : "unpackage/res/icons/167x167.png", - "settings" : "unpackage/res/icons/29x29.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "spotlight" : "unpackage/res/icons/40x40.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png" + "app" : "", + "app@2x" : "", + "notification" : "", + "notification@2x" : "", + "proapp@2x" : "", + "settings" : "", + "settings@2x" : "", + "spotlight" : "", + "spotlight@2x" : "" }, "iphone" : { - "app@2x" : "unpackage/res/icons/120x120.png", - "app@3x" : "unpackage/res/icons/180x180.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "notification@3x" : "unpackage/res/icons/60x60.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "settings@3x" : "unpackage/res/icons/87x87.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png", - "spotlight@3x" : "unpackage/res/icons/120x120.png" + "app@2x" : "", + "app@3x" : "", + "notification@2x" : "", + "notification@3x" : "", + "settings@2x" : "", + "settings@3x" : "", + "spotlight@2x" : "", + "spotlight@3x" : "" } } } diff --git a/pages/im/index.vue b/pages/im/index.vue index 097baf7..344ef48 100644 --- a/pages/im/index.vue +++ b/pages/im/index.vue @@ -106,7 +106,8 @@ code, conversations }) => { - if (code === 0) { + if (code === 0) { + console.log(conversations,',,,,,') this.conversations = conversations } }) From 013c030963aef06a00ac33d5f767cbd97ef2ceac Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Fri, 25 Feb 2022 14:45:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BE=A4=E9=87=8D=E5=A4=8D=E9=82=80?= =?UTF-8?q?=E8=AF=B7=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 ++-- pages/im/group/invite.vue | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/manifest.json b/manifest.json index 1ad8585..f92dfdb 100644 --- a/manifest.json +++ b/manifest.json @@ -1,8 +1,8 @@ - { +{ "name" : "ZH-HEALTH", "appid" : "__UNI__C29473D", "description" : "ZH-HEALTH,您手上的健康管理专家", - "versionName" : "1.0.19", + "versionName" : "1.0.20", "versionCode" : 100, "transformPx" : false, /* 5+App特有相关 */ diff --git a/pages/im/group/invite.vue b/pages/im/group/invite.vue index bab8744..a994fc2 100644 --- a/pages/im/group/invite.vue +++ b/pages/im/group/invite.vue @@ -26,7 +26,8 @@ - 完成{{`(${checkboxValue.length})` || ''}} + 添加中{{`(${checkboxValue.length})` || ''}} + 完成{{`(${checkboxValue.length})` || ''}} @@ -63,7 +64,8 @@ friends: [], orignalFriends: [], checkboxValue: [], - selectValue: [] + selectValue: [], + canInvite:false }; }, onLoad(e) { @@ -123,7 +125,8 @@ }, onInvite() { console.log(this.checkboxValue, 'userIds.....') - console.log(this.selectValue, 'userIds.....') + console.log(this.selectValue, 'userIds.....') + this.canInvite = true let userIds = [] this.checkboxValue.filter(item => { if (!utils.inArray(item, this.selectValue)) { @@ -136,9 +139,11 @@ delta: 1, animationType: 'pop-out', animationDuration: 200 - }); + }); + this.canInvite = false uni.$emit('groupInvitedUser') - }).catch(err => { + }).catch(err => { + this.canInvite = false uni.showToast({ icon: 'none', title: err.message 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 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E6=83=85?= =?UTF-8?q?=E5=8C=85=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 @@