Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
2
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
梁志锋
9 years ago
Commit
fdb114032bf14f9816a41fcc1651f52ddc1c54bb
2 parents
609034a7
4fd21c8d
Merge branch 'develop' of
http://git.dev.yoho.cn/web/yohobuy
into develop
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
static/js/cart/cart.js
yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Login.php
static/js/cart/cart.js
View file @
fdb1140
...
...
@@ -16,7 +16,7 @@ var $cartContent = $('.cart-content');
var
navHammer
,
cartType
=
$
(
'#cartType'
).
val
();
var
hasChecked
=
$
(
'.cart-
goods
.icon-cb-checked'
).
length
>
0
?
true
:
false
;
//是否有选中商品
var
hasChecked
=
$
(
'.cart-
content:not(.hide)
.icon-cb-checked'
).
length
>
0
?
true
:
false
;
//是否有选中商品
require
(
'./good'
);
...
...
yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Login.php
View file @
fdb1140
...
...
@@ -227,8 +227,7 @@ class LoginController extends AbstractAction
}
//判定是否需要绑定手机号
$isBind
=
$result
[
'data'
][
'is_bind'
];
if
(
$isBind
==
'N'
)
{
if
(
isset
(
$result
[
'data'
][
'is_bind'
])
&&
$result
[
'data'
][
'is_bind'
]
==
'N'
)
{
$this
->
go
(
Helpers
::
url
(
'/passport/bind/index'
,
array
(
'openId'
=>
$access
[
'openid'
],
'sourceType'
=>
'qq'
,
'nickname'
=>
$partnerInfo
[
'nickname'
])));
}
...
...
@@ -264,8 +263,7 @@ class LoginController extends AbstractAction
$result
=
LoginData
::
signinByOpenID
(
$partnerInfo
[
'screen_name'
],
$access
[
'uid'
],
'sina'
);
}
//判定是否需要绑定手机号
$isBind
=
$result
[
'data'
][
'is_bind'
];
if
(
$isBind
==
'N'
)
{
if
(
isset
(
$result
[
'data'
][
'is_bind'
])
&&
$result
[
'data'
][
'is_bind'
]
==
'N'
)
{
$this
->
go
(
Helpers
::
url
(
'/passport/bind/index'
,
array
(
'openId'
=>
$access
[
'uid'
],
'sourceType'
=>
'sina'
,
'nickname'
=>
$partnerInfo
[
'screen_name'
])));
}
...
...
Please
register
or
login
to post a comment