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

--Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
++Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2

@@ -528,6 +528,8 @@ class HomeController extends AbstractAction
         $yh_channel = $this->get('yh_channel', 1);
         $yh_channel = $this->get('yh_channel', 1);
         $uid = $this->getUid();
         $uid = $this->getUid();
         $uid = '7566245'; //测试用
         $uid = '7566245'; //测试用
+        $this -> setTitle('我的订单');
+        $this -> setNavHeader('我的订单');
         //调用模型层getOrder方法获得并处理数据
         //调用模型层getOrder方法获得并处理数据
         $data = OrderModel::getOrder($type, $page, $limit, $gender, $yh_channel, $uid);
         $data = OrderModel::getOrder($type, $page, $limit, $gender, $yh_channel, $uid);
         //如果没有订单数据，就给一个随便逛逛链接
         //如果没有订单数据，就给一个随便逛逛链接
@@ -535,13 +537,14 @@ class HomeController extends AbstractAction
         if (!empty($data)) {
         if (!empty($data)) {
             $order['orders'] = $data;
             $order['orders'] = $data;
         } else {
         } else {
-            $order['walkwayUrl'] = 'http://www.baidu.com';
+           $order['walkwayUrl'] = 'http://www.baidu.com';
         }
         }
 
 
         //渲染模板
         //渲染模板
         $this->_view->display('order', array(
         $this->_view->display('order', array(
             'order' => $order,
             'order' => $order,
-            'orderPage' => true
+            'orderPage' => true,
+            'pageFooter' => true
         ));
         ));
     }
     }
 
 

@@ -57,9 +57,13 @@ class OrderModel
                             case 0:
                             case 0:
                                 $result[$key]['unpaid'] = true;
                                 $result[$key]['unpaid'] = true;
                                 break;
                                 break;
-                            case 1 || 2 || 3 || 4 || 5:
+                            case 1:
+                            case 2:
+                            case 3:
+                            case 4:
+                            case 5:
                                 $result[$key]['unreceived'] = true;
                                 $result[$key]['unreceived'] = true;
-                                $resault[$key]['logisticsUrl'] = "暂无logisticsUrl数据";
+                                $result[$key]['logisticsUrl'] = "暂无logisticsUrl数据";
                                 break;
                                 break;
                             case 6:
                             case 6:
                                 $result[$key]['completed'] = true;
                                 $result[$key]['completed'] = true;