diff --git a/resources/assets/js/components/Mobile/Back.vue b/resources/assets/js/components/Mobile/Back.vue index bcb87a53e..077fdf8a8 100644 --- a/resources/assets/js/components/Mobile/Back.vue +++ b/resources/assets/js/components/Mobile/Back.vue @@ -97,10 +97,8 @@ export default { }, appAndroidEvents() { - if (window && window.navigator - && /eeui/i.test(window.navigator.userAgent) - && /android/i.test(window.navigator.userAgent)) { - let eeui = requireModuleJs("eeui"); + if (this.$isEEUiApp && $A.isAndroid()) { + const eeui = requireModuleJs("eeui"); eeui.setPageBackPressed({ pageName: 'firstPage', }, _ => { diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 949a669d2..27434b6f9 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -647,7 +647,7 @@ export default { }, watch: { - '$route' (route) { + '$route' () { this.chackPass(); }, diff --git a/resources/assets/sass/pages/components/chat-input.scss b/resources/assets/sass/pages/components/chat-input.scss index f2f2297ac..b442e5404 100755 --- a/resources/assets/sass/pages/components/chat-input.scss +++ b/resources/assets/sass/pages/components/chat-input.scss @@ -34,9 +34,10 @@ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; .ql-editor { - padding: 4px 7px; font-size: 14px; max-height: 200px; + padding: 0; + margin: 4px 7px; img { max-width: 150px;