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

@@ -341,9 +341,9 @@ class HomeController extends AbstractAction
      * 意见反馈
      */
     public function suggestAction() {
-	    // 设置网站标题
-	    $this->setTitle('意见反馈');
-	    $this->setNavHeader('意见反馈', true, SITE_MAIN);
+        // 设置网站标题
+        $this->setTitle('意见反馈');
+        $this->setNavHeader('意见反馈', true, SITE_MAIN);
 
         $udid = $this->getUdid();
         $page = $this->get('page', 1);
@@ -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);
-        if(!empty($data)){
+        if (!empty($data)) {
             $order['navs'] = $data;
         }
         $this->_view->display('order', array(
-            'order' => $order
+            'order' => $order,
+            'pageFooter' => true
         ));
     }
-    
-    
+
     //ajax请求订单页面
     public function getOrderAction() {
         //判断是不是ajax请求
@@ -485,11 +489,11 @@ class HomeController extends AbstractAction
         //如果没有订单数据，就给一个随便逛逛链接
         //print_r($data);
         $order = array();
-         if (!empty($data)) {
-             $order['orders'] = $data;
-         } else {
+        if (!empty($data)) {
+            $order['orders'] = $data;
+        } else {
             $order['walkwayUrl'] = 'http://www.baidu.com';
-         }
+        }
         //渲染模板
         $this->_view->display('orderContent', array(
             'order' => $order,
@@ -542,6 +546,7 @@ class HomeController extends AbstractAction
         }
     }
 
+
     /**
      * 订单详情页
      */
@@ -554,9 +559,7 @@ class HomeController extends AbstractAction
             'orderStatus' => '订单取消',
             'orderNum' => '418358063',
             'orderTime' => '2014-03-10 17:25:10',
-
             'orderCancel' => true,
-
             'goods' => array(
                 array(
                     'id' => 1,
@@ -578,7 +581,6 @@ class HomeController extends AbstractAction
                     'count' => '1'
                 )
             ),
-
             'sumPrice' => 799,
             'salePrice' => 80,
             'freight' => 5,
@@ -588,4 +590,5 @@ class HomeController extends AbstractAction
         );
         $this->_view->display('order-detail', array('orderDetail' => $data, 'orderDetailPage' => true));
     }
+
 }