fe / YOHOBUYWAP · Commits

Go to a project

Authored by 周少峰
Commit 08012654c4cf43ef45ec50311a4d4f8e8fce2fd8 2 parents a7c7eae9 5733498c

Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4

Inline Side-by-side
Showing 6 changed files with 11 additions and 7 deletions
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
... ... @@ -47,8 +47,8 @@
}
img {
width: 100%;
height: 208px;
width: 152px;
height: 204px;
}
.tag {
... ...
... ... @@ -4,7 +4,7 @@
.block {
position: relative;
background: #fff;
padding: 20px 30px;
padding: 36px 30px 24px;
.iconfont {
position: absolute;
... ... @@ -106,9 +106,12 @@
.sub-content .sub-title {
display: block;
color: #000;
font-size: 26px;
font-size: 28px;
padding-bottom: 14px;
}
.sub-content .sub-status{
padding-bottom: 14px;
}
.goods {
padding: 0;
margin-top: 20px;
... ... @@ -136,11 +139,12 @@
padding: 0.5rem 0.75rem;
height:1.5rem;
line-height:1.5rem;
font-size:0.7rem ;
.bg-dollar{
display: inline-block;
width: 0.6rem;
height: 0.6rem;
background: url('../img/me/yoho-coin/dollar.png?1452827495') center center;
background: url('/me/yoho-coin/dollar.png') center center;
background-size: 100% 100%;
vertical-align: middle;
}
... ...
... ... @@ -23,7 +23,7 @@
<p class="beside-icon sub-content">
<span class="sub-title">订单编号：{{orderNum}}</span>
<span >{{orderStatus}}</span>
<span class="sub-status">{{orderStatus}}</span>
<span>下单时间：{{orderTime}}</span>
</p>
</div>
... ...