Merge branch 'feature/wxheader' into release/5.2

@@ -55,5 +55,6 @@
     {{/if}}
     <input id="cartType" type="hidden" value="{{cartType}}">
     {{/ shoppingCart}}
+    {{> layout/footer_tab}}
 </div>
 {{> layout/footer}}

 {{> layout/main_header}}
-{{> layout/page_header}}
\ No newline at end of file
+{{#unless isWechat}}
+	{{> layout/page_header}}
+{{/unless}}

@@ -52,7 +52,9 @@ class IndexController extends AbstractAction
     public function indexAction()
     {
         $this->setTitle('购物车');
-        $this->setNavHeader('购物车', true, '');
+        //$this->setNavHeader('购物车', true, '');
+        // 显示底部TAB
+        $this->setNavFooterTab();
 
         $shoppingKey = Helpers::getShoppingKeyByCookie();
         $uid = $this->getUid(true);