Merge branch 'bugfix' into develop

@@ -93,4 +93,4 @@ a {
 }
 
 
-@import "layout/header", "layout/footer", "good", "filter", "passport/index", "guang/index", "home/index", "category/index", "product/index", "index/index", "shopping-cart/index";
+@import "layout/header", "layout/footer", "layout/footer_tab", "good", "filter", "passport/index", "guang/index", "home/index", "category/index", "product/index", "index/index", "shopping-cart/index";

+.footer-tab {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 100rem / $pxConvertRem;
+    padding-top: 20rem / $pxConvertRem;
+    box-sizing: border-box;
+    background: #fff;
+    border-top: 1px solid #b0b0b0;
+    z-index: 3;
+    .tab-item {
+        float: left;
+        width: 20%;
+        text-align: center;
+        color: #b0b0b0;
+        &.current {
+            color: #5e4b3c;
+        }
+    }
+    .tab-icon {
+        font-size: 40rem / $pxConvertRem;
+        line-height: 1;
+    }
+    .tab-name {
+        margin-top: 10rem / $pxConvertRem;
+        font-size: 20rem / $pxConvertRem;
+        line-height: 1;
+    }
+}
\ No newline at end of file

@@ -15,5 +15,5 @@
         <div class="overlay"></div>
     </div>
     {{> home/side_nav}}
-{{> layout/footer}}
-{{> layout/download_app}}
\ No newline at end of file
+{{> layout/footer_tab}}
+{{> layout/footer}}
\ No newline at end of file

@@ -10,5 +10,5 @@
         <div class="overlay"></div>
     </div>
     {{> home/side_nav}}
+{{> layout/footer_tab}}
 {{> layout/footer}}
-{{> layout/download_app}}
\ No newline at end of file

@@ -21,5 +21,5 @@
         <div class="overlay"></div>
     </div>
     {{> home/side_nav}}
+{{> layout/footer_tab}}
 {{> layout/footer}}
-{{> layout/download_app}}
\ No newline at end of file

@@ -19,5 +19,5 @@
         <div class="overlay"></div>
     </div>
     {{> home/side_nav}}
-{{> layout/footer}}
-{{> layout/download_app}}
\ No newline at end of file
+{{> layout/footer_tab}}
+{{> layout/footer}}
\ No newline at end of file

+{{# showFooterTab}}
+<div class="footer-tab">
+    <div class="tab-item {{#if grilsHomePage}}current{{/if}}{{#if boysHomePage}}current{{/if}}{{#if kidsHomePage}}current{{/if}}{{#if lifestyleHomePage}}current{{/if}}">
+        <p class="iconfont tab-icon">&#xe611;</p>
+        <p class="tab-name">首页</p>
+    </div>
+    <div class="tab-item {{#if categoryPage}}current{{/if}}">
+        <p class="iconfont tab-icon">&#xe611;</p>
+        <p class="tab-name">分类</p>
+    </div>
+    <div class="tab-item {{#if guangHome}}current{{/if}}">
+        <p class="iconfont tab-icon">&#xe611;</p>
+        <p class="tab-name">逛</p>
+    </div>
+    <div class="tab-item {{#if shoppingCartPage}}current{{/if}}">
+        <p class="iconfont tab-icon">&#xe611;</p>
+        <p class="tab-name">购物车</p>
+    </div>
+    <div class="tab-item {{#if minePage}}current{{/if}}">
+        <p class="iconfont tab-icon">&#xe611;</p>
+        <p class="tab-name">我的</p>
+    </div>
+</div>
+{{/ showFooterTab}}
+   
\ No newline at end of file

@@ -27,6 +27,7 @@ class BoysController extends AbstractAction
         $this->_view->display('index', array(
             'boysHomePage' => true,
             'showDownloadApp'=>true,
+            'showFooterTab'=>true,
             'maybeLike' => true,
             'content' => Index\HomeModel::getBoysFloor()
         ));

@@ -27,6 +27,7 @@ class GirlsController extends AbstractAction
         $this->_view->display('index', array(
             'grilsHomePage' => true,
             'showDownloadApp'=>true,
+            'showFooterTab'=>true,
             'maybeLike' => true,
             'content' => Index\HomeModel::getGirlsFloor()
         ));

@@ -27,6 +27,7 @@ class KidsController extends AbstractAction
         $this->_view->display('index', array(
             'kidsHomePage' => true,
             'showDownloadApp'=>true,
+            'showFooterTab'=>true,
             'maybeLike' => true,
             'content' => Index\HomeModel::getKidsFloor()
         ));

@@ -27,6 +27,7 @@ class LifestyleController extends AbstractAction
         $this->_view->display('index', array(
             'lifestyleHomePage' => true,
             'showDownloadApp'=>true,
+            'showFooterTab'=>true,
             'maybeLike' => true,
             'content' => Index\HomeModel::getLifestyleFloor()
         ));