Merge branch 'master' of http://gogs.ioobot.com:6680/xy/ec-react

src/pages/home/all/index.js

@@ -70,11 +70,11 @@ class All extends Component {
                             }
 
                             let categoryList = data.categorybyprops
-                            categoryList.push(more)
+                            let dataList =  categoryList.concat(more)
 
                             return (
                                 <Grid
-                                    data={categoryList}
+                                    data={dataList}
                                     hasLine={false}
                                     onClick={(kind)=>{
                                         this.props.history.push({

src/pages/home/detail/index.css

@@ -45,7 +45,6 @@
 
 .detail-complicate-show {
     margin-top: 15px;
-    height: 500px;
     background-color: white;
 }