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
uedxwg
9 years ago
Commit
44559b51e60108df792b519082093276a97363f2
2 parents
e7d1d6cd
662d0569
Merge branch 'develop' of
http://git.dev.yoho.cn/web/yohobuy
into develop
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
10 deletions
static/js/common.js
static/js/home/home.js
static/sass/home/_hot-brands.scss
static/sass/index/_index.scss
template/m.yohobuy.com/partials/layout/footer.phtml
static/js/common.js
View file @
44559b5
...
...
@@ -119,7 +119,7 @@ function rePosFooter() {
//未登录
$op
.
prepend
(
'<a href="/signin.html">登录</a>'
+
'<a href="/signin.html
?refer='
+
location
.
href
+
'
">登录</a>'
+
'<span class="sep-line">|</span>'
+
'<a href="/reg.html">注册</a>'
);
...
...
static/js/home/home.js
View file @
44559b5
...
...
@@ -215,6 +215,7 @@ $('#yoho-footer').css({
//set cookie
exports
.
set
=
function
(
c
)
{
window
.
setCookie
(
'_Channel'
,
c
,
{
expires
:
365
expires
:
365
,
domain
:
'.m.yohobuy.com'
});
};
\ No newline at end of file
...
...
static/sass/home/_hot-brands.scss
View file @
44559b5
.hot-brands
{
background
:
#f0f0f0
;
border-bottom
:
1px
solid
#e0e0e0
;
background
:
#fff
;
.floor-header
{
background
:
#f0f0f0
;
margin
:
0
;
padding
:
29rem
/
$pxConvertRem
30rem
/
$pxConvertRem
0
;
border
:
0
;
h2
{
border
:
1px
solid
#e0e0e0
;
background
:
#fff
;
border-bottom
:
0
;
}
}
a
{
display
:
block
;
...
...
@@ -8,10 +21,6 @@
height
:
100%
;
}
>
*
{
background
:
#fff
;
}
.brand
{
float
:
left
;
width
:
158rem
/
$pxConvertRem
;
...
...
static/sass/index/_index.scss
View file @
44559b5
...
...
@@ -50,7 +50,7 @@
top
:
20rem
/
$pxConvertRem
;
width
:
352rem
/
$pxConvertRem
;
height
:
56rem
/
$pxConvertRem
;
padding-right
:
4
0rem
/
$pxConvertRem
;
padding-right
:
8
0rem
/
$pxConvertRem
;
z-index
:
1
;
transition
:
width
400ms
;
box-sizing
:
border-box
;
...
...
@@ -59,7 +59,7 @@
}
input
{
float
:
left
;
width
:
100
%
;
width
:
96
%
;
font-size
:
28rem
/
$pxConvertRem
;
padding
:
10rem
/
$pxConvertRem
;
color
:
#999
;
...
...
template/m.yohobuy.com/partials/layout/footer.phtml
View file @
44559b5
...
...
@@ -13,7 +13,7 @@
{
{/if
}
}
{
{#if
testEnv
}
}
<script
src=
"http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/lib.js"
></script>
<script
src=
"http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/index.js"
></script>
<script
src=
"http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/index
-debug
.js"
></script>
{
{/if
}
}
{
{#if
devEnv
}
}
<script
src=
"http://localhost:8000/static/js/sea.js?nowrap"
></script>
...
...
Please
register
or
login
to post a comment