Commit d35424a0 by Sixong.Zhu

Merge branch 'pre' into release

parents d1683770 ac6f7019
Showing with 13 additions and 2 deletions
...@@ -132,14 +132,20 @@ ...@@ -132,14 +132,20 @@
} }
mounted() { mounted() {
this.adjust();
}
private adjust() {
setTimeout(() => {
if ( if (
localStorage.getItem(chatResizeKey1) && localStorage.getItem(chatResizeKey1) &&
localStorage.getItem(chatResizeKey2) localStorage.getItem(chatResizeKey2) &&
this.hasInput
) { ) {
const s1 = localStorage.getItem(chatResizeKey1) + "px"; const s1 = localStorage.getItem(chatResizeKey1) + "px";
const s2 = localStorage.getItem(chatResizeKey2) + "px"; const s2 = localStorage.getItem(chatResizeKey2) + "px";
this.refResize && (this.refResize.style.top = s1);
this.refTop && (this.refTop.style.height = s1); this.refTop && (this.refTop.style.height = s1);
this.refResize && (this.refResize.style.top = s1);
this.refBottom && (this.refBottom.style.height = s2); this.refBottom && (this.refBottom.style.height = s2);
} else { } else {
this.refBottom && this.refBottom &&
...@@ -148,6 +154,7 @@ ...@@ -148,6 +154,7 @@
this.refTop.clientHeight + this.refTop.clientHeight +
"px"); "px");
} }
}, 800);
} }
private openMessage(o: any) { private openMessage(o: any) {
...@@ -242,6 +249,10 @@ ...@@ -242,6 +249,10 @@
top: calc(100% - 130px + 1px); top: calc(100% - 130px + 1px);
height: 6px; height: 6px;
width: 100%; width: 100%;
&:hover {
background-color: #eee;
}
} }
} }
.order-info-con { .order-info-con {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment