Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHO-ACTIVITY-PHP
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
biao
9 years ago
Commit
2082a056d337e72b00c3e45ec7bf5116c6ea7e39
2 parents
2bda7f4d
70eb7364
Merge branch 'develop/wap' of
http://git.dev.yoho.cn/web/yohobuy
into develop/wap
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
yohobuy/m.yohobuy.com/application/modules/Cart/controllers/Index.php
yohobuy/m.yohobuy.com/application/modules/Cart/controllers/Index.php
View file @
2082a05
...
...
@@ -306,13 +306,10 @@ class IndexController extends AbstractAction
if
(
isset
(
$order
[
'cartUrl'
]))
{
// 普通或者预售商品为空时
$this
->
go
(
$order
[
'cartUrl'
]);
}
if
(
isset
(
$order
[
'error'
]))
{
// 限购商品支付接口返回为空或错误时
if
(
$this
->
isAjax
())
{
$this
->
echoJson
(
$order
);
return
;
}
else
{
$this
->
error
();
}
if
(
$this
->
isAjax
())
{
// 限购商品支付接口返回为空或错误时(异步请求)
$this
->
echoJson
(
$order
);
return
;
}
$data
=
array
(
...
...
Please
register
or
login
to post a comment