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

@@ -487,18 +487,17 @@ class HomeController extends AbstractAction
         //调用模型层getOrder方法获得并处理数据
         //调用模型层getOrder方法获得并处理数据
         $data = OrderModel::getOrder($type, $page, $limit, $gender, $yh_channel, $uid);
         $data = OrderModel::getOrder($type, $page, $limit, $gender, $yh_channel, $uid);
         //如果没有订单数据，就给一个随便逛逛链接
         //如果没有订单数据，就给一个随便逛逛链接
-        //print_r($data);
         $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('orderContent', array(
-            'order' => $order,
-            'orderPage' => true,
-        ));
+        $this->_view->display('order-content',$order);
     }
     }
 
 
     /*
     /*