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
hf
2015-10-31 19:50:47 +0800
Commit
23e36bf8c2d7ba393f9577aea28d6208717db563
2 parents
f603dcac
4cd98ea6
Merge branch 'develop' of
http://git.dev.yoho.cn/web/yohobuy
into develop
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
172 additions
and
165 deletions
static/js/index/channel.js
static/js/product/list.js
static/sass/_filter.scss
static/sass/index/_index.scss
template/m.yohobuy.com/actions/product/newsale/new.phtml
template/m.yohobuy.com/actions/product/newsale/sale.phtml
static/js/index/channel.js
View file @
23e36bf
...
...
@@ -4,15 +4,13 @@
* @date: 2015/10/28
*/
var
$
=
require
(
'jquery'
);
var
$searchBox
=
$
(
'.search-box'
),
$indexSearch
=
$
(
'.index-search'
),
$indexLogo
=
$
(
'.index-logo'
);
$searchBox
.
find
(
'input'
).
on
(
'focus'
,
function
()
{
$searchBox
.
find
(
'input'
).
on
(
'focus'
,
function
()
{
$indexLogo
.
css
({
width
:
0
,
display
:
'none'
width
:
0
});
$searchBox
.
css
({
width
:
'12.8rem'
...
...
@@ -21,10 +19,9 @@ $searchBox.find('input').on('focus', function () {
width
:
'15.5rem'
});
$
(
'.clear-text, .no-search'
).
show
();
}).
on
(
'blur'
,
function
()
{
}).
on
(
'blur'
,
function
()
{
$indexLogo
.
css
({
width
:
'5.4rem'
,
display
:
'block'
width
:
'5.4rem'
});
$searchBox
.
css
({
width
:
'8.8rem'
...
...
@@ -34,11 +31,10 @@ $searchBox.find('input').on('focus', function () {
});
$
(
'.clear-text, .no-search'
).
hide
();
});
$searchBox
.
find
(
'.clear-text'
).
click
(
function
()
{
$searchBox
.
find
(
'.clear-text'
).
click
(
function
()
{
$searchBox
.
find
(
'input'
).
val
(
''
).
trigger
(
'focus'
);
});
$searchBox
.
find
(
'.search-icon'
).
click
(
function
()
{
$searchBox
.
find
(
'.search-icon'
).
click
(
function
()
{
$indexSearch
.
submit
();
});
\ No newline at end of file
});
...
...
static/js/product/list.js
View file @
23e36bf
...
...
@@ -398,6 +398,8 @@ if ($brandHeader.length > 0) {
success
:
function
(
data
)
{
if
(
data
.
code
===
200
)
{
$this
.
toggleClass
(
'coled'
);
}
else
if
(
data
.
code
===
400
||
data
.
code
===
412
)
{
tip
.
show
(
'未登录'
);
}
else
{
tip
.
show
(
data
.
message
);
}
...
...
static/sass/_filter.scss
View file @
23e36bf
...
...
@@ -2,7 +2,7 @@
position
:
absolute
;
left
:
0
;
right
:
0
;
top
:
2px
;
top
:
0
;
}
.filter-mask
{
...
...
static/sass/index/_index.scss
View file @
23e36bf
...
...
@@ -13,11 +13,18 @@
font-size
:
50rem
/
$pxConvertRem
;
width
:
216rem
/
$pxConvertRem
;
color
:
#343434
;
overflow
:
hidden
;
transition
:
width
400ms
;
}
.index-search
{
float
:
right
;
position
:
absolute
;
top
:
0
;
right
:
0
;
width
:
384rem
/
$pxConvertRem
;
height
:
112rem
/
$pxConvertRem
;
overflow
:
hidden
;
transition
:
width
400ms
;
.search-box
{
float
:
left
;
position
:
relative
;
...
...
template/m.yohobuy.com/actions/product/newsale/new.phtml
View file @
23e36bf
{
{>
layout/header
}
}
<div
class=
"newarrival-page yoho-page"
>
{
{#
headerBanner
}
}
{
{>
product/banner_swipe_and_single
}
}
{
{/
headerBanner
}
}
<ul
id=
"list-nav"
class=
"list-nav clearfix"
>
<li
id=
"today"
class=
"today active"
>
<a
href=
"javascript:void(0);"
>
</a>
</li>
<li
class=
"week"
>
<a
href=
"javascript:void(0);"
>
本周上新
</a>
</li>
<li
class=
"sale"
>
<a
href=
"javascript:void(0);"
>
销量
</a>
</li>
<li
class=
"filter"
>
<a
href=
"javascript:void(0);"
>
筛选
</a>
<span
class=
"iconfont"
>
613
;</span>
</li>
</ul>
<div
id=
"goods-container"
class=
"goods-container"
>
<div
class=
"container clearfix"
>
{
{#
goods
}
}
{
{>
good
}
}
{
{/
goods
}
}
</div>
<div
class=
"container hide clearfix"
></div>
<div
class=
"container hide clearfix"
></div>
{
{>
filter
}
}
{
{#
headerBanner
}
}
{
{>
product/banner_swipe_and_single
}
}
{
{/
headerBanner
}
}
<ul
id=
"list-nav"
class=
"list-nav clearfix"
>
<li
id=
"today"
class=
"today active"
>
<a
href=
"javascript:void(0);"
>
</a>
</li>
<li
class=
"week"
>
<a
href=
"javascript:void(0);"
>
本周上新
</a>
</li>
<li
class=
"sale"
>
<a
href=
"javascript:void(0);"
>
销量
</a>
</li>
<li
class=
"filter"
>
<a
href=
"javascript:void(0);"
>
筛选
</a>
<span
class=
"iconfont"
>
613
;</span>
</li>
</ul>
<div
id=
"goods-container"
class=
"goods-container"
>
<div
class=
"container clearfix"
>
{
{#
goods
}
}
{
{>
good
}
}
{
{/
goods
}
}
</div>
{
{#if
brand
}
}
<input
id=
"brand"
type=
"hidden"
value=
{
{brand
}
}>
{
{/if
}
}
<div
class=
"container hide clearfix"
></div>
<div
class=
"container hide clearfix"
></div>
{
{>
filter
}
}
</div>
{
{#if
brand
}
}
<input
id=
"brand"
type=
"hidden"
value=
{
{brand
}
}>
{
{/if
}
}
{
{#if
gender
}
}
<input
id=
"gender"
type=
"hidden"
value=
{
{gender
}
}>
{
{/if
}
}
{
{#if
gender
}
}
<input
id=
"gender"
type=
"hidden"
value=
{
{gender
}
}>
{
{/if
}
}
{
{#if
sort
}
}
<input
id=
"sort"
type=
"hidden"
value=
{
{sort
}
}>
{
{/if
}
}
{
{#if
sort
}
}
<input
id=
"sort"
type=
"hidden"
value=
{
{sort
}
}>
{
{/if
}
}
{
{#if
color
}
}
<input
id=
"color"
type=
"hidden"
value=
{
{color
}
}>
{
{/if
}
}
{
{#if
color
}
}
<input
id=
"color"
type=
"hidden"
value=
{
{color
}
}>
{
{/if
}
}
{
{#if
size
}
}
<input
id=
"size"
type=
"hidden"
value=
{
{size
}
}>
{
{/if
}
}
{
{#if
size
}
}
<input
id=
"size"
type=
"hidden"
value=
{
{size
}
}>
{
{/if
}
}
{
{#if
price
}
}
<input
id=
"price"
type=
"hidden"
value=
{
{price
}
}>
{
{/if
}
}
{
{#if
price
}
}
<input
id=
"price"
type=
"hidden"
value=
{
{price
}
}>
{
{/if
}
}
{
{#if
p_d
}
}
<input
id=
"p_d"
type=
"hidden"
value=
{
{p_d
}
}>
{
{/if
}
}
{
{#if
p_d
}
}
<input
id=
"p_d"
type=
"hidden"
value=
{
{p_d
}
}>
{
{/if
}
}
{
{#if
channel
}
}
<input
id=
"channel"
type=
"hidden"
value=
{
{channel
}
}>
{
{/if
}
}
{
{#if
channel
}
}
<input
id=
"channel"
type=
"hidden"
value=
{
{channel
}
}>
{
{/if
}
}
{
{#if
dayLimit
}
}
<input
id=
"dayLimit"
type=
"hidden"
value=
{
{dayLimit
}
}>
{
{/if
}
}
{
{#if
dayLimit
}
}
<input
id=
"dayLimit"
type=
"hidden"
value=
{
{dayLimit
}
}>
{
{/if
}
}
{
{#if
limit
}
}
<input
id=
"limit"
type=
"hidden"
value=
{
{limit
}
}>
{
{/if
}
}
{
{#if
limit
}
}
<input
id=
"limit"
type=
"hidden"
value=
{
{limit
}
}>
{
{/if
}
}
{
{#if
page
}
}
<input
id=
"page"
type=
"hidden"
value=
{
{page
}
}>
{
{/if
}
}
{
{#if
page
}
}
<input
id=
"page"
type=
"hidden"
value=
{
{page
}
}>
{
{/if
}
}
{
{>
product/suspend-cart
}
}
</div>
{
{>
layout/footer
}
}
{
{>
layout/download_app
}
}
\ No newline at end of file
...
...
template/m.yohobuy.com/actions/product/newsale/sale.phtml
View file @
23e36bf
{
{>
layout/header
}
}
<div
class=
"discount-page yoho-page"
>
{
{#
headerBanner
}
}
{
{>
product/banner_swipe_and_single
}
}
{
{/
headerBanner
}
}
<ul
id=
"list-nav"
class=
"list-nav clearfix"
>
<li
class=
"new active"
>
<a
href=
"javascript:void(0);"
>
<span
class=
"spanTest"
>最新</span>
<span
class=
"iconfont cur"
>
616
;</span>
</a>
</li>
<li
class=
"price"
>
<a
href=
"javascript:void(0);"
>
<span
class=
"spanTest"
>价格</span>
<span
class=
"icon"
>
<i
class=
"iconfont up"
>
615
;</i>
<i
class=
"iconfont down cur"
>
616
;</i>
</span>
</a>
</li>
<li
class=
"discount"
>
<a
href=
"javascript:void(0);"
>
<span
class=
"spanTest"
>折扣</span>
<span
class=
"icon"
>
<i
class=
"iconfont up"
>
615
;</i>
<i
class=
"iconfont down cur"
>
616
;</i>
</span>
</a>
</li>
<li
class=
"filter"
>
<a
href=
"javascript:void(0);"
>
<span
class=
"spanTest"
>筛选</span>
<span
class=
"iconfont"
>
613
;</span>
</a>
</li>
</ul>
{
{#
headerBanner
}
}
{
{>
product/banner_swipe_and_single
}
}
{
{/
headerBanner
}
}
<div
id=
"goods-container"
class=
"goods-container"
>
<div
class=
"new-goods container clearfix"
>
{
{#
goods
}
}
{
{>
good
}
}
{
{/
goods
}
}
</div>
<div
class=
"price-goods container hide clearfix"
></div>
<div
class=
"discount-goods container hide clearfix"
></div>
{
{>
filter
}
}
<ul
id=
"list-nav"
class=
"list-nav clearfix"
>
<li
class=
"new active"
>
<a
href=
"javascript:void(0);"
>
<span
class=
"spanTest"
>最新</span>
<span
class=
"iconfont cur"
>
616
;</span>
</a>
</li>
<li
class=
"price"
>
<a
href=
"javascript:void(0);"
>
<span
class=
"spanTest"
>价格</span>
<span
class=
"icon"
>
<i
class=
"iconfont up"
>
615
;</i>
<i
class=
"iconfont down cur"
>
616
;</i>
</span>
</a>
</li>
<li
class=
"discount"
>
<a
href=
"javascript:void(0);"
>
<span
class=
"spanTest"
>折扣</span>
<span
class=
"icon"
>
<i
class=
"iconfont up"
>
615
;</i>
<i
class=
"iconfont down cur"
>
616
;</i>
</span>
</a>
</li>
<li
class=
"filter"
>
<a
href=
"javascript:void(0);"
>
<span
class=
"spanTest"
>筛选</span>
<span
class=
"iconfont"
>
613
;</span>
</a>
</li>
</ul>
<div
id=
"goods-container"
class=
"goods-container"
>
<div
class=
"new-goods container clearfix"
>
{
{#
goods
}
}
{
{>
good
}
}
{
{/
goods
}
}
</div>
{
{#if
brand
}
}
<input
id=
"brand"
type=
"hidden"
value=
{
{brand
}
}>
{
{/if
}
}
<div
class=
"price-goods container hide clearfix"
></div>
<div
class=
"discount-goods container hide clearfix"
></div>
{
{>
filter
}
}
</div>
{
{#if
brand
}
}
<input
id=
"brand"
type=
"hidden"
value=
{
{brand
}
}>
{
{/if
}
}
{
{#if
gender
}
}
<input
id=
"gender"
type=
"hidden"
value=
{
{gender
}
}>
{
{/if
}
}
{
{#if
gender
}
}
<input
id=
"gender"
type=
"hidden"
value=
{
{gender
}
}>
{
{/if
}
}
{
{#if
sort
}
}
<input
id=
"sort"
type=
"hidden"
value=
{
{sort
}
}>
{
{/if
}
}
{
{#if
sort
}
}
<input
id=
"sort"
type=
"hidden"
value=
{
{sort
}
}>
{
{/if
}
}
{
{#if
color
}
}
<input
id=
"color"
type=
"hidden"
value=
{
{color
}
}>
{
{/if
}
}
{
{#if
color
}
}
<input
id=
"color"
type=
"hidden"
value=
{
{color
}
}>
{
{/if
}
}
{
{#if
size
}
}
<input
id=
"size"
type=
"hidden"
value=
{
{size
}
}>
{
{/if
}
}
{
{#if
size
}
}
<input
id=
"size"
type=
"hidden"
value=
{
{size
}
}>
{
{/if
}
}
{
{#if
price
}
}
<input
id=
"price"
type=
"hidden"
value=
{
{price
}
}>
{
{/if
}
}
{
{#if
price
}
}
<input
id=
"price"
type=
"hidden"
value=
{
{price
}
}>
{
{/if
}
}
{
{#if
p_d
}
}
<input
id=
"p_d"
type=
"hidden"
value=
{
{p_d
}
}>
{
{/if
}
}
{
{#if
p_d
}
}
<input
id=
"p_d"
type=
"hidden"
value=
{
{p_d
}
}>
{
{/if
}
}
{
{#if
channel
}
}
<input
id=
"channel"
type=
"hidden"
value=
{
{channel
}
}>
{
{/if
}
}
{
{#if
channel
}
}
<input
id=
"channel"
type=
"hidden"
value=
{
{channel
}
}>
{
{/if
}
}
{
{#if
limit
}
}
<input
id=
"limit"
type=
"hidden"
value=
{
{limit
}
}>
{
{/if
}
}
{
{#if
limit
}
}
<input
id=
"limit"
type=
"hidden"
value=
{
{limit
}
}>
{
{/if
}
}
{
{#if
page
}
}
<input
id=
"page"
type=
"hidden"
value=
{
{page
}
}>
{
{/if
}
}
{
{#if
page
}
}
<input
id=
"page"
type=
"hidden"
value=
{
{page
}
}>
{
{/if
}
}
{
{#if
discount
}
}
<input
id=
"discount"
type=
"hidden"
value=
{
{discount
}
}>
{
{/if
}
}
{
{#if
discount
}
}
<input
id=
"discount"
type=
"hidden"
value=
{
{discount
}
}>
{
{/if
}
}
{
{>
product/suspend-cart
}
}
</div>
{
{>
layout/footer
}
}
{
{>
layout/download_app
}
}
\ No newline at end of file
...
...
Please
register
or
login
to post a comment
