From 60ae8e073fd2f46675ffa01fd8d2a45567e7587c Mon Sep 17 00:00:00 2001
From: qitmac000249 <xilli.yu@Qunar.com>
Date: Tue, 25 Jul 2017 10:31:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E5=A4=84=E6=9C=80=E5=B0=8F=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=B7=BB=E5=8A=A0=E5=88=86=E7=BB=84=E7=9A=84?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=A1=86=E4=B8=BAtextarea?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/actions/news.js                                   | 6 ++++--
 client/containers/News/News.js                           | 2 +-
 client/containers/ProjectGroups/GroupList/GroupList.js   | 3 ++-
 client/containers/ProjectGroups/GroupList/GroupList.scss | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/actions/news.js b/client/actions/news.js
index 24a1fcb6..9d4da1fc 100644
--- a/client/actions/news.js
+++ b/client/actions/news.js
@@ -21,10 +21,12 @@ export function fetchNewsData (uid,page,limit) {
     page: page,
     limit: variable.PAGE_LIMIT?variable.PAGE_LIMIT:limit
   }
-  console.log(param);
+  // console.log(param);
   return {
     type: FETCH_NEWS_DATA,
-    payload: axios.get('/log/list',param)
+    payload: axios.get('/log/list',{
+      params: param
+    })
   };
 }
 
diff --git a/client/containers/News/News.js b/client/containers/News/News.js
index df5bb797..540324ae 100644
--- a/client/containers/News/News.js
+++ b/client/containers/News/News.js
@@ -38,7 +38,7 @@ class News extends Component {
   }
   componentWillMount(){
     console.log(this.props.uid);
-    this.props.fetchNewsData(1,1,10).then(function(data){
+    this.props.fetchNewsData(107,1,10).then(function(data){
       console.log(data);
     })
   }
diff --git a/client/containers/ProjectGroups/GroupList/GroupList.js b/client/containers/ProjectGroups/GroupList/GroupList.js
index f5f265f8..603752a3 100644
--- a/client/containers/ProjectGroups/GroupList/GroupList.js
+++ b/client/containers/ProjectGroups/GroupList/GroupList.js
@@ -5,6 +5,7 @@ import { Button, Icon, Modal, Input, message, Menu, Row, Col } from 'antd'
 import { autobind } from 'core-decorators';
 import axios from 'axios';
 
+const { TextArea } = Input;
 const Search = Input.Search;
 const confirm = Modal.confirm;
 const TYPE_EDIT = 'edit';
@@ -229,7 +230,7 @@ export default class GroupList extends Component {
           <Row gutter={6} className="modal-input">
             <Col span="5"><div className="label">简介：</div></Col>
             <Col span="15">
-              <Input placeholder="请输入分组描述" onChange={this.inputNewGroupDesc}></Input>
+              <TextArea rows = {3} placeholder="请输入分组描述" onChange={this.inputNewGroupDesc}></TextArea>
             </Col>
           </Row>
         </Modal>
diff --git a/client/containers/ProjectGroups/GroupList/GroupList.scss b/client/containers/ProjectGroups/GroupList/GroupList.scss
index b6b7b1be..14133998 100644
--- a/client/containers/ProjectGroups/GroupList/GroupList.scss
+++ b/client/containers/ProjectGroups/GroupList/GroupList.scss
@@ -23,6 +23,7 @@
   }
   .group-operate {
     height: 48px;
+    min-width: 263px;
     padding: 10px 6px;
     background: #fff;
     .search {