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

@@ -48,7 +48,7 @@ class HomeController extends AbstractAction
             'showDownloadApp' => true,
             'pageFooter' => true,
             'cartUrl' => Helpers::url('/cart/index/index', null),
-            'signinUrl' => Helpers::url('/signin.html', array('refer' => Helpers::url('/home')) ),
+            'signinUrl' => Helpers::url('/signin.html', array('refer' => Helpers::url('/home'))),
         );
         $uid = $this->getUid(false);
         if ($uid) {
@@ -832,71 +832,49 @@ class HomeController extends AbstractAction
      */
     public function orderDetailAction()
     {
-        $data = array(
-            'name' => '毛毛莉Lydia',
-            'phoneNum' => '18600001133',
-            'address' => '南京市建邺区嘉陵江东街18号国家广告产业园5栋17楼',
-            'orderStatus' => '订单取消',
-            'orderNum' => '418358063',
-            'orderTime' => '2014-03-10 17:25:10',
-            'orderCancel' => true,
-            'goods' => array(
-                array(
-                    'id' => 1,
-                    'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                    'name' => 'Adidas Originals ZX FLUXM22508',
-                    'color' => '黄',
-                    'size' => '43',
-                    'price' => '699.00',
-                    'count' => '2'
-                ),
-                array(
-                    'id' => 1,
-                    'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/11/04/05/0188f1aca49ac478a565ec029b5d2d4a6c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                    'name' => 'B.Duck浴室玩伴mini浮水鸭',
-                    'gift' => true,
-                    'color' => '黄',
-                    'size' => '43',
-                    'price' => '0.00',
-                    'count' => '1'
-                )
-            ),
-            'sumPrice' => 799,
-            'salePrice' => 80,
-            'freight' => 5,
-            'coupon' => 0,
-            'yohoCoin' => 5,
-            'price' => 719
-        );
-        $this->_view->display('order-detail', array('orderDetail' => $data, 'orderDetailPage' => true));
+        // 审判跳转登录页
+        $this->auditJumpLogin();
+
+        $orderCode = $this->get('order_code');
+        if (empty($orderCode)) {
+            $this->error();
+        }
+
+        $this->setTitle('订单详情');
+        $this->setNavHeader('订单详情');
+
+        $this->_view->display('order-detail', array(
+            'orderDetailPage' => true,
+            'orderDetail' => OrderModel::orderDetail($orderCode, $this->_uid, $this->_session),
+        ));
     }
 
-   /**
-    * 帮助列表页
-    */
+    /**
+     * 帮助列表页
+     */
     public function helpAction()
-    {   
-        $service = Home\HelpModel::serviceInfo();
+    {
         $this->setTitle('帮助中心');
         $this->setNavHeader('帮助中心');
         $data = array(
-            'iHelp' =>$service,
+            'iHelp' => Home\HelpModel::serviceInfo(),
         );
         $this->_view->display('i-help', $data);
     }
 
     /**
-    * 帮助列表页
-    */
-   public function helpDetailAction()
-   {
-       $this->setTitle('帮助中心');
-       $this->setNavHeader('帮助中心');
-       $data = array(
-           'iHelp' => array(
-               array('name' => '新用户注册'),
-           )
-       );
-       $this->_view->display('helpDetail', $data);
-   }
+     * 帮助列表页
+     */
+    public function helpDetailAction()
+    {
+        $this->setTitle('帮助中心');
+        $this->setNavHeader('帮助中心');
+        $data = array(
+            'iHelp' => array(
+                array('name' => '新用户注册'),
+            )
+        );
+        $this->_view->display('helpDetail', $data);
+    }
+
 }

@@ -80,7 +80,7 @@ class OrderModel
                 $result[$key]['sumCost'] = $vo['amount'];
                 //类内调用格式化订单商品数据方法
                 $result[$key]['goods'] = Helpers::formatOrderGoods($vo['order_goods'], $count);
-                $result[$key]['detailUrl'] = Helpers::url('/home/orders/detail', array('order_code' => $vo['order_code'], 't' => time()));
+                $result[$key]['detailUrl'] = Helpers::url('/home/orderDetail', array('order_code' => $vo['order_code']));
                 $result[$key]['count'] = $count;
             }
         }

@@ -237,7 +237,6 @@ class DetailModel
             // 显示加入购物车链接
             if (!$soldOut && !$notForSale) {
                 $result['cartInfo']['addToCartUrl'] = Helpers::url('/product/buy_' . $productId . '_' . $goodsId . '.html');
-
                 $result['cartInfo']['productId'] = $productId;
                 $result['cartInfo']['thumb'] = $coverImage;
                 $result['cartInfo']['name'] = isset($result['goodsName']) ? $result['goodsName'] : '';