Toggle navigation
Toggle navigation
This project
Loading...
Sign in
wangshusheng
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to dashboard
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
2016-02-03 17:38:51 +0800
Commit
40a2589db7165ae482c50f1ff2fc48895f752486
2 parents
cb758df9
506c75fb
Merge branch 'develop/wap' of
http://git.dev.yoho.cn/web/yohobuy
into develop/wap
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
13 deletions
static/js/common.js
static/js/home/home.js
static/sass/layout/_header.scss
static/sass/me/_home.scss
static/sass/me/_logistic.scss
template/m.yohobuy.com/actions/index/home/index.phtml
static/js/common.js
View file @
40a2589
...
...
@@ -219,9 +219,9 @@ $yohoPage.on('touchstart', '.tap-hightlight', function() {
$
(
this
).
removeClass
(
'highlight'
);
});
// $('.nav-home').on('touchstart', function() {
// $('.homebuttom').toggleClass('none');
// });
$
(
'.nav-home'
).
on
(
'touchstart'
,
function
()
{
$
(
'.homebuttom'
).
toggleClass
(
'none'
);
});
(
function
()
{
var
lastTime
=
0
,
...
...
static/js/home/home.js
View file @
40a2589
...
...
@@ -63,7 +63,7 @@ $sideNav.on('touchstart', 'li', function(e) {
});
$sideNav
.
on
(
'touchmove'
,
function
(
e
)
{
e
.
stopPropagation
()
;
return
false
;
});
//返回一级导航,收起二级导航
...
...
static/sass/layout/_header.scss
View file @
40a2589
...
...
@@ -126,7 +126,7 @@
width
:
100%
;
height
:
90rem
/
$pxConvertRem
;
overflow
:
hidden
;
border-top
:
1px
solid
#fff
;
border-top
:
1px
solid
rgba
(
255
,
255
,
255
,
0
.5
)
;
color
:
#fff
;
&
.boys
{
...
...
static/sass/me/_home.scss
View file @
40a2589
...
...
@@ -97,7 +97,7 @@
float
:
left
;
color
:
#fff
;
font-size
:
pxToRem
(
28px
);
width
:
pxToRem
(
320
px
);
width
:
pxToRem
(
212
px
);
// width: pxToRem(213px); 三栏宽度
&
.highlight
{
...
...
static/sass/me/_logistic.scss
View file @
40a2589
...
...
@@ -62,8 +62,6 @@ $border_color_light: #eee;
background-color
:
#fff
;
padding-left
:
40rem
/
$pxConvertRem
;
font-size
:
40rem
/
$pxConvertRem
;
color
:
#4f4f4f
;
}
.detail
{
...
...
template/m.yohobuy.com/actions/index/home/index.phtml
View file @
40a2589
...
...
@@ -28,14 +28,10 @@
{
{#isLogin
}
}
{
{brand_favorite_total
}
}
{
{/isLogin
}
}
<p>收藏的品牌</p>
</a>
{
{!
<a
class=
"link-item tap-hightlight"
href=
"/home/record"
>
<!--
product_browse
-->
{
{#isLogin
}
}
{
{product_browse
}
}
{
{/isLogin
}
}
<p>浏览记录</p>
</a>
}}
</div>
<div
class=
"my-order"
>
<a
class=
"order-title"
href=
"/home/orders"
>
...
...
Please
register
or
login
to post a comment