Authored by hf

code review by hf: merge zhaobiao order logistic

... ... @@ -670,7 +670,7 @@ class HomeController extends AbstractAction
$uid = $this->getUid(true);
$gender = Helpers::getGenderByCookie();
$channel = Helpers::getChannelByCookie();
$data = OrderModel::getOrder($type, $page, 10, $gender, $channel, 6315793);
$data = OrderModel::getOrder($type, $page, 10, $gender, $channel, $uid);
/* 如果取不到订单数据时,分两种情况:
1、page>1时,echo一个空格字符串到浏览器。
2、page=1时,就给一个随便逛逛的链接。
... ... @@ -768,10 +768,12 @@ class HomeController extends AbstractAction
'payAppInfo' => array(
0 => array(
'appIcon' => '',
'weixin' => true,
'app' => '微信支付',
'hint' => '需下载微信客户端',
'subHint' => '推荐使用',
),
),
));
}
... ...
... ... @@ -203,7 +203,7 @@ class DetailModel
// 悬浮的购物车信息
$result['cartInfo'] = array(
'cartUrl' => Helpers::url('/shoppingCart'),
'cartUrl' => Helpers::url('/product/buy_' . $productId . '_' . $goodsId . '.html'),
'numInCart' => 0,
'goodsInstore' => $baseInfo['storage'],
);
... ...