From bd3b9315b2f39f05e0a8220e42c3aaa72bfe0932 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 23 May 2022 15:40:09 +0800
Subject: [PATCH] no message

---
 app/Models/UmengAlias.php                              |  5 +++--
 .../js/pages/manage/components/ChatInput/index.vue     | 10 +++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/Models/UmengAlias.php b/app/Models/UmengAlias.php
index 19993cdac..e4d696247 100644
--- a/app/Models/UmengAlias.php
+++ b/app/Models/UmengAlias.php
@@ -126,13 +126,14 @@ class UmengAlias extends AbstractModel
                         ],
                     ], $extra),
                     'type' => 'customizedcast',
-                    'mipush' => true,
-                    'mi_activity' => 'app.eeui.umeng.activity.MfrMessageActivity',
                     'alias_type' => 'userid',
                     'alias' => $alias,
                     'policy' => [
                         'expire_time' => Carbon::now()->addSeconds($seconds)->toDateTimeString(),
                     ],
+                    'channel_properties' => [
+                        'channel_activity' => 'app.eeui.umeng.activity.MfrMessageActivity',
+                    ],
                 ]);
 
             default:
diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue
index a1407fc98..8472ec114 100755
--- a/resources/assets/js/pages/manage/components/ChatInput/index.vue
+++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue
@@ -28,7 +28,7 @@
                 placement="top"
                 popperClass="chat-input-more-popover">
                 <ETooltip slot="reference" ref="moreTip" :disabled="!$isDesktop || showMore" placement="top" :content="$L('展开')">
-                    <i class="taskfont">&#xe790;</i>
+                    <i class="taskfont" @click="onToolbar('more')">&#xe790;</i>
                 </ETooltip>
                 <div class="chat-input-popover-item" @click="onToolbar('image')">
                     <i class="taskfont">&#xe64a;</i>
@@ -314,6 +314,8 @@ export default {
                     this.$emit('on-blur', this.quill)
                 } else {
                     this.$emit('on-focus', this.quill)
+                    this.showEmoji = false
+                    this.showMore = false
                     if (this.isSpecVersion) {
                         // ios11.0-11.3 对scrollTop及scrolIntoView解释有bug
                         // 直接执行会导致输入框滚到底部被遮挡
@@ -407,6 +409,12 @@ export default {
         },
 
         onToolbar(action) {
+            if (action !== 'emoji') {
+                this.showEmoji = false;
+            }
+            if (action !== 'more') {
+                this.showMore = false;
+            }
             switch (action) {
                 case 'user':
                     this.openMenu("@");