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

@@ -188,7 +188,7 @@ class HomeController extends AbstractAction
      */
      */
     public function currencyAction() {
     public function currencyAction() {
         $this->setTitle('YOHO币');
         $this->setTitle('YOHO币');
-	    $this->setNavHeader('优惠券', true, SITE_MAIN);
+        $this->setNavHeader('优惠券', true, SITE_MAIN);
 
 
         $uid = 967016;
         $uid = 967016;
         $currency = \Index\UserModel::getYohoCoinData($uid);
         $currency = \Index\UserModel::getYohoCoinData($uid);
@@ -463,7 +463,11 @@ class HomeController extends AbstractAction
         $data = OrderModel::getNavs($type);
         $data = OrderModel::getNavs($type);
         if (!empty($data)) {
         if (!empty($data)) {
             $order['navs'] = $data;
             $order['navs'] = $data;
+            $order['orderPage'] = true;
+        } else {
+            $this->error();
         }
         }
+
         $this->_view->display('order', array(
         $this->_view->display('order', array(
             'order' => $order,
             'order' => $order,
             'pageFooter' => true
             'pageFooter' => true
@@ -490,14 +494,11 @@ class HomeController extends AbstractAction
         $order = array();
         $order = array();
         if (!empty($data)) {
         if (!empty($data)) {
             $order['orders'] = $data;
             $order['orders'] = $data;
-            $order['orderPage'] = true;
         } else {
         } else {
             $order['walkwayUrl'] = 'http://www.baidu.com';
             $order['walkwayUrl'] = 'http://www.baidu.com';
-            $order['orderPage'] = true;
         }
         }
-        print_r($order);
         //渲染模板
         //渲染模板
-        $this->_view->display('order-content',$order);
+        $this->_view->display('order-content', $order);
     }
     }
 
 
     /*
     /*
@@ -545,12 +546,10 @@ class HomeController extends AbstractAction
         }
         }
     }
     }
 
 
-
     /**
     /**
      * 订单详情页
      * 订单详情页
      */
      */
-    public function orderDetailAction()
-    {
+    public function orderDetailAction() {
         $data = array(
         $data = array(
             'name' => '毛毛莉Lydia',
             'name' => '毛毛莉Lydia',
             'phoneNum' => '18600001133',
             'phoneNum' => '18600001133',