Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -454,18 +454,22 @@ class HomeController extends AbstractAction
     /*
     /*
      * 我的订单页面
      * 我的订单页面
      */
      */
-    public function orderAction(){
-        $type = $this -> get('type',1);
+
+    public function orderAction() {
+        //获得type值
+        $type = $this->get('type', 1);
+        $this->setTitle('我的订单');
+        $this->setNavHeader('我的订单');
         $data = OrderModel::getNavs($type);
         $data = OrderModel::getNavs($type);
-        if(!empty($data)){
+        if (!empty($data)) {
             $order['navs'] = $data;
             $order['navs'] = $data;
         }
         }
         $this->_view->display('order', array(
         $this->_view->display('order', array(
-            'order' => $order
+            'order' => $order,
+            'pageFooter' => true
         ));
         ));
     }
     }
 
 
-    
     //ajax请求订单页面
     //ajax请求订单页面
     public function getOrderAction() {
     public function getOrderAction() {
         //判断是不是ajax请求
         //判断是不是ajax请求
@@ -542,6 +546,7 @@ class HomeController extends AbstractAction
         }
         }
     }
     }
 
 
+
     /**
     /**
      * 订单详情页
      * 订单详情页
      */
      */
@@ -554,9 +559,7 @@ class HomeController extends AbstractAction
             'orderStatus' => '订单取消',
             'orderStatus' => '订单取消',
             'orderNum' => '418358063',
             'orderNum' => '418358063',
             'orderTime' => '2014-03-10 17:25:10',
             'orderTime' => '2014-03-10 17:25:10',
-
             'orderCancel' => true,
             'orderCancel' => true,
-
             'goods' => array(
             'goods' => array(
                 array(
                 array(
                     'id' => 1,
                     'id' => 1,
@@ -578,7 +581,6 @@ class HomeController extends AbstractAction
                     'count' => '1'
                     'count' => '1'
                 )
                 )
             ),
             ),
-
             'sumPrice' => 799,
             'sumPrice' => 799,
             'salePrice' => 80,
             'salePrice' => 80,
             'freight' => 5,
             'freight' => 5,
@@ -588,4 +590,5 @@ class HomeController extends AbstractAction
         );
         );
         $this->_view->display('order-detail', array('orderDetail' => $data, 'orderDetailPage' => true));
         $this->_view->display('order-detail', array('orderDetail' => $data, 'orderDetailPage' => true));
     }
     }
+
 }
 }