Merge branch 'main' of github.com:hainatravel/dashboard into main

src/charts/Wechat_session.js

@@ -1,11 +1,8 @@
 import React, {Component} from 'react';
-import {Row, Col, List, Avatar, DatePicker, Pagination} from 'antd';
+import {Row, Col, List, Avatar, Space, Pagination} from 'antd';
 import {stores_Context} from '../config'
-import * as config from "../config";
 import {observer} from 'mobx-react';
-import moment from "moment";
 import 'moment/locale/zh-cn';
-import locale from 'antd/es/date-picker/locale/zh_CN';
 
 class Wechat_session extends Component {
 
@@ -44,6 +41,8 @@ class Wechat_session extends Component {
             <Row>
                 <Col span={6}>
                     <List
+                        style={{maxHeight: 800, minHeight: 800, overflowY: 'auto'}}
+                        bordered={true}
                         itemLayout="horizontal"
                         dataSource={userList}
                         renderItem={(user) => (
@@ -58,6 +57,8 @@ class Wechat_session extends Component {
                 </Col>
                 <Col span={6}>
                     <List
+                        style={{maxHeight: 800, minHeight: 800, overflowY: 'auto'}}
+                        bordered={true}
                         itemLayout="horizontal"
                         dataSource={contactList}
                         renderItem={(contact) => (
@@ -71,7 +72,10 @@ class Wechat_session extends Component {
                     />
                 </Col>
                 <Col span={12}>
+                    <Space direction="vertical" size="middle" style={{ display: 'flex' }}>
                     <List
+                        style={{maxHeight: 800, minHeight: 800, overflowY: 'auto'}}
+                        bordered={true}
                         itemLayout="horizontal"
                         dataSource={chatMsgList}
                         renderItem={(chatMsg) => (
@@ -90,6 +94,7 @@ class Wechat_session extends Component {
                         pageSize={20} 
                         total={chatMsgPage.totalpage*20}
                         onChange={(page, pageSize) => { this.handlePageChanged(page, pageSize)}} />
+                    </Space>
                 </Col>
 
             </Row>

src/charts/WhatsApp_session.js

@@ -1,5 +1,5 @@
 import React, {Component} from 'react';
-import {Row, Col, List, Avatar, DatePicker, Pagination} from 'antd';
+import {Row, Col, List, Avatar, Space, Pagination} from 'antd';
 import {stores_Context} from '../config'
 import {observer} from 'mobx-react';
 import 'moment/locale/zh-cn';
@@ -41,6 +41,8 @@ class WhatsApp_session extends Component {
             <Row>
                 <Col span={6}>
                     <List
+                        style={{maxHeight: 800, minHeight: 800, overflowY: 'auto'}}
+                        bordered={true}
                         itemLayout="horizontal"
                         dataSource={userList}
                         renderItem={(user) => (
@@ -55,6 +57,8 @@ class WhatsApp_session extends Component {
                 </Col>
                 <Col span={6}>
                     <List
+                        style={{maxHeight: 800, minHeight: 800, overflowY: 'auto'}}
+                        bordered={true}
                         itemLayout="horizontal"
                         dataSource={contactList}
                         renderItem={(contact) => (
@@ -68,7 +72,10 @@ class WhatsApp_session extends Component {
                     />
                 </Col>
                 <Col span={12}>
+                    <Space direction="vertical" size="middle" style={{ display: 'flex' }}>
                     <List
+                        style={{maxHeight: 800, minHeight: 800, overflowY: 'auto'}}
+                        bordered={true}
                         itemLayout="horizontal"
                         dataSource={chatMsgList}
                         renderItem={(chatMsg) => (
@@ -87,6 +94,8 @@ class WhatsApp_session extends Component {
                         pageSize={20} 
                         total={chatMsgPage.totalpage*20}
                         onChange={(page, pageSize) => { this.handlePageChanged(page, pageSize)}} />
+                    
+                    </Space>
                 </Col>
 
             </Row>