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
Rock Zhang
9 years ago
Commit
78c12c3c186bc68a280d980cef5c760f214ba357
2 parents
44234ea1
77a6cabd
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
27 deletions
static/js/me/fav.js
static/js/me/index.js
static/js/product/detail/desc.js
static/sass/me/_home.scss
static/sass/me/_suggest.scss
template/m.yohobuy.com/actions/index/home/suggest.phtml
static/js/me/fav.js
View file @
78c12c3
...
...
@@ -233,4 +233,10 @@ function scrollHandler() {
}
//srcoll to load more
$
(
window
).
scroll
(
scrollHandler
);
\ No newline at end of file
$
(
window
).
scroll
(
scrollHandler
);
$
(
document
).
on
(
'touchend'
,
'.swiper-header'
,
function
()
{
var
url
=
$
(
this
).
find
(
'.fav-more'
).
attr
(
'href'
);
window
.
location
.
href
=
url
;
});
...
...
static/js/me/index.js
View file @
78c12c3
...
...
@@ -19,9 +19,9 @@ myImage.onload = function() {
$userAvatar
.
css
(
'background-image'
,
'url('
+
avatar
+
')'
);
};
$
(
'.yoho-page'
).
on
(
'touchstart'
,
'.list-item, .type-item'
,
function
()
{
$
(
'.yoho-page'
).
on
(
'touchstart'
,
'.list-item, .type-item
, .order-title
'
,
function
()
{
$listItem
.
removeClass
(
'highlight'
);
$
(
this
).
addClass
(
'highlight'
);
}).
on
(
'touchend touchcancel'
,
'.list-item, .type-item'
,
function
()
{
}).
on
(
'touchend touchcancel'
,
'.list-item, .type-item
, .order-title
'
,
function
()
{
$
(
this
).
removeClass
(
'highlight'
);
});
...
...
static/js/product/detail/desc.js
View file @
78c12c3
...
...
@@ -50,9 +50,13 @@ function hiddenTips($ele) {
//}
function
wrapElements
(
selector
,
count
)
{
var
elArr
=
null
;
$
(
selector
).
each
(
function
(
idx
,
el
)
{
if
(
idx
%
count
===
0
)
{
$
(
$
(
selector
).
slice
(
idx
,
idx
+
count
)).
wrapAll
(
$
(
'<div class="js-wraper"></div>'
));
elArr
=
$
(
selector
).
slice
(
idx
,
idx
+
count
);
if
(
elArr
.
length
===
count
&&
idx
%
count
===
0
)
{
$
(
elArr
).
wrapAll
(
$
(
'<div class="js-wraper"></div>'
));
}
});
}
...
...
static/sass/me/_home.scss
View file @
78c12c3
...
...
@@ -136,6 +136,10 @@
color
:
#e0e0e0
;
float
:
right
;
}
&
.highlight
{
background
:
#eee
;
}
}
.order-type
{
...
...
static/sass/me/_suggest.scss
View file @
78c12c3
...
...
@@ -141,23 +141,15 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
border-top
:
pxToRem
(
30px
)
solid
#f0f0f0
;
border-bottom
:
pxToRem
(
30px
)
solid
#f0f0f0
;
position
:
relative
;
&
:after
{
content
:
''
;
width
:
100%
;
height
:
1px
;
border-top
:
1px
solid
#e0e0e0
;
position
:
absolute
;
left
:
0
;
top
:
0
;
.list-item
{
padding
:
0
pxToRem
(
35px
);
}
&
:before
{
content
:
''
;
width
:
100%
;
height
:
1px
;
border-bottom
:
1px
solid
#e0e0e0
;
position
:
absolute
;
left
:
0
;
bottom
:
0
;
.new-right
{
float
:
right
;
margin-left
:
pxToRem
(
40px
);
color
:
#e0e0e0
;
}
a
{
...
...
@@ -165,10 +157,6 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
display
:
inline-block
;
}
>
span
{
color
:
#b0b0b0
;
font-size
:
pxToRem
(
26px
);
}
}
}
...
...
template/m.yohobuy.com/actions/index/home/suggest.phtml
View file @
78c12c3
...
...
@@ -7,8 +7,8 @@
</h
2
>
<div
class=
"create-new-suggest"
>
<a
href=
"./suggestSub"
>
反馈问题<span>(功能意见,界面意见)</span>
<a
class=
"list-item"
href=
"./suggestSub"
>
反馈问题
(功能意见,界面意见)<span
class=
"iconfont new-right"
>
604
;</span>
</a>
</div>
...
...
Please
register
or
login
to post a comment