fe / yoho-blk · Commits

Go to a project

Authored by yyq
Commit dd229e530c140fd120e937c83ea2613a1047d9c3 2 parents 6d4d9ef1 645b418b

Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0

Inline Side-by-side
Showing 10 changed files with 69 additions and 53 deletions
... ... @@ -135,9 +135,9 @@ const statusMap = {
// 订单类型为手机的订单
const isMobileOrder = {
3: true,
4: true,
6: true
18: true,
19: true,
21: true
};
// 转换时间戳
... ...
... ... @@ -11,7 +11,7 @@
</div>
<div class="brand-info" data-id="{{brandId}}">
<div class="brand-icon">
<img src="{{image brandIco 145 126}}" alt="">
<img src="{{image brandIco 145 126}}" alt="" width="145" height="126">
</div>
<div class="brand-name">
{{brandName}}
... ...
... ... @@ -26,7 +26,8 @@
{{/stateText}}
</div>
<div class="desc">
<span class="name">{{productName}}</span>
<div class="brand-name">{{brandName}}</div>
<div class="product-name">{{productName}}</div>
<p class="price">¥{{round salesPrice 2}}</p>
</div>
... ...
... ... @@ -2,6 +2,6 @@
<li class="content">下单时间：{{createTime}}</li>
<li class="content">订单编号：{{orderCode}}</li>
{{#if showMobile}}
<li class="content">手机订单</li>
<li class="content"><span class="iconfont">&#xe62f;</span>手机订单</li>
{{/if}}
</ul>
... ...
... ... @@ -8,7 +8,7 @@
</div>
<div class="footer">
<span class="desc pay-notice left">{{../username}}如果<span class="blue">2小时</span>内您无法完成付款，系统会将您的订单取消</span>
<span id="order-detail-ctrl" class="right order-detail-ctrl shrink">
<span id="order-detail-ctrl" class="right order-detail-ctrl">
<em>展开详情</em>
<i class="iconfont down">&#xe616;</i>
<i class="iconfont up">&#xe617;</i>
... ... @@ -16,7 +16,7 @@
</div>
</div>
<div class="order-detail hide">
<div class="order-detail">
<div class="row">
<div class="item">
<span class="label"> 收货地址：</span>
... ...
... ... @@ -93,7 +93,7 @@ exports.createPagination = function(pagination, options) {
// ========= Previous Button ===============
if (page - 1) {
n = page - 1;
template = template + '<a href="?page=' + n + queryParams + '">' + leftText + '</a>';
template = template + '<a class="pre-page" href="?page=' + n + queryParams + '">' + leftText + '</a>';
}
// ========= Page Numbers Middle ===============
... ... @@ -159,7 +159,7 @@ exports.createPagination = function(pagination, options) {
// ========= Next page ===============
if (pageCount - page) {
n = page + 1;
template = template + '<a href="?page=' + n + queryParams + '">' + rightText + '</a>';
template = template + '<a class="next-page" href="?page=' + n + queryParams + '">' + rightText + '</a>';
}
template = template + '</div>';
... ...
div.blk-pagination {
.blk-pagination {
width: 500px;
padding: 0;
text-align: center;
... ... @@ -6,11 +6,11 @@ div.blk-pagination {
a {
display: inline-block;
font-size: 14px;
line-height: 22px;
padding: 0 9px;
line-height: 28px;
width: 26px;
height: 26px;
&:first-child {
padding: 0 5px;
margin-right: 10px;
border: 1px solid #333;
... ... @@ -22,7 +22,6 @@ div.blk-pagination {
}
&:last-child {
padding: 0 5px;
margin-left: 10px;
border: 1px solid #333;
... ... @@ -40,7 +39,11 @@ div.blk-pagination {
}
i {
font-size: 14px;
line-height: 22px;
font-size: 12px;
}
.pre-page,
.next-page {
line-height: 24px;
}
}
... ...
.favorite-products {
margin-top: 20px;
.products-cates {
font-size: 14px;
background-color: #eee;
... ... @@ -14,7 +12,6 @@
a {
color: #bbb;
}
}
.label.focus {
... ... @@ -28,7 +25,6 @@
}
.product-list {
margin: 0 -10px;
padding-bottom: 30px;
border-bottom: 1px solid #eee;
... ... @@ -86,13 +82,28 @@
padding: 0 15px;
}
.brand-name {
padding: 10px 0;
font-size: 14px;
font-weight: 700;
}
.product-name {
padding: 5px 0;
font-size: 14px;
}
.price {
padding: 13px;
font-size: 14px;
}
.thumb {
width: 216px;
height: 293px;
}
.tool-area {
text-align: center;
margin-top: 15px;
height: 26px;
... ... @@ -103,7 +114,6 @@
color: #666;
border-color: #666;
}
}
}
... ... @@ -122,5 +132,4 @@
}
}
}
}
... ...
... ... @@ -89,26 +89,30 @@ $hoverColor: #379ed6;
width: 342px;
padding-left: 42px;
font-size: 12px;
}
.brand-name {
display: block;
font-size: 18px;
font-weight: bold;
line-height: 50px;
.brand-name {
display: block;
font-size: 18px;
font-weight: bold;
line-height: 50px;
overflow: hidden;
text-overflow: ellipsis !important;
white-space: nowrap !important;
max-width: 300px;
}
overflow: hidden;
text-overflow: ellipsis !important;
white-space: nowrap !important;
max-width: 300px;
.size {
margin-bottom: 13px;
&:hover {
color: #379ed6;
}
}
.published-at {
margin-bottom: 13px;
}
.size {
margin-bottom: 13px;
}
.published-at {
margin-bottom: 13px;
}
.pro-name {
... ... @@ -117,6 +121,7 @@ $hoverColor: #379ed6;
word-wrap: break-word;
margin-bottom: 5px;
overflow: hidden;
:hover {
cursor: pointer;
color: #379ed6;
... ... @@ -260,10 +265,8 @@ $hoverColor: #379ed6;
}
}
.action {
&:hover {
cursor: pointer;
color: #379ed6;
}
.action:hover {
cursor: pointer;
color: #379ed6;
}
}
... ...
... ... @@ -30,7 +30,15 @@ $fontColor: #616161;
font-size: 14px;
cursor: pointer;
/* 默认情况为收起状态 箭头方向为上 */
.up {
display: none;
}
.down {
display: inline-block;
}
/* 默认情况为展开状态 箭头方向为下 */
&.shrink {
.up {
... ... @@ -42,14 +50,6 @@ $fontColor: #616161;
}
}
.up {
display: none;
}
.down {
display: inline-block;
}
.iconfont {
font-size: 12px;
margin-left: 10px;
... ...