Merge branch 'master' into pre

components/chat-room.vue

@@ -132,22 +132,29 @@
         }
 
         mounted() {
-            if (
-                localStorage.getItem(chatResizeKey1) &&
-                localStorage.getItem(chatResizeKey2)
-            ) {
-                const s1 = localStorage.getItem(chatResizeKey1) + "px";
-                const s2 = localStorage.getItem(chatResizeKey2) + "px";
-                this.refResize && (this.refResize.style.top = s1);
-                this.refTop && (this.refTop.style.height = s1);
-                this.refBottom && (this.refBottom.style.height = s2);
-            } else {
-                this.refBottom &&
-                    ((this.refBottom as HTMLElement).style.height =
-                        this.chatBox.clientHeight -
-                        this.refTop.clientHeight +
-                        "px");
-            }
+            this.adjust();
+        }
+
+        private adjust() {
+            setTimeout(() => {
+                if (
+                    localStorage.getItem(chatResizeKey1) &&
+                    localStorage.getItem(chatResizeKey2) &&
+                    this.hasInput
+                ) {
+                    const s1 = localStorage.getItem(chatResizeKey1) + "px";
+                    const s2 = localStorage.getItem(chatResizeKey2) + "px";
+                    this.refTop && (this.refTop.style.height = s1);
+                    this.refResize && (this.refResize.style.top = s1);
+                    this.refBottom && (this.refBottom.style.height = s2);
+                } else {
+                    this.refBottom &&
+                        ((this.refBottom as HTMLElement).style.height =
+                            this.chatBox.clientHeight -
+                            this.refTop.clientHeight +
+                            "px");
+                }
+            }, 800);
         }
 
         private openMessage(o: any) {
@@ -242,6 +249,10 @@
             top: calc(100% - 130px + 1px);
             height: 6px;
             width: 100%;
+
+            &:hover {
+                background-color: #eee;
+            }
         }
     }
     .order-info-con {