Toggle navigation
Toggle navigation
This project
Loading...
Sign in
chenchao
/
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
xuqi
2015-12-22 05:25:21 +0800
Commit
a341d1c08bf4215e0802dc09c1377119543cdafd
2 parents
ad16c80c
40d7ce92
Merge branch 'develop' of
http://git.dev.yoho.cn/web/yohobuy
into develop
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
static/js/cart/good.js
static/sass/cart/_order-ensure.scss
template/m.yohobuy.com/partials/layout/page_header.phtml
static/js/cart/good.js
View file @
a341d1c
...
...
@@ -166,7 +166,7 @@ function didUpdateAllGoodsCheckStatus() {
$
(
checkedBox
).
removeClass
(
'icon-cb-checked'
).
addClass
(
'icon-checkbox'
);
});
}
window
.
history
.
go
(
0
);
window
.
location
.
href
=
'/cart/index/index?cartType='
+
$
(
'#cartType'
).
val
(
);
}
function
bottomCheckBoxHandeler
(
isSelected
,
type
,
handlerAfterTouch
)
{
...
...
static/sass/cart/_order-ensure.scss
View file @
a341d1c
...
...
@@ -119,7 +119,7 @@
}
.coupon-use
{
box-sizing
:
border-box
;
@include
box-sizing
(
border-box
)
;
position
:
relative
;
float
:
right
;
padding-right
:
30rem
/
$pxConvertRem
;
...
...
@@ -137,7 +137,7 @@
color
:
#999
;
}
}
.checkbox
{
display
:
inline-block
;
width
:
80rem
/
$pxConvertRem
;
...
...
template/m.yohobuy.com/partials/layout/page_header.phtml
View file @
a341d1c
...
...
@@ -15,9 +15,7 @@
{
{#
navBtn
}
}
<!--
<span
class=
"nav-btn"
>
{
{.
}
}</span>
-->
<!--
<i
class=
"iconfont nav-home"
>
638
;</i>
-->
{
{/
navBtn
}
}
</header>
<div
class=
"homebuttom none"
>
<!--
<div
class=
"homebuttom none"
>
<ul>
<li>
<i
class=
"iconfont"
>
62
a;</i>
...
...
@@ -36,5 +34,8 @@
<span>我的</span>
</li>
</ul>
</div>
</div>
-->
{
{/
navBtn
}
}
</header>
{
{/pageHeader
}
}
...
...
Please
register
or
login
to post a comment