Merge branch 'cyl/develop' into develop

1 year ago · 5db162ff3d
parent 2ebca03d50 b28c67ac5c
commit 5db162ff3d
2 changed files with 1 additions and 1 deletions
--- a/subPage/chat/index.wxml
+++ b/subPage/chat/index.wxml
@ -1,6 +1,7 @@
 <view class="p-home-chat g_h_all g_flex_column_between">
  <scroll-view scroll-y="{{true}}" 
               class="chat-content g_flex_column_end g_flex_1"
+               style="height:calc(100vh - 92px);overflow:auto;"
  >
    <view class="chat-card"
          wx:for="{{list}}"         
--- a/subPage/chat/index.wxss
+++ b/subPage/chat/index.wxss
@ -8,7 +8,6 @@
 .p-home-chat .chat-content {
  width: calc(100%);
  margin: 0 auto;
-  min-height: calc(8vh);
  padding-bottom: 92px;
 }
 .p-home-chat .chat-content .chat-left {