fe / yoho-blk · Commits

Go to a project

Authored by htoooth
Commit 25db5410f82fcc923322bfaad8501a5b7fb32fd9 2 parents a1a72c72 2e54486a

Merge remote-tracking branch 'origin/release/1.0' into release/1.0

Inline Side-by-side
Showing 19 changed files with 102 additions and 70 deletions
... ... @@ -322,8 +322,8 @@ const _processContentData = (list) => {
if (related.relatedReco) {
_.forEach(related.relatedReco, function(data, key) {
_.forEach(result, function(list, index) {
if(data.id === list.productSkn) {
_.forEach(result, function(lis, index) {
if (data.id === lis.productSkn) {
data = _.assign(data, {
link: config.siteUrl + '/product/list/pro_' +
result[index].productId + '_' + data.productSkc + '/' +
... ... @@ -343,8 +343,8 @@ const _processContentData = (list) => {
if (related.relatedGroup) {
_.forEach(related.relatedGroup, function(data, key) {
_.forEach(result, function(list, index) {
if(data.id === list.productSkn) {
_.forEach(result, function(lis, index) {
if (data.id === lis.productSkn) {
data = _.assign(data, {
link: config.siteUrl + '/product/list/pro_' +
result[index].productId + '_' + data.productSkc + '/' +
... ...
... ... @@ -125,7 +125,7 @@
</li>
<li id="collect-btn" class="sort-collect{{# isCollected}} collected{{/ isCollected}}">
<a href="javascript:;">
<i class="iconfont">&#xe619;</i>
<i class="iconfont">&#xe627;</i>
<span>收藏</span>
</a>
</li>
... ...
... ... @@ -40,7 +40,7 @@ const Query = {
name: query ? `"${query}" 共${data.total}个结果` : `共${data.total || 0}个结果`
});
if (data.filter) {
if (data.filter && data.total) {
data.filter.standard = data.standard;
retData.filter = DataHelper.filterHandle(data.filter, q);
... ...
... ... @@ -246,7 +246,7 @@ const helpers = {
let filters = [];
let customPriceLow = '';
let customPriceHigh = '';
let showSize = (!!q.msort || !!q.misort) && sizeInfo;
let showSize = (!!q.msort || !!q.misort || !!q.sort) && sizeInfo;
genders.forEach(g => {
if (g.value === q.gender) {
... ...
... ... @@ -208,28 +208,30 @@ const setPathNav = (data, name, channel) => {
link: helpers.urlFormat(`/${link}`),
name: `${_.toUpper(channel)}首页`
}];
let sort = data.sort[0];
let sort = _.get(data, 'sort[0]', {});
navs.push({
link: helpers.urlFormat('/list', {
msort: sort.sort_id,
gender: gender
}),
name: sort.sort_name,
pathTitle: sort.sort_name
});
// 二级分类
if (!_.isEmpty(sort.sub)) {
if (!_.isEmpty(sort)) {
navs.push({
link: helpers.urlFormat('/list', {
msort: sort.sort_id,
misort: sort.sub.sort_id,
gender: gender
}),
name: sort.sub[0].sort_name,
pathTitle: sort.sub[0].sort_name
name: sort.sort_name,
pathTitle: sort.sort_name
});
// 二级分类
if (!_.isEmpty(sort.sub)) {
navs.push({
link: helpers.urlFormat('/list', {
msort: sort.sort_id,
misort: sort.sub.sort_id,
gender: gender
}),
name: sort.sub[0].sort_name,
pathTitle: sort.sub[0].sort_name
});
}
}
navs.push({
... ...
... ... @@ -132,6 +132,7 @@ const ShopService = {
info.brandId = domainInfo.id;
info.shopId = domainInfo.shopId;
info.brandBanner = domainInfo.brandBanner;
info.info = domainInfo.brandIntro;
}
if (info.shopId) {
... ... @@ -160,7 +161,8 @@ const ShopService = {
let brandInfo = yield BrandService.getBrandInfo(info.brandId, uid);
info.name = brandInfo.brandName;
info.info = brandInfo.brandIntro;
// info.info = brandInfo.brandIntro;
info.btnName = '品牌介绍';
info.isFavorite = brandInfo.isFavorite === 'Y';
info.banner = info.brandBanner;
... ...
... ... @@ -6,29 +6,30 @@
</div>
<div class="center-content clearfix">
<div class="left">
{{!-- 筛选区域 --}}
{{#filter}}
{{#filter}}
<div class="left">
{{!-- 筛选区域 --}}
{{> list/filter}}
{{/filter}}
</div>
<div class="right">
{{!-- 已选中条件 --}}
{{#filter}}
{{> list/filter-area}}
{{/filter}}
{{#if paginationData.total}}
{{!-- 排序 --}}
</div>
{{/filter}}
{{#if paginationData.total}}
<div class="right">
{{!-- 已选中条件 --}}
{{#filter}}
{{> list/filter-area}}
{{/filter}}
{{!-- 排序 --}}
{{> list/order-area}}
{{!-- 商品列表 --}}
{{> list/goods-box}}
{{!-- 分页 --}}
{{{ pagination paginationData }}}
{{^}}
{{!-- 空结果 --}}
{{> list/empty}}
{{/if}}
</div>
</div>
{{^}}
{{!-- 空结果 --}}
{{> list/empty}}
{{/if}}
</div>
... ...
... ... @@ -13,7 +13,7 @@
</a>
<span id="brand-fav" class="brand-fav{{#if isFavorite}} coled{{/if}}">
{{> icon/collection}}
<i class="iconfont">&#xe627;</i>
</span>
</p>
</div>
... ...
... ... @@ -203,3 +203,5 @@
</div>
{{/if}}
<div class="blank-div" style="margin-bottom: 10px;"></div>
... ...
... ... @@ -174,9 +174,10 @@
<div class="balance clearfix">
{{# shopping_cart_data}}
<div class="balance-info left">
<p>
<p class="receiver-wrap">
{{#with ../delivery_address}}
收货信息：<em id="receiver">{{consignee}} {{mobile}} {{area}} {{address}}</em>
<i>收货信息：</i>
<em id="receiver">{{consignee}} {{mobile}} {{area}} {{address}}</em>
{{/with}}
<span class="right">{{selected_goods_count}}件商品</span>
</p>
... ...
... ... @@ -18,7 +18,7 @@
<div class="order-detail">
<div class="row">
<div class="item">
<div class="item receiver-address">
<span class="label"> 收货地址：</span>
<span>{{area}} {{address}}</span>
</div>
... ...
... ... @@ -2,6 +2,7 @@
height: 50px;
line-height: 50px;
font-size: 12px;
font-weight: 500;
.yoho-group-map {
padding-right: 2px;
... ... @@ -11,7 +12,7 @@
.iconfont {
font-size: 18px;
position: relative;
top: -1px;
top: -2px;
}
a {
... ... @@ -41,6 +42,7 @@
padding: 20px 0;
background: #fff;
position: absolute;
font-weight: normal;
z-index: 50;
top: 50px;
... ... @@ -72,6 +74,7 @@
.tag-bag {
padding-right: 6px;
margin-right: 8px;
font-weight: normal;
position: relative;
&:hover {
... ...
... ... @@ -19,6 +19,10 @@
cursor: pointer;
font-size: 20px;
}
.weixin {
height: 30px;
}
}
.weixin-share-box {
... ... @@ -51,7 +55,7 @@
z-index: 100;
height: 12px;
display: block;
background-image: resolve('layout/up.png');
background-image: resolve("layout/up.png");
top: 17px;
}
}
... ... @@ -81,5 +85,4 @@
color: #9f9f9f;
line-height: 20px;
}
}
... ...
... ... @@ -6,10 +6,6 @@
margin: 30px auto;
}
.font {
font-family: '黑体';
}
.detail-title {
font-size: 24px;
text-align: center;
... ... @@ -77,6 +73,7 @@
margin-right: 30px;
}
}
.article-main {
text-align: center;
margin: 0 auto;
... ... @@ -88,8 +85,6 @@
}
}
.article-pictwo {
max-width: 930px;
margin: 0 auto;
... ... @@ -99,7 +94,7 @@
img {
display: inline-block;
max-width: 460px;
margin-right: 2px;
margin-right: 2px;
}
}
... ... @@ -274,8 +269,10 @@
.user-handle {
float: right;
ul {
display: inline-block;
li {
float: left;
margin: 0 15px;
... ... @@ -330,6 +327,7 @@
i {
opacity: 1;
}
.cancel-collect {
display: inline;
}
... ... @@ -415,7 +413,6 @@
a {
float: right;
}
}
.comment-area {
... ... @@ -467,10 +464,6 @@
font-size: 14px;
background: #000;
cursor: pointer;
/* &:hover {
background: #000;
}*/
}
.disable {
... ... @@ -502,7 +495,7 @@
width: 12px;
height: 7px;
background: #fff;
background-image: resolve('layout/down.png');
background-image: resolve("layout/down.png");
position: absolute;
left: 15px;
}
... ... @@ -524,7 +517,6 @@
}
.comments-list {
li {
margin: 14px 0 0;
padding: 0 0 15px;
... ... @@ -550,6 +542,7 @@
font-weight: bold;
}
}
.comment-info {
.comment-content {
margin-top: 10px;
... ... @@ -566,7 +559,6 @@
clear: both;
}
}
}
}
... ...
... ... @@ -42,7 +42,7 @@
}
.msg-title:hover {
color: #666666;
color: #666;
}
.lazy {
... ...
... ... @@ -325,6 +325,10 @@
.material-detail {
display: table;
& + .material-wash {
border-top: 1px solid #eaeceb;
}
li {
display: table-row;
}
... ... @@ -364,7 +368,6 @@
.material-wash {
text-align: center;
border-top: 1px solid #eaeceb;
padding-top: 15px;
li {
... ...
... ... @@ -31,6 +31,10 @@
color: #999;
}
.checkbox {
font-size: 14px;
}
.checked {
color: #1b1b1b;
}
... ... @@ -315,7 +319,7 @@
.goods-brand {
font-weight: 700;
padding: 10px;
padding: 10px 10px 4px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
... ... @@ -344,7 +348,7 @@
}
.goods-name {
padding: 4px 10px 10px;
padding: 10px;
width: 263px;
overflow: hidden;
text-overflow: ellipsis;
... ...
... ... @@ -510,6 +510,21 @@
width: 670px;
}
.receiver-wrap {
position: relative;
i {
position: absolute;
width: 70px;
}
em {
display: inline-block;
width: 480px;
margin-left: 70px;
}
}
.balance-list {
width: 364px;
... ...
... ... @@ -8,7 +8,6 @@ $fontColor: #616161;
.title {
margin-top: 35px;
margin-bottom: 20px;
height: 60px;
.content {
... ... @@ -40,7 +39,6 @@ $fontColor: #616161;
/* 默认情况为展开状态 箭头方向为下 */
&.shrink {
.up {
display: inline-block;
}
... ... @@ -61,15 +59,21 @@ $fontColor: #616161;
margin-bottom: 30px;
height: calc(135px + 2px);
padding: 20px 30px;
.row {
height: 30px;
line-height: @height;
font-weight: bold;
.item {
float: left;
width: calc($width / 2 - 31px);
}
}
.item.receiver-address {
width: 100%;
}
}
.pay-nav {
... ... @@ -148,19 +152,19 @@ $fontColor: #616161;
margin-top: 20px;
margin-bottom: 20px;
clear: both;
.btn-shape {
width: 160px;
height: 40px;
line-height: @height;
}
}
}
.pay-info-dialog {
.pay-page-tips {
text-align: center;
h3 {
font-size: 18px;
font-weight: 700;
... ...