From 1fd34320ce91223035dca67ff2f671cdbe1d1b4b Mon Sep 17 00:00:00 2001
From: "wenbo.dong" <wenbo.dong@qunar.com>
Date: Thu, 21 Sep 2017 14:15:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=81=A2=E5=A4=8Dfooter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/Application.js                         |  3 ++-
 client/containers/Group/Group.js              |  5 +----
 .../containers/Project/Interface/Interface.js |  5 +----
 client/styles/common.scss                     | 20 +++++++++----------
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/client/Application.js b/client/Application.js
index 5f2e84fc..5af14eba 100755
--- a/client/Application.js
+++ b/client/Application.js
@@ -5,7 +5,7 @@ import { Route, BrowserRouter as Router } from 'react-router-dom';
 import { Home, Group, Project, Follows, AddProject, Login } from './containers/index';
 import User from './containers/User/User.js';
 import Header from './components/Header/Header';
-// import Footer from './components/Footer/Footer';
+import Footer from './components/Footer/Footer';
 import Loading from './components/Loading/Loading';
 import { checkLoginState } from './reducer/modules/user';
 import { requireAuthentication } from './components/AuthenticatedComponent';
@@ -61,6 +61,7 @@ export default class App extends Component {
                 <Route path="/login" component={Login} />
               </div>
             </div>
+            <Footer/>
           </div>
         </Router>
 
diff --git a/client/containers/Group/Group.js b/client/containers/Group/Group.js
index f3f26b4c..e36c4a23 100755
--- a/client/containers/Group/Group.js
+++ b/client/containers/Group/Group.js
@@ -4,7 +4,7 @@ import ProjectList from './ProjectList/ProjectList.js';
 import MemberList from './MemberList/MemberList.js';
 import { Route, Switch, Redirect } from 'react-router-dom';
 import { Tabs, Layout } from 'antd';
-const { Content, Footer, Sider } = Layout;
+const { Content, Sider } = Layout;
 const TabPane = Tabs.TabPane;
 
 import './Group.scss';
@@ -29,9 +29,6 @@ export default class Group extends Component {
               <TabPane tab="成员列表" key="2"><MemberList/></TabPane>
             </Tabs>
           </Content>
-          <Footer style={{ textAlign: 'center' }}>
-            © 2017 YMFE 京ICP备17044220号
-          </Footer>
         </Layout>
       </Layout>
     )
diff --git a/client/containers/Project/Interface/Interface.js b/client/containers/Project/Interface/Interface.js
index d44b3dd7..7106fee5 100755
--- a/client/containers/Project/Interface/Interface.js
+++ b/client/containers/Project/Interface/Interface.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import { Tabs, Layout } from 'antd';
 import { Route, Switch, matchPath } from 'react-router-dom';
 import { connect } from 'react-redux';
-const { Content, Footer, Sider } = Layout;
+const { Content, Sider } = Layout;
 
 import './interface.scss'
 
@@ -104,9 +104,6 @@ class Interface extends Component {
               </Switch>
             </div>
           </Content>
-          <Footer style={{ textAlign: 'center' }}>
-            © 2017 YMFE 京ICP备17044220号
-          </Footer>
         </Layout>
       </Layout>)
   }
diff --git a/client/styles/common.scss b/client/styles/common.scss
index f3cbf89c..5d3dafc0 100755
--- a/client/styles/common.scss
+++ b/client/styles/common.scss
@@ -69,17 +69,17 @@ em {
 }
 // 页面最外层元素 样式
 .router-main {
-  // padding-bottom: .24rem;
-  // min-height: 100%;
-  // height: auto !important;
-  // height: 100%;
-  // margin-bottom: -2.4rem;
+  padding-bottom: .24rem;
+  min-height: 100%;
+  height: auto !important;
+  height: 100%;
+  margin-bottom: -2.4rem;
   background-color: #ececec;
-  // &::after {
-  //   content: '';
-  //   display: block;
-  //   height: 2.4rem;
-  // }
+  &::after {
+    content: '';
+    display: block;
+    height: 2.4rem;
+  }
 }
 
 .hidden {