Authored by hf

fixes bug to call product detail api and order status

... ... @@ -370,7 +370,7 @@ class AbstractAction extends Controller_Abstract
* 设置网站导航头部信息
*
* @param string $title 头部标题
* @param string $backUrl 返回的链接
* @param mixed $backUrl 返回的链接
* @param string $homeUrl 返回首页的链接
* @return void
*/
... ... @@ -385,6 +385,9 @@ class AbstractAction extends Controller_Abstract
if ($backUrl) {
$header['navBack'] = true;
if (is_string($backUrl)) {
$header['backUrl'] = $backUrl;
}
}
if (!empty($title)) {
$header['navTitle'] = $title;
... ...
... ... @@ -94,10 +94,10 @@ $loginBtn.on('touchstart', function() {
dataType: 'jsonp'
});
//1000ms后跳转页面
//2000ms后跳转页面
setTimeout(function() {
location.href = res.href;
}, 1000);
}, 2000);
} else {
showErrTip(data.message);
}
... ...
... ... @@ -98,10 +98,10 @@ $loginBtn.on('touchstart', function() {
dataType: 'jsonp'
});
//1s后跳转页面
//2s后跳转页面
setTimeout(function() {
location.href = res.href;
}, 1000);
}, 2000);
} else {
showErrTip(data.message);
}
... ...
... ... @@ -635,14 +635,15 @@ class HomeController extends AbstractAction
* 我的订单页面,获得nav导航条焦点。并且异步请求订单详情列表页(getOrders)
*
*/
public function ordersAction()
{
// 审判跳转登录页
$this->auditJumpLogin();
$backUrl = Helpers::url('/home');
$this->setTitle('我的订单');
$this->setNavHeader('我的订单');
$this->setNavHeader('我的订单', $backUrl);
$order = array();
//获得type值,type:1=>全部,2=>待付款,3=>待发货,4=>待收货,5=>待评论
... ... @@ -771,14 +772,13 @@ class HomeController extends AbstractAction
/*
* 我的订单-付款跳转页
*/
public function payAction()
{
// 审判跳转登录页
$this->auditJumpLogin();
$this->setTitle('支付');
$this->setNavHeader('支付');
$this->setTitle('支付中心');
$this->setNavHeader('支付中心');
$orderCode = $this->get('order_code');
if (empty($orderCode)) {
... ... @@ -792,16 +792,16 @@ class HomeController extends AbstractAction
'payLink' => Helpers::url('/shopping/pay/index', array('order_code' => $orderCode, 'payment_type' => 18)),
'appId' => 'alipay',
'app' => '支付宝支付',
'hint' => '需下载支付宝客户端',
'subHint' => '推荐使用',
'hint' => '支付宝钱包支付',
'subHint' => '推荐支付宝用户使用',
),
1 => array(
'appIcon' => '',
'payLink' => '',
'appId' => 'weixin',
'app' => '微信支付',
'hint' => '需下载微信客户端',
'subHint' => '推荐使用',
'hint' => '需安装微信客户端',
'subHint' => '',
),
),
'orderCode' => $orderCode,
... ...
... ... @@ -31,7 +31,7 @@ class DetailModel
if (is_numeric($productId) && is_numeric($goodsId)) {
// 调用服务
$baseInfo = DetailData::baseInfo($productId, $uid);
$baseInfo = DetailData::baseInfo($productId, $uid);
// 判断商品是否在架
if (empty($baseInfo['status'])) {
... ...