Authored by hf

code review by hf: do reset order detail page code

@@ -48,7 +48,7 @@ class HomeController extends AbstractAction @@ -48,7 +48,7 @@ class HomeController extends AbstractAction
48 'showDownloadApp' => true, 48 'showDownloadApp' => true,
49 'pageFooter' => true, 49 'pageFooter' => true,
50 'cartUrl' => Helpers::url('/cart/index/index', null), 50 'cartUrl' => Helpers::url('/cart/index/index', null),
51 - 'signinUrl' => Helpers::url('/signin.html', array('refer' => Helpers::url('/home')) ), 51 + 'signinUrl' => Helpers::url('/signin.html', array('refer' => Helpers::url('/home'))),
52 ); 52 );
53 $uid = $this->getUid(false); 53 $uid = $this->getUid(false);
54 if ($uid) { 54 if ($uid) {
@@ -832,43 +832,21 @@ class HomeController extends AbstractAction @@ -832,43 +832,21 @@ class HomeController extends AbstractAction
832 */ 832 */
833 public function orderDetailAction() 833 public function orderDetailAction()
834 { 834 {
835 - $data = array(  
836 - 'name' => '毛毛莉Lydia',  
837 - 'phoneNum' => '18600001133',  
838 - 'address' => '南京市建邺区嘉陵江东街18号国家广告产业园5栋17楼',  
839 - 'orderStatus' => '订单取消',  
840 - 'orderNum' => '418358063',  
841 - 'orderTime' => '2014-03-10 17:25:10',  
842 - 'orderCancel' => true,  
843 - 'goods' => array(  
844 - array(  
845 - 'id' => 1,  
846 - 'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
847 - 'name' => 'Adidas Originals ZX FLUXM22508',  
848 - 'color' => '黄',  
849 - 'size' => '43',  
850 - 'price' => '699.00',  
851 - 'count' => '2'  
852 - ),  
853 - array(  
854 - 'id' => 1,  
855 - 'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/11/04/05/0188f1aca49ac478a565ec029b5d2d4a6c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
856 - 'name' => 'B.Duck浴室玩伴mini浮水鸭',  
857 - 'gift' => true,  
858 - 'color' => '黄',  
859 - 'size' => '43',  
860 - 'price' => '0.00',  
861 - 'count' => '1'  
862 - )  
863 - ),  
864 - 'sumPrice' => 799,  
865 - 'salePrice' => 80,  
866 - 'freight' => 5,  
867 - 'coupon' => 0,  
868 - 'yohoCoin' => 5,  
869 - 'price' => 719  
870 - );  
871 - $this->_view->display('order-detail', array('orderDetail' => $data, 'orderDetailPage' => true)); 835 + // 审判跳转登录页
  836 + $this->auditJumpLogin();
  837 +
  838 + $orderCode = $this->get('order_code');
  839 + if (empty($orderCode)) {
  840 + $this->error();
  841 + }
  842 +
  843 + $this->setTitle('订单详情');
  844 + $this->setNavHeader('订单详情');
  845 +
  846 + $this->_view->display('order-detail', array(
  847 + 'orderDetailPage' => true,
  848 + 'orderDetail' => OrderModel::orderDetail($orderCode, $this->_uid, $this->_session),
  849 + ));
872 } 850 }
873 851
874 /** 852 /**
@@ -876,11 +854,10 @@ class HomeController extends AbstractAction @@ -876,11 +854,10 @@ class HomeController extends AbstractAction
876 */ 854 */
877 public function helpAction() 855 public function helpAction()
878 { 856 {
879 - $service = Home\HelpModel::serviceInfo();  
880 $this->setTitle('帮助中心'); 857 $this->setTitle('帮助中心');
881 $this->setNavHeader('帮助中心'); 858 $this->setNavHeader('帮助中心');
882 $data = array( 859 $data = array(
883 - 'iHelp' =>$service, 860 + 'iHelp' => Home\HelpModel::serviceInfo(),
884 ); 861 );
885 $this->_view->display('i-help', $data); 862 $this->_view->display('i-help', $data);
886 } 863 }
@@ -899,4 +876,5 @@ class HomeController extends AbstractAction @@ -899,4 +876,5 @@ class HomeController extends AbstractAction
899 ); 876 );
900 $this->_view->display('helpDetail', $data); 877 $this->_view->display('helpDetail', $data);
901 } 878 }
  879 +
902 } 880 }
@@ -80,7 +80,7 @@ class OrderModel @@ -80,7 +80,7 @@ class OrderModel
80 $result[$key]['sumCost'] = $vo['amount']; 80 $result[$key]['sumCost'] = $vo['amount'];
81 //类内调用格式化订单商品数据方法 81 //类内调用格式化订单商品数据方法
82 $result[$key]['goods'] = Helpers::formatOrderGoods($vo['order_goods'], $count); 82 $result[$key]['goods'] = Helpers::formatOrderGoods($vo['order_goods'], $count);
83 - $result[$key]['detailUrl'] = Helpers::url('/home/orders/detail', array('order_code' => $vo['order_code'], 't' => time())); 83 + $result[$key]['detailUrl'] = Helpers::url('/home/orderDetail', array('order_code' => $vo['order_code']));
84 $result[$key]['count'] = $count; 84 $result[$key]['count'] = $count;
85 } 85 }
86 } 86 }
@@ -237,7 +237,6 @@ class DetailModel @@ -237,7 +237,6 @@ class DetailModel
237 // 显示加入购物车链接 237 // 显示加入购物车链接
238 if (!$soldOut && !$notForSale) { 238 if (!$soldOut && !$notForSale) {
239 $result['cartInfo']['addToCartUrl'] = Helpers::url('/product/buy_' . $productId . '_' . $goodsId . '.html'); 239 $result['cartInfo']['addToCartUrl'] = Helpers::url('/product/buy_' . $productId . '_' . $goodsId . '.html');
240 -  
241 $result['cartInfo']['productId'] = $productId; 240 $result['cartInfo']['productId'] = $productId;
242 $result['cartInfo']['thumb'] = $coverImage; 241 $result['cartInfo']['thumb'] = $coverImage;
243 $result['cartInfo']['name'] = isset($result['goodsName']) ? $result['goodsName'] : ''; 242 $result['cartInfo']['name'] = isset($result['goodsName']) ? $result['goodsName'] : '';