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
ccbikai
2015-11-01 18:33:37 +0800
Commit
49f2b8e158e5c8d487f85bcdc7ae142dd7715d63
2 parents
5d2f7e18
a10f340b
Merge branch 'develop' of
http://git.dev.yoho.cn/web/yohobuy
into develop
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
3 deletions
framework
static/js/home/maybe-like.js
static/js/product/newsale/discount.js
static/js/product/newsale/newarrival.js
framework
@
119c247f
Subproject commit
75bbc3b075de19f239532f60c5995d06c5f814e2
Subproject commit
119c247f5cf929aa1e059e40609bb16dd6b58f05
...
...
static/js/home/maybe-like.js
View file @
49f2b8e
...
...
@@ -80,7 +80,7 @@ function search() {
},
success
:
function
(
data
)
{
if
(
data
===
' '
)
{
loading
=
tru
e
;
loading
=
fals
e
;
if
(
gender
)
{
if
(
gender
===
'1,3'
)
{
url
=
'/boys/bottomBanner'
;
...
...
static/js/product/newsale/discount.js
View file @
49f2b8e
...
...
@@ -196,6 +196,7 @@ function search(opt) {
}
if
(
data
===
' '
)
{
searching
=
false
;
nav
.
end
=
true
;
if
(
nav
.
reload
)
{
...
...
static/js/product/newsale/newarrival.js
View file @
49f2b8e
...
...
@@ -225,8 +225,8 @@ function search(opt) {
}
if
(
data
===
' '
)
{
searching
=
false
;
nav
.
end
=
true
;
if
(
nav
.
reload
)
{
$container
.
html
(
noResult
);
}
...
...
Please
register
or
login
to post a comment