fe / yoho-blk · Commits

Go to a project

Authored by zhangxiaoru
Commit 6ed322bc19dc1dfc2de2f8af54738ffac25655b2 2 parents 50af613b 214dda6b

address

Inline Side-by-side
Showing 6 changed files with 53 additions and 49 deletions
... ... @@ -86,7 +86,7 @@ const list = {
let banner = result[0];
let sortData = camelCase(result[1]);
let listData = result[2];
let nav = [DataHelper.getChannelNav(), {
let nav = [DataHelper.getChannelNav(channel), {
name: '新品'
}];
... ...
... ... @@ -48,7 +48,10 @@ const Query = {
data.filter.groupSort = DataHelper.sortConvert(allSort.data.sort);
retData.filter = DataHelper.filterHandle(data.filter, q);
retData.filter.showPrice = data.total > 10;
retData.filter.showInfo = retData.filter.style || data.standard;
retData.filter.showInfo = (retData.filter.style && retData.filter.style.length > 0)
|| (data.standard && data.standard.length > 0); //eslint-disable-line
console.log(retData.filter.standard);
}
retData.navPath = {
... ...
... ... @@ -233,7 +233,7 @@ const helpers = {
let filters = [];
let customPriceLow = '';
let customPriceHigh = '';
let showSize = (!!q.sort || !!q.misort);
let showSize = (!!q.msort || !!q.misort);
genders.forEach(g => {
if (g.value === q.gender) {
... ...
... ... @@ -74,7 +74,8 @@
<div class="brand-list nano">
<div class="nano-content">
{{#each brandData}}
<div class="input-radio {{#if checked}}default-check{{/if}}" data-value="{{id}}" data-word="{{brandAlif}}">
<div class="input-radio {{#if checked}}default-check{{/if}}" data-value="{{id}}"
data-word="{{brandAlif}}">
{{> icon/radio}}
{{#if brandNameEn}}
<label>{{brandNameEn}}</label>
... ... @@ -159,46 +160,46 @@
<div class="blank-div"></div>
<div class="title">商品属性</div>
{{#if style}}
<div class="yoho-ui-accordion">
<h3>风格</h3>
<div class="body">
<div class="style-mulit-btn">
<span class="btn white">多选</span>
</div>
<div class="style-body nano">
<div class="nano-content">
{{#each style}}
<div class="input-radio" data-value="{{styleId}}">
{{> icon/radio }}
<label>{{styleName}}</label>
</div>
{{/each}}
{{#if style}}
<h3>风格</h3>
<div class="body">
<div class="style-mulit-btn">
<span class="btn white">多选</span>
</div>
<div class="style-body nano">
<div class="nano-content">
{{#each style}}
<div class="input-radio" data-value="{{styleId}}">
{{> icon/radio }}
<label>{{styleName}}</label>
</div>
{{/each}}
</div>
</div>
<div class="style-btns hide">
<span class="btn disable large confirm">确定</span>
<span class="btn large cancel">取消</span>
</div>
</div>
<div class="style-btns hide">
<span class="btn disable large confirm">确定</span>
<span class="btn large cancel">取消</span>
</div>
</div>
{{/if}}
{{#if standard}}
{{#each standard}}
<h3>{{standardName}}</h3>
<div class="body" data-value="{{standardId}}">
<div class="standard-body nano">
<div class="nano-content">
{{#each sub}}
<div class="input-radio" data-value="{{standardId}}">
{{> icon/radio }}
<label>{{standardName}}</label>
</div>
{{/each}}
</div>
{{#each standard}}
<h3>{{standardName}}</h3>
<div class="body" data-value="{{standardId}}">
<div class="standard-body nano">
<div class="nano-content">
{{#each sub}}
<div class="input-radio" data-value="{{standardId}}">
{{> icon/radio }}
<label>{{standardName}}</label>
</div>
{{/each}}
</div>
</div>
{{/each}}
{{/if}}
</div>
{{/each}}
</div>
{{/if}}
{{/if}}
... ...
... ... @@ -17,22 +17,18 @@ const serviceApi = global.yoho.ServiceAPI;
const getMenuData = () => (
{
yohoGroup: [{
link: '/',
cn: '有货BLACK',
en: 'YOHO!BLK'
link: 'http://www.yoho.cn',
cn: '集团官网',
en: 'YOHO!'
}, {
link: 'http://www.yohoboys.com',
cn: '男生潮流',
cn: '潮流男生',
en: 'YOHO!BOYS'
}, {
link: 'http://www.yohogirls.com',
cn: '女生潮流',
cn: '潮流女生',
en: 'YOHO!GIRLS'
}, {
link: 'http://app.yohoshow.com',
cn: '物趣分享',
en: 'YOHO!SHOW'
}, {
link: 'http://www.yohood.cn',
cn: '潮流嘉年华',
en: 'YO\'HOOD'
... ...
... ... @@ -28,9 +28,13 @@
.brand-name {
text-align: center;
background-color: #eee;
padding: 5px 0;
padding: 5px;
font-size: 14px;
width: 147px;
color: #666;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.tool-area {
... ...