fe / yoho-blk · Commits

Go to a project

Authored by 石坚
Commit c490ee08a04c53ac674d83d7a2874c23649e0ad3 2 parents c343c416 fdb22f39

blk标题样式修改

Inline Side-by-side
Showing 38 changed files with 1723 additions and 399 deletions
... ... @@ -247,6 +247,8 @@ const _processContentData = (list) => {
list = list || [];
list = camelCase(list);
// console.log(list)
let contentData = {
contents: []
};
... ... @@ -284,12 +286,12 @@ const _processContentData = (list) => {
let idList = '';
let recoLength = '';
let related = {
relatedReco: [],
relatedGroup: []
};
_.forEach(contentData.contents, function(value) {
if (value.goods) {
... ... @@ -319,7 +321,6 @@ const _processContentData = (list) => {
return _getRelatedData(idList).then((result) => {
if (related.relatedReco) {
_.forEach(related.relatedReco, function(data, key) {
... ... @@ -362,11 +363,16 @@ const _processContentData = (list) => {
});
}
return related;
if (related.relatedReco.length === 0 && related.relatedGroup.length === 0) {
return null;
} else {
return related;
}
}).then((result) => {
}).then(() => {
contentData.contents.push({
related: related
related: result
});
return contentData;
... ...
<div class="editorial-detail-page blk-page center-content">
{{# editorialDetail}}
{{> path-nav}}
<div class="detail-body" data-id="{{id}}">
{{# header}}
<div class="detail-title">{{title}}</div>
<div class="article-info">
<div class="article-author">
<div class="author-avatar">
<a href="{{authorUrl}}" target="_blank">
<img src="{{avatar}}">
</a>
</div>
</div>
<div class="author-info">
<a class="author-name" href="{{authorUrl}}">{{name}}</a>
</div>
<div class="article-status">
<span class="article-time brown-light">{{time}}</span>
<span class="article-browse">浏览：<b class=" brown-light">{{click}}</b></span>
<span class="article-comments">评论：<b class="brown-light">{{commentNum}}</b></span>
</div>
</div>
{{/ header}}
<div class="article-main">
{{# content}}
{{# singleImage}}
<span class="article-pic">
{{# data}}
<img src="{{image src 930 660 1}}">
{{/ data}}
</span>
{{/ singleImage}}
{{# smallPic}}
<span class="article-pictwo">
{{# data}}
<img src="{{image src 460 660 1}}">
{{/ data}}
</span>
{{/ smallPic}}
{{# text}}
<div class="article-text block">
{{# data}}
<p>{{{text}}}</p>
{{/ data}}
</div>
{{/ text}}
{{# related}}
<div class="related-reco related-collo">
<div class="article-title">
<div class="title-line"></div>
<div class="text-center">
<div class="text">
<span>推荐搭配</span>
</div>
</div>
</div>
<div class="related-goods collocation">
{{# relatedReco}}
{{> related-goods}}
{{/ relatedReco}}
</div>
</div>
<div class="related-reco related-group">
<div class="article-title">
<div class="title-line"></div>
<div class="text-center">
<div class="text">
<span>推荐商品</span>
</div>
</div>
</div>
<div class="related-groups">
<div class="related-goods goods">
{{# relatedGroup}}
{{> related-goods}}
{{/ relatedGroup}}
</div>
</div>
<span class="btn-left iconfont hide">&#xe62c;</span>
<span class="btn-right iconfont">&#xe629;</span>
</div>
{{/ related}}
{{/ content}}
{{#if brands}}
<div class="related-brand">
<div class="article-title">
<div class="title-line"></div>
<div class="text-center">
<div class="text">
<span>相关品牌</span>
</div>
</div>
</div>
<div class="brands">
{{# brands}}
<div class="brand">
<a class="thumb" href="{{url}}" target="_blank">
<img src="{{thumb}}">
</a>
<p class="brand-name">{{name}}</p>
</div>
{{/ brands}}
</div>
</div>
{{/if}}
</div>
<div class="user">
{{# userInfo}}
<div class="user-handle">
<ul class="clearfix">
<li id="prise-btn" class="like-status{{# isLike}} liked{{/ isLike}}">
<a href="javascript:;">
<i class="iconfont">&#xe60e;</i>
<span class="like-num">{{likeNum}}</span>
</a>
</li>
<li id="collect-btn" class="sort-collect{{# isCollected}} collected{{/ isCollected}}">
<a href="javascript:;">
<i class="iconfont">&#xe627;</i>
<span>收藏</span>
</a>
</li>
</ul>
</div>
{{/ userInfo}}
{{> share}}
</div>
<div class="article-tag">
<i class="tag-icon iconfont">&#xe648;</i>
<ul id="tags">
{{# tags}}
<li>
<a href="{{url}}" target="_blank">{{name}}</a>
</li>
{{/ tags}}
</ul>
</div>
<div class="chapter">
<p class="chapter-right">
<span>下一篇</span><br>
{{# nextArticle}}
<a href="{{href}}">{{nextChapter}}</a>
{{/ nextArticle}}
</p>
<p class="chapter-left">
<span>上一篇</span><br>
{{# perArticle}}
<a href="{{href}}">{{lastChapter}}</a>
{{/ perArticle}}
</p>
</div>
<div id="comment-area" class="comment-area">
<div class="comment-textarea">
<textarea id="comment-info" placeholder="我有话要说。。。">{{commentInfo}}</textarea>
</div>
<div class="comment-publish clearfix">
<span id="word-count-tip" class="word-count-tip"></span>
<a id="comment-btn" class="publish-btn disable">评论</a>
</div>
<div id="pjax-container" class="comments-wrap">
{{> comment}}
</div>
</div>
</div>
{{/ editorialDetail}}
</div>
<div class="editorial-detail-page blk-page center-content">
{{# editorialDetail}}
{{> path-nav}}
<div class="detail-body" data-id="{{id}}">
{{# header}}
<div class="detail-title">{{title}}</div>
<div class="article-info">
<div class="article-author">
<div class="author-avatar">
<a href="{{authorUrl}}" target="_blank">
<img class="lazy" data-original="{{avatar}}">
</a>
</div>
</div>
<div class="author-info">
<a class="author-name" href="{{authorUrl}}">{{name}}</a>
</div>
<div class="article-status">
<span class="article-time brown-light">{{time}}</span>
<span class="article-browse">浏览：<b class=" brown-light">{{click}}</b></span>
<span class="article-comments">评论：<b class="brown-light">{{commentNum}}</b></span>
</div>
</div>
{{/ header}}
<div class="article-main">
{{# content}}
{{# singleImage}}
<span class="article-pic">
{{# data}}
<img class="lazy" data-original="{{image src 930 660 1}}">
{{/ data}}
</span>
{{/ singleImage}}
{{# smallPic}}
<span class="article-pictwo">
{{# data}}
<img class="lazy" data-original="{{image src 460 660 1}}">
{{/ data}}
</span>
{{/ smallPic}}
{{# text}}
<div class="article-text block">
{{# data}}
<p>{{{text}}}</p>
{{/ data}}
</div>
{{/ text}}
{{# related}}
<div class="related-reco related-collo">
<div class="article-title">
<div class="title-line"></div>
<div class="text-center">
<div class="text">
<span>推荐搭配</span>
</div>
</div>
</div>
<div class="related-goods collocation">
{{# relatedReco}}
{{> related-goods}}
{{/ relatedReco}}
</div>
</div>
<div class="related-reco related-group">
<div class="article-title">
<div class="title-line"></div>
<div class="text-center">
<div class="text">
<span>推荐商品</span>
</div>
</div>
</div>
<div class="related-groups">
<div class="related-goods goods">
{{# relatedGroup}}
{{> related-goods}}
{{/ relatedGroup}}
</div>
</div>
<span class="btn-left iconfont hide">&#xe64e;</span>
<span class="btn-right iconfont">&#xe64c;</span>
</div>
{{/ related}}
{{/ content}}
{{#if brands}}
<div class="related-brand">
<div class="article-title">
<div class="title-line"></div>
<div class="text-center">
<div class="text">
<span>相关品牌</span>
</div>
</div>
</div>
<div class="brands">
{{# brands}}
<div class="brand">
<a class="thumb" href="{{url}}" target="_blank">
<img src="{{thumb}}">
</a>
<p class="brand-name">{{name}}</p>
</div>
{{/ brands}}
</div>
</div>
{{/if}}
</div>
<div class="user">
{{# userInfo}}
<div class="user-handle">
<ul class="clearfix">
<li id="prise-btn" class="like-status{{# isLike}} liked{{/ isLike}}">
<a href="javascript:;">
<i class="iconfont">&#xe60e;</i>
<span class="like-num">{{likeNum}}</span>
</a>
</li>
<li id="collect-btn" class="sort-collect{{# isCollected}} collected{{/ isCollected}}">
<a href="javascript:;">
<i class="iconfont">&#xe627;</i>
<span>收藏</span>
</a>
</li>
</ul>
</div>
{{/ userInfo}}
{{> share}}
</div>
<div class="article-tag">
<i class="tag-icon iconfont">&#xe648;</i>
<ul id="tags">
{{# tags}}
<li>
<a href="{{url}}" target="_blank">{{name}}</a>
</li>
{{/ tags}}
</ul>
</div>
<div class="chapter">
<p class="chapter-right">
<span>下一篇</span><br>
{{# nextArticle}}
<a href="{{href}}">{{nextChapter}}</a>
{{/ nextArticle}}
</p>
<p class="chapter-left">
<span>上一篇</span><br>
{{# perArticle}}
<a href="{{href}}">{{lastChapter}}</a>
{{/ perArticle}}
</p>
</div>
<div id="comment-area" class="comment-area">
<div class="comment-textarea">
<textarea id="comment-info" placeholder="我有话要说。。。">{{commentInfo}}</textarea>
</div>
<div class="comment-publish clearfix">
<span id="word-count-tip" class="word-count-tip"></span>
<a id="comment-btn" class="publish-btn disable">评论</a>
</div>
<div id="pjax-container" class="comments-wrap">
{{> comment}}
</div>
</div>
</div>
{{/ editorialDetail}}
</div>
... ...
... ... @@ -719,6 +719,7 @@ const getExchangeDetailData = (id, uid) => {
returnsAPI.getExchangeDetail(id, uid),
returnsAPI.getExpressCompanyAsync()
]).then(result => {
console.log(result);
let exchangeData = {};
Object.assign(exchangeData, _setSideMenu('我的退/换货'));
... ...
{{# data}}
{{#if total}}
<div class="favorite-brands">
<span class="num">您共收藏了{{total}}个品牌</span>
<div class="brands-list clearfix">
{{#each brandList}}
<div class="brand-raw clearfix">
<div class="check">
{{> icon/checkbox}}
</div>
<div class="brand-info" data-id="{{brandId}}" data-type="{{brandOrShopType}}">
<div class="brand-icon">
<img src="{{image brandIco 145 126}}" alt="" width="145" height="126">
</div>
<div class="brand-name">
{{brandName}}
</div>
<div class="tool-area clearfix">
<a class="btn white"
href="/product/shop/{{brandDomain}}{{#if shopId}}?shopId={{shopId}}{{/if}}"
target="_blank">去店铺页</a>
<span class="btn white cancel">取消收藏</span>
</div>
</div>
<div class="brand-products slide-container">
{{#if noNewProduct}}
<p class="no-product-info">
暂无新品, 去<a href="/product/shop/{{brandDomain}}{{#if shopId}}?shopId={{shopId}}{{/if}}" target="_blank">名牌频道</a>看看吧
</p>
{{^}}
<div class="slide-switch">
<a class="prev" href="javascript:;">
<span class="iconfont">&#xe62c;</span>
</a>
<a class="next" href="javascript:;">
<span class="iconfont">&#xe629;</span>
</a>
</div>
<div class="slide-wrap">
<ul>
{{#each newProduct}}
<li class="clearfix">
{{#each this}}
{{#if more}}
<div class="goods-more">
<a href="/product/shop/{{../../brandDomain}}{{#if ../../shopId}}?shopId={{../../shopId}}{{/if}}"
target="_blank">
<div class="more-text">MORE</div>
<p>查看更多</p>
</a>
</div>
{{^}}
<div class="goods-info">
<a href="{{url}}" target="_blank">
<img class="lazy thumb"
src="{{image defaultImages 148 196}}"
style="display: block;">
<div class="desc">
<span class="name">{{productName}}</span>
<p class="price">¥{{round salesPrice 2}}</p>
</div>
</a>
</div>
{{/if}}
{{/each}}
</li>
{{/each}}
</ul>
</div>
{{/if}}
</div>
</div>
{{/each}}
</div>
<div class="favorite-footer">
<div class="favorite-tool">
<div class="check-all">
{{> icon/checkbox}}
<label>全选</label>
</div>
<div class="favorite-cancel">
取消收藏
</div>
</div>
{{{ pagination paginationData }}}
</div>
</div>
{{^}}
<div class="favorite-empty">
<p>您还没有收藏的品牌, 去<a href="{{siteUrl}}/brand">品牌频道</a>看看吧</p>
</div>
{{/if}}
{{/data}}
{{# data}}
{{#if total}}
<div class="favorite-brands">
<span class="num">您共收藏了{{total}}个品牌</span>
<div class="brands-list clearfix">
{{#each brandList}}
<div class="brand-raw clearfix">
<div class="check">
{{> icon/checkbox}}
</div>
<div class="brand-info" data-id="{{brandId}}" data-type="{{brandOrShopType}}">
<div class="brand-icon">
<img src="{{image brandIco 145 126}}" alt="" width="145" height="126">
</div>
<div class="brand-name">
{{brandName}}
</div>
<div class="tool-area clearfix">
<a class="btn white"
href="/product/shop/{{brandDomain}}{{#if shopId}}?shopId={{shopId}}{{/if}}"
target="_blank">去店铺页</a>
<span class="btn white cancel">取消收藏</span>
</div>
</div>
<div class="brand-products slide-container">
{{#if noNewProduct}}
<p class="no-product-info">
暂无新品, 去<a href="/product/shop/{{brandDomain}}{{#if shopId}}?shopId={{shopId}}{{/if}}" target="_blank">名牌频道</a>看看吧
</p>
{{^}}
<div class="slide-switch">
<a class="prev" href="javascript:;">
<span class="iconfont">&#xe64e;</span>
</a>
<a class="next" href="javascript:;">
<span class="iconfont">&#xe64c;</span>
</a>
</div>
<div class="slide-wrap">
<ul>
{{#each newProduct}}
<li class="clearfix">
{{#each this}}
{{#if more}}
<div class="goods-more">
<a href="/product/shop/{{../../brandDomain}}{{#if ../../shopId}}?shopId={{../../shopId}}{{/if}}"
target="_blank">
<div class="more-text">MORE</div>
<p>查看更多</p>
</a>
</div>
{{^}}
<div class="goods-info">
<a href="{{url}}" target="_blank">
<img class="lazy thumb"
src="{{image defaultImages 148 196}}"
style="display: block;">
<div class="desc">
<span class="name">{{productName}}</span>
<p class="price">¥{{round salesPrice 2}}</p>
</div>
</a>
</div>
{{/if}}
{{/each}}
</li>
{{/each}}
</ul>
</div>
{{/if}}
</div>
</div>
{{/each}}
</div>
<div class="favorite-footer">
<div class="favorite-tool">
<div class="check-all">
{{> icon/checkbox}}
<label>全选</label>
</div>
<div class="favorite-cancel">
取消收藏
</div>
</div>
{{{ pagination paginationData }}}
</div>
</div>
{{^}}
<div class="favorite-empty">
<p>您还没有收藏的品牌, 去<a href="{{siteUrl}}/brand">品牌频道</a>看看吧</p>
</div>
{{/if}}
{{/data}}
... ...
... ... @@ -13,7 +13,7 @@
<span class="red">*</span>上传凭证：
</div>
<div class="left right-content">
<div class="img-upload">
<div class="img-upload" data-good-index="{{@index}}">
<span class="iconfont">&#xe61f;</span>
</div>
<span class="img-up-tip">0/4</span>
... ...
... ... @@ -41,16 +41,16 @@
<a class="blue operation" href="{{stepUrl}}/bindMobile">绑定</a>
{{/if}}
</div>
<div class="form-group">
<label class="label-name">邮箱:</label>
{{#if info.verify_email}}
<input class="input no-edit" value="{{info.mobile}}">
{{!-- <a class="blue operation" href="{{stepUrl}}/modifyEmail">修改</a> --}}
{{else}}
<input class="input" type="text" placeholder="请绑定邮箱" disabled>
{{!-- <a class="blue operation" href="{{stepUrl}}/bindEmail">立即绑定</a> --}}
{{/if}}
</div>
<!--<div class="form-group">-->
<!--<label class="label-name">邮箱:</label>-->
<!--{{#if info.verify_email}}-->
<!--<input class="input no-edit" value="{{info.email}}">-->
<!--{{!-- <a class="blue operation" href="{{stepUrl}}/modifyEmail">修改</a> --}}-->
<!--{{else}}-->
<!--<input class="input" type="text" placeholder="请绑定邮箱" disabled>-->
<!--{{!-- <a class="blue operation" href="{{stepUrl}}/bindEmail">立即绑定</a> --}}-->
<!--{{/if}}-->
<!--</div>-->
<div class="form-group">
<label class="label-name">出生日期:</label>
{{#date}}
... ...
... ... @@ -12,8 +12,8 @@
<div class="thumb-show right">
<img id="main-thumb" src="{{image img 482 643}}" style="display: block;">
<div class="check-btns{{#if btnsHide}} hide{{/if}}">
<span class="iconfont pre-thumb">&#xe62c;</span>
<span class="iconfont next-thumb">&#xe629;</span>
<span class="iconfont pre-thumb">&#xe64e;</span>
<span class="iconfont next-thumb">&#xe64c;</span>
</div>
</div>
<div class="thumb-list hide">
... ...
{{# banner}}
<div class="brand-banner" data-brand="{{brandId}}" data-shop="{{shopId}}" data-type="{{favType}}">
<div class="brand-img" style="height:150px; background: url('{{image banner 1150 150}}')"></div>
{{#if showShopName}}
<div class="shop-name">{{name}}</div>
{{/if}}
<p class="opts">
<a id="brand-info">
<i class="iconfont">&#xe631;</i>
{{btnName}}
</a>
<span id="brand-fav" class="brand-fav{{#if isFavorite}} coled{{/if}}">
<i class="iconfont">&#xe627;</i>
</span>
</p>
</div>
{{/banner}}
{{# banner}}
<div class="brand-banner" data-brand="{{brandId}}" data-shop="{{shopId}}" data-type="{{favType}}">
<div class="brand-img" style="height:150px; background: url('{{image banner 1150 150}}')"></div>
{{#if showShopName}}
<div class="shop-name">{{name}}</div>
{{/if}}
<p class="opts">
<a id="brand-info">
<i class="iconfont">&#xe64f;</i>
{{btnName}}
</a>
<span id="brand-fav" class="brand-fav{{#if isFavorite}} coled{{/if}}">
<i class="iconfont">&#xe627;</i>
</span>
</p>
</div>
{{/banner}}
... ...
<div class="yoho-list-empty">
<div class="tip-search">
<span class="iconfont">&#xe647;</span>
<div class="tip-search-img"></div>
</div>
<p class="tip-cn">抱歉! 未找到{{#if query}}与"<span>{{query}}</span>"{{/if}}相关商品</p>
... ...
... ... @@ -8,7 +8,6 @@
const isProduction = process.env.NODE_ENV === 'production';
const isTest = process.env.NODE_ENV === 'test';
const isUseOneapm = process.env.USE_ONEAPM === 'true';
module.exports = {
app: 'web',
... ... @@ -23,10 +22,10 @@ module.exports = {
},
cookieDomain: 'yohoblk.com',
domains: {
singleApi: 'http://192.168.102.31:8092/',
api: 'http://api.yoho.yohoops.org/',
service: 'http://service.yoho.yohoops.org/',
search: 'http://192.168.102.216:8080/yohosearch/'
// singleApi: 'http://192.168.102.31:8092/brower',
api: 'http://testapi.yoho.cn:28078/',
service: 'http://testservice.yoho.cn:28077/',
singleApi: 'http://192.168.102.31:8092/'
},
useOneapm: false,
useCache: false,
... ... @@ -59,8 +58,7 @@ module.exports = {
name: 'error',
level: 'error',
filename: 'logs/error.log',
handleExceptions: true,
maxFiles: 7
handleExceptions: true
},
udp: { // send by udp
measurement: 'yohoblk_pc_log',
... ... @@ -112,7 +110,7 @@ if (isProduction) {
session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
timeout: 3000
},
useOneapm: isUseOneapm,
useOneapm: true,
useCache: true,
pay: {
serviceNotify: 'http://service.yoho.cn/'
... ... @@ -133,10 +131,10 @@ if (isProduction) {
Object.assign(module.exports, {
appName: 'www.yohoblk.com for test',
domains: {
singleApi: process.env.TEST_SINGLEAPI || 'http://192.168.102.31:8092/',
api: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
service: process.env.TEST_SERVICE || 'http://testservice.yoho.cn:28077/',
search: process.env.TEST_SEARCH || 'http://192.168.102.216:8080/yohosearch/'
singleApi: 'http://192.168.102.31:8092/brower',
api: 'http://testapi.yoho.cn:28078/',
service: 'http://testservice.yoho.cn:28077/',
search: 'http://192.168.102.216:8080/yohosearch/'
},
useOneapm: true,
useCache: true,
... ...
No preview for this file type
... ... @@ -2,7 +2,7 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>
Created by FontForge 20120731 at Wed Aug 17 17:32:05 2016
Created by FontForge 20120731 at Tue Aug 23 17:49:33 2016
By admin
</metadata>
<defs>
... ... @@ -16,10 +16,10 @@ Created by FontForge 20120731 at Wed Aug 17 17:32:05 2016
ascent="896"
descent="-128"
x-height="792"
bbox="0 -224 1303 896.303"
bbox="0 -224 1506 896.303"
underline-thickness="50"
underline-position="-100"
unicode-range="U+0078-E64D"
unicode-range="U+0078-E650"
/>
<missing-glyph horiz-adv-x="374"
d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
... ... @@ -108,9 +108,9 @@ q0 56 -31 105h363q-30 -49 -30 -105q0 -82 58 -140t140 -58t140 58t58 140q0 56 -31
t74 -31t31 -74z" />
<glyph glyph-name="uniE61B" unicode="&#xe61b;"
d="M0 -128v1024h1024v-1024h-1024zM512 704q-133 0 -226.5 -93.5t-93.5 -226.5t93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5t-93.5 226.5t-226.5 93.5z" />
<glyph glyph-name="uniE61C" unicode="&#xe61c;" horiz-adv-x="1093"
d="M1092 225v171q0 101 -39.5 193.5t-106.5 159.5t-160 107t-194 40h-92q-101 0 -193.5 -40t-159.5 -107t-107 -159.5t-40 -193.5v-173v-317q0 -14 10 -24t24 -10h175q15 0 24.5 10t9.5 24v317q0 15 -9.5 24.5t-24.5 9.5h-128v116q0 88 34 168t92 137.5t138 92t168 34.5h67
q87 0 167 -34.5t138 -92t92 -137.5t34 -168v-113h-129q-15 0 -24.5 -10t-9.5 -25v-317q0 -14 9.5 -24t24.5 -10h175q14 0 24 10t10 24z" />
<glyph glyph-name="uniE61C" unicode="&#xe61c;" horiz-adv-x="1092"
d="M1092 226v170q0 101 -40 193.5t-107 159.5t-159.5 107t-193.5 40h-92q-101 0 -193.5 -40t-159.5 -107t-107 -159.5t-40 -193.5v-173v-317q0 -14 10 -24t24 -10h176q14 0 24 10t10 24v317q0 14 -10 24t-24 10h-130v116q0 87 34.5 167t92.5 138t138 92.5t167 34.5h67
q88 0 168 -34.5t138 -92.5t92 -138t34 -167v-113h-129q-14 0 -24 -10t-10 -24v-317q0 -14 10 -24t24 -10h176q14 0 24 10t10 24v317z" />
<glyph glyph-name="uniE61D" unicode="&#xe61d;"
d="M783 526l-45 45l-226 -226l-226 226l-45 -45l226 -226l-226 -226l45 -46l226 227l226 -227l45 46l-226 226z" />
<glyph glyph-name="uniE61E" unicode="&#xe61e;"
... ... @@ -254,9 +254,19 @@ d="M1028 -36l-93 -92l-204 203q-123 -92 -273 -92q-93 0 -178 36.5t-146 97.5t-97.5
t119 -118.5t164 -43.5t164.5 43.5t119 118.5t43.5 163.5t-43.5 163.5t-119 119t-164.5 44v0z" />
<glyph glyph-name="uniE64B" unicode="&#xe64b;"
d="M812 568l-137 328h-326l-137 -328h-206l79 -696h854l79 696h-206zM418 786h189l91 -218h-371z" />
<glyph glyph-name="uniE64C" unicode="&#xe64c;"
d="M327 -128q16 0 24 12l376 500l-373 500q-7 9 -20 11t-22 -5q-11 -6 -12.5 -19.5t6.5 -22.5l346 -464l-349 -464q-7 -9 -5 -22t11 -20q6 -6 18 -6z" />
<glyph glyph-name="uniE64D" unicode="&#xe64d;"
d="M512 886q-102 0 -195 -39.5t-160.5 -107t-107 -160.5t-39.5 -195t39.5 -195t107 -160.5t160.5 -107t195 -39.5t195 39.5t160.5 107t107 160.5t39.5 195t-39.5 195t-107 160.5t-160.5 107t-195 39.5zM521 -15q-34 0 -58.5 24t-24.5 58.5t24.5 58.5t58.5 24t58 -24t24 -58
q1 -34 -23.5 -58.5t-58.5 -24.5zM738 477q-17 -34 -67 -83q-45 -43 -60 -61q-12 -16 -17 -35q-6 -22 -6 -61l1 -31h-142v30q0 56 9 90q11 38 30 64q17 23 62 71q43 44 52 60q8 13 8 44q0 28 -20 51q-20 21 -61 21q-29 0 -48.5 -9.5t-28.5 -27.5t-12.5 -36t-3.5 -43v-30h-142
l1 31q2 72 18 111q16 40 52 73q34 31 78 46q41 14 88 14q96 0 160 -56q66 -59 66 -154q0 -43 -17 -79z" />
<glyph glyph-name="uniE64E" unicode="&#xe64e;"
d="M697 -128q-16 0 -24 12l-376 500l373 500q7 9 20 11t22 -5t11 -20t-5 -22l-346 -464l349 -467q7 -9 5 -22t-11 -20q-6 -3 -18 -3z" />
<glyph glyph-name="uniE64F" unicode="&#xe64f;"
d="M799 456l127 128v312h-51h-77h-574h-128v-445v-162v-2l421 -412l409 404v181l-415 -401l-287 283v426h574v-312h1zM671 519l-107 21l-53 101l-53 -101l-107 -21l75 -84l-14 -113l99 48l99 -48l-14 113z" />
<glyph glyph-name="uniE650" unicode="&#xe650;" horiz-adv-x="1506"
d="M885 540q-13 14 -31 22t-40 8t-39.5 -8t-30.5 -22t-20 -33t-7 -41q0 -23 7 -43t20 -33.5t30.5 -21.5t39.5 -8t39.5 8t30.5 21.5t20.5 33.5t7.5 43q0 22 -7.5 41t-19.5 33v0zM1084 896h-663q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -212v-602l261 181h823q115 0 212 56.5
t153.5 153.5t56.5 211.5t-56.5 211.5t-153.5 153.5t-212 56.5v0zM574 294h-82v142h-133v-142h-83v341h83v-129h133v129h82v-341v0zM986 392q-14 -34 -39 -57.5t-59 -37t-74 -13.5t-74 13t-59 37t-39 57.5t-14 74.5t14 74t39 56t59 35.5t74 12.5t74 -12.5t59 -35.5t39 -56
t14 -74t-14 -74zM1283 564h-97v-270h-82v270h-96v71h275v-71z" />
</font>
</defs></svg>
... ...
No preview for this file type
No preview for this file type
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 243.422 102.159" enable-background="new 0 0 243.422 102.159" xml:space="preserve">
<g id="XMLID_16_">
<path id="XMLID_2_" fill="#3B95C8" d="M56.974,1.928v70.768h18.478V76H56.974v24.231h-3.359V76H0v-3.442l53.194-70.63H56.974z
M3.92,72.695h49.694V7.298h-0.42L3.92,72.695z"/>
<path id="XMLID_5_" fill="#040000" d="M148.238,17.485c3.919,8.536,6.019,19.688,6.019,33.595c0,13.768-2.1,25.058-6.019,33.594
c-5.459,11.564-14.278,17.485-26.597,17.485c-12.318,0-21.277-5.921-26.597-17.485c-3.92-8.536-5.879-19.688-5.879-33.594
c0-14.044,1.959-25.196,5.879-33.595C100.364,5.783,109.323,0,121.641,0C133.96,0,142.779,5.783,148.238,17.485z M98.124,19
c-3.78,7.985-5.6,18.587-5.6,32.08c0,13.354,1.82,24.094,5.6,32.079c4.899,10.464,12.738,15.695,23.517,15.695
c10.639,0,18.478-5.231,23.518-15.695c3.779-8.123,5.739-18.862,5.739-32.079c0-13.355-1.96-24.095-5.739-32.08
c-5.04-10.464-12.878-15.695-23.518-15.695C110.862,3.305,103.023,8.536,98.124,19z"/>
<path id="XMLID_8_" fill="#3B95C8" d="M224.944,1.928v70.768h18.478V76h-18.478v24.231h-3.359V76h-53.614v-3.442l53.194-70.63
H224.944z M171.891,72.695h49.694V7.298h-0.42L171.891,72.695z"/>
</g>
</svg>
... ...
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 232.923 102.159" enable-background="new 0 0 232.923 102.159" xml:space="preserve">
<g id="XMLID_27_">
<path id="XMLID_2_" fill="#3B95C8" d="M61.593,1.928v3.305H11.059L7,47.638h0.56c2.799-3.718,6.439-6.608,11.199-8.674
c4.339-1.928,8.959-2.892,13.718-2.892c9.519,0,17.218,2.754,23.097,8.398c6.16,5.921,9.239,14.181,9.239,24.783
c0,9.361-3.08,17.21-9.239,23.543c-6.159,6.195-13.998,9.362-23.657,9.362c-8.399,0-15.398-2.341-21.138-6.746
C4.34,90.456,0.7,83.572,0,74.898h3.5c0.56,7.572,3.779,13.63,9.519,18.036c5.18,3.992,11.479,6.058,18.898,6.058
c8.679,0,15.678-2.892,21.278-8.536c5.459-5.782,8.259-12.804,8.259-21.202c0-9.638-2.8-17.21-8.259-22.442
c-5.319-5.094-12.179-7.572-20.718-7.572c-5.459,0-10.499,1.377-15.258,4.13c-4.759,2.754-8.399,6.472-10.639,11.152h-3.5
L7.839,1.928H61.593z"/>
<path id="XMLID_4_" fill="#040000" d="M142.919,17.485c3.919,8.536,6.019,19.688,6.019,33.595c0,13.767-2.1,25.057-6.019,33.593
c-5.459,11.564-14.278,17.485-26.597,17.485c-12.318,0-21.277-5.921-26.597-17.485c-3.92-8.536-5.879-19.688-5.879-33.593
c0-14.044,1.959-25.196,5.879-33.595C95.044,5.783,104.003,0,116.322,0C128.641,0,137.459,5.783,142.919,17.485z M92.805,19
c-3.78,7.985-5.6,18.587-5.6,32.08c0,13.354,1.82,24.093,5.6,32.079c4.899,10.464,12.738,15.695,23.517,15.695
c10.639,0,18.478-5.231,23.518-15.695c3.779-8.123,5.739-18.862,5.739-32.079c0-13.355-1.96-24.095-5.739-32.08
C134.8,8.536,126.961,3.305,116.322,3.305C105.543,3.305,97.704,8.536,92.805,19z"/>
<path id="XMLID_7_" fill="#040000" d="M226.904,17.485c3.919,8.536,6.019,19.688,6.019,33.595c0,13.767-2.1,25.057-6.019,33.593
c-5.46,11.564-14.278,17.485-26.598,17.485c-12.318,0-21.277-5.921-26.597-17.485c-3.92-8.536-5.879-19.688-5.879-33.593
c0-14.044,1.959-25.196,5.879-33.595C179.029,5.783,187.988,0,200.307,0C212.626,0,221.444,5.783,226.904,17.485z M176.79,19
c-3.78,7.985-5.6,18.587-5.6,32.08c0,13.354,1.819,24.093,5.6,32.079c4.899,10.464,12.738,15.695,23.517,15.695
c10.639,0,18.479-5.231,23.518-15.695c3.779-8.123,5.739-18.862,5.739-32.079c0-13.355-1.96-24.095-5.739-32.08
c-5.039-10.464-12.879-15.695-23.518-15.695C189.528,3.305,181.689,8.536,176.79,19z"/>
</g>
</svg>
... ...
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="1371.6796875" height="200" viewBox="0 0 1371.6796875 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"><![CDATA[
@font-face { font-family: ifont; src: url("//at.alicdn.com/t/font_1442373896_4754455.eot?#iefix") format("embedded-opentype"), url("//at.alicdn.com/t/font_1442373896_4754455.woff") format("woff"), url("//at.alicdn.com/t/font_1442373896_4754455.ttf") format("truetype"), url("//at.alicdn.com/t/font_1442373896_4754455.svg#ifont") format("svg"); }
]]></style></defs><g class="transform-group"><g transform="scale(0.1953125, 0.1953125)"><path d="M1346.600908 0.01535c-257.761441 0-466.72443 208.955313-466.72443 466.72443s208.955313 466.72443 466.72443 466.72443 466.72443-208.955313 466.72443-466.72443S1604.36235 0.01535 1346.600908 0.01535zM1346.600908 753.643676c-158.452982 0-286.903896-128.450914-286.903896-286.903896s128.450914-286.903896 286.903896-286.903896 286.903896 128.450914 286.903896 286.903896S1505.053891 753.643676 1346.600908 753.643676zM3515.530198 0.01535c-257.761441 0-466.72443 208.955313-466.72443 466.72443s208.955313 466.72443 466.72443 466.72443 466.72443-208.955313 466.72443-466.72443S3773.29164 0.01535 3515.530198 0.01535zM3515.530198 753.643676c-158.452982 0-286.903896-128.450914-286.903896-286.903896s128.450914-286.903896 286.903896-286.903896c158.452982 0 286.903896 128.450914 286.903896 286.903896S3673.983181 753.643676 3515.530198 753.643676zM4216.476457 0.01535l179.812859 0 0 735.683881-179.812859 0 0-735.683881ZM4396.289316 801.29086 4216.476457 801.29086 4327.320631 1024 4457.222144 1024ZM586.824806 0.01535 396.635177 331.488705 206.998156 0.01535 0 0.01535 306.414067 533.214049 306.414067 933.456535 486.234601 933.456535 486.234601 533.237074 793.884363 0.01535ZM2611.02424 347.215038 2251.122217 347.215038 2251.122217 0.01535 2071.301683 0.01535 2071.301683 933.456535 2251.122217 933.456535 2251.122217 527.027897 2611.02424 527.027897 2611.02424 933.456535 2790.837098 933.456535 2790.837098 0.01535 2611.02424 0.01535ZM5228.78724 424.672413c37.232038-43.525641 56.051447-94.979688 56.051447-153.379724 0-37.922799-8.17401-75.853273-24.2841-112.571077-15.818435-36.579652-37.615794-67.648563-65.00832-92.562023-27.215998-24.215023-60.794675-41.576159-99.707566-51.615224-36.963408-9.655309-86.690551-14.536689-147.807582-14.536689l-156.296272 0 0 933.44886 225.848266 0c62.345051 0 115.257372-5.894497 158.038526-17.721867 40.163936-12.564182 76.789639-35.167429 108.626062-66.980827 53.403529-52.175509 80.489049-116.869148 80.489049-192.31564 0-57.394594-15.304202-108.580012-45.321621-151.975176C5296.036697 469.878907 5265.658547 443.154117 5228.78724 424.672413zM5084.272287 354.398957c-18.635207 17.744892-50.179976 26.72479-93.705617 26.72479l-19.018963 0 0-212.209567 24.191998 0c39.112444 0 68.730756 8.918497 88.018348 26.479186 18.949887 17.269034 28.160038 42.83488 28.160038 78.178836C5111.918092 310.297681 5102.869118 336.730816 5084.272287 354.398957zM4971.547707 539.100871l44.891814 0c65.768157 0 111.043727 10.92938 134.62939 32.596261 23.946394 21.682232 35.57421 47.71626 35.57421 79.568034 0 32.749764-12.049948 59.029396-36.602677 80.128319-24.01547 20.093481-63.933802 30.286048-118.657453 30.286048l-59.835285 0L4971.547707 539.100871zM5805.941387 0.01535 5626.128528 0.01535 5626.128528 933.456535 6066.918707 933.456535 6066.918707 761.687209 5805.941387 761.687209ZM7022.778935 0.01535 6779.001574 0.01535 6466.148076 320.689802 6466.148076 0.01535 6286.327542 0.01535 6286.327542 933.456535 6466.148076 933.456535 6466.148076 552.678169 6468.987873 549.830698 6779.469757 933.456535 7018.657393 933.456535 6597.239233 426.176738Z" fill="#272636"></path></g></g></svg>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 173 196.5" style="enable-background:new 0 0 173 196.5;" xml:space="preserve">
<style type="text/css">
.st0{fill:#B0B0B0;}
</style>
<path id="XMLID_3_" class="st0" d="M173,196.5H0V51.6h173V196.5z M4,192.5h165V55.6H4V192.5z"/>
<path id="XMLID_2_" class="st0" d="M132.5,52.4h-4V46c0-23.2-18.9-42-42-42c-23.2,0-42,18.9-42,42v6.3h-4V46c0-25.4,20.6-46,46-46
c25.4,0,46,20.6,46,46V52.4z"/>
</svg>
... ...
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 181.9 181.9" style="enable-background:new 0 0 181.9 181.9;" xml:space="preserve">
<style type="text/css">
.st0{fill:#B0B0B0;}
</style>
<g id="XMLID_691_">
<path id="XMLID_3_" class="st0" d="M76.4,152.8C34.3,152.8,0,118.5,0,76.4C0,34.3,34.3,0,76.4,0s76.4,34.3,76.4,76.4
C152.8,118.5,118.5,152.8,76.4,152.8z M76.4,4C36.5,4,4,36.5,4,76.4c0,39.9,32.5,72.4,72.4,72.4c39.9,0,72.4-32.5,72.4-72.4
C148.8,36.5,116.3,4,76.4,4z"/>
<rect id="XMLID_2_" x="118.9" y="153" transform="matrix(0.7071 0.7071 -0.7071 0.7071 155 -64.2031)" class="st0" width="72.1" height="4"/>
</g>
</svg>
... ...
... ... @@ -6,6 +6,8 @@
var $ = require('yoho-jquery'),
dialog = require('../plugins/dialog');
var lazyLoad = require('yoho-jquery-lazyload');
var $commentArea = $('#comment-area'),
articleId = $('.detail-body').data('id');
... ... @@ -26,6 +28,8 @@ var $commentList = $commentArea.find('.comments-wrap'),
require('../plugins/share');
require('../common/header');
lazyLoad($('img'));
// require('yoho-unslider');
$('#prise-btn').click(function() {
... ...
... ... @@ -17,6 +17,8 @@ var validate = require('./order/validation');
var imgBoxTpl = require('../../tpl/me/thumbnail.hbs');
var changeTypeTpl = require('../../tpl/me/change-type.hbs');
var upload = require('../plugins/upload');
var validateMap = {
user: {
sl: '#user',
... ... @@ -300,6 +302,9 @@ function bindConfirmEvent() {
var $f = $good.find('.form');
var $specialReason = $good.find('.special-reason');
$imgs = null;
imgs = [];
goodObj.product_skn = $c.data('skn');
goodObj.product_skc = $c.data('skc');
goodObj.product_sku = $c.data('sku');
... ... @@ -371,51 +376,64 @@ function bindImgDeleteEvent() {
});
}
function bindUploadEvent() {
var $tip = $('.img-up-tip');
function doUpload(count, goodIndex) {
var $el = $('*[data-good-index=' + goodIndex + ']');
$tip.text('0/4');
if (count < 4) {
upload.up({
callback: function(result) {
var img;
var $t;
var o;
var n;
$('.img-upload').on('click', function() {
var upload = require('../plugins/upload');
var that = this;
var n = parseInt($(that).siblings('.thumb-box').length, 10);
if (result.code === 200) {
n = parseInt($el.siblings('.thumb-box').length, 10);
o = {src: result.data};
if (result.imgs && result.imgs.length) {
o.url = result.imgs[0];
}
if (n < 4) {
upload.up({
callback: function(result) {
var img;
var $t;
var o;
img = imgBoxTpl(o);
$t = $el.next('.img-up-tip');
$el.before(img);
if (result.code === 200) {
n = parseInt($(that).siblings('.thumb-box').length, 10);
o = {src: result.data};
n += 1;
$t.text(n + '/4');
bindImgDeleteEvent();
if (result.imgs && result.imgs.length) {
o.url = result.imgs[0];
}
if (n >= 4) {
$el.hide();
}
img = imgBoxTpl(o);
$t = $(that).next('.img-up-tip');
$(that).before(img);
} else {
new _alert(result.message).show();
}
}
});
}
n += 1;
$t.text(n + '/4');
bindImgDeleteEvent();
}
if (n >= 4) {
$(that).hide();
}
function bindUploadEvent() {
var $tip = $('.img-up-tip');
} else {
new _alert(result.message).show();
}
}
});
}
$tip.text('0/4');
$('.img-upload').each(function(index, uploadBtn) {
$(uploadBtn).on('click', function() {
var that = this;
var n = parseInt($(that).siblings('.thumb-box').length, 10);
var goodIndex = $(that).data('good-index');
if (n > 4) {
return false;
}
doUpload(n, goodIndex);
});
});
}
... ...
... ... @@ -45,8 +45,8 @@ var $ = require('yoho-jquery'),
_createOrient: function() {
var orientHtml = '<div class="slide-switch">' +
'<a class="prev" href="javascript:;"><span class="iconfont">&#xe635;</span></a>' +
'<a class="next" href="javascript:;"><span class="iconfont">&#xe636;</span></a>' +
'<a class="prev" href="javascript:;"><span class="iconfont">&#xe64e;</span></a>' +
'<a class="next" href="javascript:;"><span class="iconfont">&#xe64c;</span></a>' +
'</div>';
if (this.$element.find('.slide-switch').length > 0) {
... ...
... ... @@ -16,6 +16,8 @@ var $result,
$upload,
$filename;
var uping;
var num,
inter,
callback;
... ... @@ -27,8 +29,12 @@ $upload = $('#yoho-upload');
$filename = $upload.find('.file-name');
function up(opt) {
if (uping) {
return;
}
$filename.click();
if (opt) {
if (opt && typeof opt.callback === 'function') {
callback = opt.callback;
} else {
callback = '';
... ... @@ -40,22 +46,24 @@ function getResponse(cb) {
inter = setInterval(function() {
var res = $result[0].contentDocument.body.innerText || '';
if (num > 20 || res) {
uping = false;
clearInterval(inter);
}
num++;
if (res) {
$result[0].contentDocument.body.innerText = '';
if (cb) {
return cb($.parseJSON(res));
}
}
if (num > 20 || res) {
clearInterval(inter);
}
num++;
}, 500);
}
$filename.change(function() {
uping = true;
$upload.submit();
getResponse(callback);
});
... ...
<<<<<<< HEAD
.brand-page {
padding-bottom: 80px;
... ... @@ -139,3 +140,146 @@
margin-top: 0 !important;
}
}
=======
.brand-page {
padding-bottom: 80px;
.brands-tabs {
position: relative;
margin-bottom: 20px;
overflow: hidden;
height: 304px;
a {
display: block;
width: 370px;
height: 304px;
img {
width: 100%;
height: 100%;
display: block;
}
.g-mask {
width: 100%;
height: 100%;
display: block;
position: absolute;
z-index: 1;
background: #ffec07;
border: 1px solid #ffec07;
opacity: 0;
}
}
li {
float: left;
margin-left: 20px;
position: relative;
p {
display: block;
font-size: 30px;
text-align: center;
color: #ffec07;
position: absolute;
top: 50%;
width: 100%;
margin-top: -15px;
z-index: 3;
}
}
li:first-child {
margin-left: 0;
}
li:hover {
.g-mask {
opacity: 0.3;
}
}
}
.category-nav {
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
width: 1150px;
height: 44px;
line-height: 44px;
font-size: 12px;
font-weight: bold;
position: relative;
z-index: 100;
background-color: #fff;
overflow: hidden;
a {
display: inline-block;
padding-left: 29px;
text-align: center;
color: #222;
cursor: pointer;
font-size: 14px;
}
}
.brands-list {
dt {
height: 58px;
line-height: 58px;
font-weight: bold;
font-size: 16px;
}
dd {
width: 1180px;
li {
float: left;
display: block;
width: 275px;
height: 250px;
margin-right: 15px;
border: 1px solid #eee;
margin-top: 20px;
}
li:nth-child(-n+4) {
margin-top: 0;
}
a {
font-size: 16px;
display: block;
width: 100%;
height: 100%;
img {
width: 275px;
height: 190px;
}
span {
display: block;
height: 60px;
line-height: 60px;
text-align: center;
font-size: 14px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
}
}
}
.category-fix {
position: fixed;
top: 0;
z-index: 100;
margin-top: 0 !important;
}
}
>>>>>>> fdb22f3939ca93c7a170f5f00241d413ae2905d7
... ...
... ... @@ -5,7 +5,7 @@
.err-404-img {
width: 244px;
height: 105px;
background: resolve('layout/404.png') no-repeat center center;
background: resolve("layout/404.svg") no-repeat center center;
margin: 0 auto;
}
... ... @@ -39,7 +39,7 @@
.err-500-img {
width: 244px;
height: 105px;
background: resolve('layout/500.png') no-repeat center center;
background: resolve("layout/500.svg") no-repeat center center;
margin: 0 auto;
}
}
... ...
... ... @@ -128,7 +128,7 @@
display: inline-block;
width: 138px;
height: 138px;
background-image: resolve('layout/qr.png');
background-image: resolve("layout/qr.png");
}
p {
... ... @@ -156,7 +156,8 @@
padding: 280px 0 130px;
text-align: center;
color: #1b1b1b;
background: resolve('layout/empty-bag.png') no-repeat center center;
background: resolve("layout/empty-bag.svg") no-repeat center 30%;
background-size: 115px 130px;
display: none;
}
... ... @@ -268,13 +269,14 @@
}
.main-logo {
width: 264px;
height: 40px;
width: 200px;
height: 30px;
left: 50%;
position: absolute;
margin-left: -132px;
margin-top: 20px;
background: resolve('layout/blk-logo.png') no-repeat center center;
background: resolve("layout/blk-logo.svg") no-repeat center center;
background-size: 100%;
a {
display: block;
... ... @@ -434,7 +436,7 @@
width: 26px;
height: 12px;
display: inline-block;
background: url('/layout/hot.png');
background: url("/layout/hot.png");
margin-left: 4px;
}
... ...
... ... @@ -8,8 +8,9 @@
.main-logo {
width: 200px;
height: 80px;
background: resolve('layout/sign-logo.png') no-repeat center center;
background: resolve("layout/blk-logo.svg") no-repeat center center;
display: inline-block;
background-size: 100%;
> a {
display: inline-block;
... ...
<<<<<<< HEAD
.editorial-detail-page {
width: 990px;
... ... @@ -584,3 +585,591 @@
display: none;
}
}
=======
.editorial-detail-page {
width: 990px;
.detail-body {
width: 990px;
margin: 30px auto;
}
.detail-title {
font-size: 24px;
text-align: center;
line-height: 40px;
word-wrap: break-word;
}
.article-info {
width: 580px;
margin: 10px auto;
clear: both;
margin-bottom: 20px;
}
.article-author {
float: left;
line-height: 64px;
}
.author-avatar {
width: 45px;
height: 64px;
a {
text-decoration: none;
color: #000;
vertical-align: middle;
}
img {
width: 38px;
height: 38px;
border-radius: 50%;
margin-top: 13px;
}
}
.author-info {
float: left;
margin-left: 10px;
font-size: 14px;
max-width: 447px;
}
.author-name {
display: block;
height: 64px;
line-height: 64px;
cursor: pointer;
color: #000;
margin-right: 100px;
}
.author-name:hover {
color: #c30;
}
.article-status {
height: 64px;
line-height: 64px;
color: #999;
font-size: 14px;
span {
margin-right: 30px;
}
}
.article-main {
text-align: center;
margin: 0 auto;
}
.article-pic {
max-width: 930px;
margin: 0 auto;
overflow: hidden;
display: block;
img {
max-width: 930px;
display: inherit;
margin: auto;
}
}
.article-pictwo {
max-width: 930px;
margin: 0 auto;
overflow: hidden;
display: block;
img {
display: inline-block;
max-width: 460px;
margin-right: 2px;
}
}
.article-text {
width: 700px;
margin: 25px auto;
p {
text-align: center;
display: block;
width: 700px;
font-size: 14px;
margin: 25px auto;
line-height: 24px;
}
}
.related-reco {
width: 990px;
padding-top: 30px;
overflow: hidden;
position: relative;
.collocation {
margin-left: 30px;
}
.btn {
position: relative;
}
.btn-left {
position: absolute;
display: block;
width: 30px;
height: 50px;
left: 0;
top: 200px;
color: #fff;
background: #ccc;
text-align: center;
line-height: 50px;
cursor: pointer;
}
.left:hover {
background: #7f7f7f;
}
.right:hover {
background: #7f7f7f;
}
.btn-right {
position: absolute;
display: block;
width: 30px;
height: 50px;
right: 0;
top: 200px;
color: #fff;
background: #ccc;
text-align: center;
line-height: 50px;
cursor: pointer;
}
}
.related-group {
position: relative;
height: 450px;
}
.related-groups {
width: 930px;
overflow: hidden;
position: relative;
height: 420px;
margin-left: 30px;
}
.related-goods {
padding-top: 60px;
.good-info {
width: 219px;
float: left;
margin: 0 18px 15px 0;
img {
width: 219px;
height: 295px;
}
.name {
font-size: 12px;
line-height: 30px;
height: 30px;
overflow: hidden;
display: block;
text-overflow: ellipsis;
white-space: nowrap;
text-align: center;
}
.price {
display: block;
line-height: 30px;
height: 30px;
text-align: center;
}
}
}
.goods {
height: 420px;
overflow: hidden;
position: absolute;
.good-info:nth-child(4n) {
margin-right: 0;
}
}
.related-brand {
margin-top: 30px;
}
.brands {
width: 975px;
padding: 30px 0 0 30px;
overflow: hidden;
}
.brand {
margin: 35px 15px 0 0;
float: left;
.thumb {
display: table-cell;
border: 1px solid #f5f5f5;
height: 120px;
width: 120px;
box-sizing: border-box;
text-align: center;
vertical-align: middle;
img {
display: block;
max-width: 120px;
max-height: 120px;
margin: 0 auto;
}
}
.brand-name {
width: 120px;
height: 30px;
font-size: 12px;
line-height: 30px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
text-align: center;
color: #333;
}
}
.brand:nth-child(7n) {
margin-right: 0;
}
.user-handle {
float: right;
ul {
display: inline-block;
li {
float: left;
margin: 0 15px;
cursor: pointer;
a {
position: relative;
display: block;
padding: 0 10px;
height: 36px;
line-height: 36px;
color: #535353;
font-size: 0;
text-align: left;
}
span {
display: inline-block;
font-style: normal;
font-size: 14px;
}
i {
display: inline-block;
font-style: normal;
margin: 0 5px 0 0;
font-size: 20px;
opacity: 0.5;
}
}
.cancel-collect {
display: none;
}
.like-status.liked i,
.like-status.hover i {
opacity: 1;
}
.like-statis.hover .like-num {
color: #000;
}
.sort-collect a {
i {
width: 21px;
}
}
.sort-collect.collected a {
i {
opacity: 1;
}
.cancel-collect {
display: inline;
}
}
.sort-collect.hover i {
opacity: 1;
}
.sort-collect.hover span {
color: #000;
}
}
}
.article-tag {
float: left;
width: 940px;
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
padding: 20px 0 20px 10px;
overflow: hidden;
margin-left: 30px;
.tag-icon {
float: left;
margin: 0 12px 0 0;
font-size: 20px;
font-style: normal;
}
ul {
float: left;
width: 890px;
li {
float: left;
margin: 0 10px 10px 0;
a {
display: block;
text-align: center;
width: 70px;
height: 30px;
line-height: 30px;
font-size: 12px;
color: #1b1b1b;
background: #eee;
}
&:hover a {
background: #333;
color: #fff;
}
}
li:first-child {
margin-left: 0;
}
}
}
.chapter {
padding-top: 15px;
line-height: 25px;
border: 1px solid #fff;
overflow: hidden;
width: 940px;
margin-left: 30px;
a {
color: #afafaf;
}
}
.chapter-right {
float: right;
span {
float: right;
}
a {
float: right;
}
}
.comment-area {
margin-top: 58px;
width: 935px;
margin-left: 30px;
.comment-publish {
height: 48px;
}
}
.comment-textarea {
textarea {
display: block;
width: 100%;
height: 110px;
padding: 12px;
resize: none;
outline: none;
font-size: 14px;
line-height: 18px;
color: #535353;
border: 1px solid #e7e7e7;
}
}
.word-count-tip {
display: block;
height: 48px;
line-height: 48px;
font-size: 12px;
color: #c8c8c8;
float: right;
.exceed-count {
color: #f00;
}
}
.publish-btn {
margin-top: 10px;
float: left;
width: 100px;
height: 30px;
line-height: 33px;
text-align: center;
color: #fff;
font-size: 14px;
background: #000;
cursor: pointer;
}
.disable {
background: #999;
}
.able {
background: #000;
}
.comments-wrap {
width: 100%;
overflow: hidden;
margin-bottom: 80px;
h4 {
font-size: 14px;
position: relative;
line-height: 32px;
border-bottom: 1px solid #bbb;
position: relative;
.comment-num {
color: #379ed6;
}
b {
display: block;
width: 12px;
height: 7px;
background: #fff;
background-image: resolve("layout/down.png");
position: absolute;
left: 15px;
}
}
.comment-pager {
float: right;
margin: 20px 0;
}
}
.comments-empty {
display: none;
color: #ccc;
margin: 20px 0;
font-size: 12px;
line-height: 12px;
text-align: center;
}
.comments-list {
li {
margin: 14px 0 0;
padding: 0 0 15px;
border-bottom: 1px dotted #e7e7e7;
.author {
width: 100%;
height: 40px;
overflow: hidden;
img {
float: left;
display: block;
width: 40px;
height: 40px;
margin-right: 15px;
}
.comment-user-name {
font-size: 14px;
line-height: 40px;
height: 40px;
font-weight: bold;
}
}
.comment-info {
.comment-content {
margin-top: 10px;
line-height: 16px;
font-size: 12px;
word-wrap: break-word;
}
.comment-time {
margin-top: 10px;
color: #c8c8c8;
font-size: 12px;
line-height: 12px;
clear: both;
}
}
}
}
.share {
padding-left: 30px;
width: 330px;
margin-top: 30px;
margin-bottom: 15px;
.share-title {
margin-right: 5px;
}
}
.hide {
display: none;
}
}
>>>>>>> fdb22f3939ca93c7a170f5f00241d413ae2905d7
... ...
... ... @@ -46,7 +46,7 @@
.cancel {
display: block;
width: 220px;
width: 240px;
height: 50px;
line-height: 50px;
font-size: 12px;
... ... @@ -244,7 +244,6 @@
width: 70px;
height: 70px;
margin-right: 10px;
}
span {
... ...
... ... @@ -6,6 +6,7 @@
clear: both;
margin-bottom: 20px;
}
select {
width: 60px;
}
... ... @@ -45,6 +46,7 @@
.input-radio {
line-height: 26px;
padding-right: 10px;
.iconfont {
font-size: 14px;
}
... ... @@ -62,7 +64,6 @@
margin-right: 5px;
}
}
}
.user-icon {
... ... @@ -82,7 +83,8 @@
width: 120px;
background-image: resolve('me/setting/default-head.png');
background-repeat: no-repeat;
background-size: 120px 120px;
background-size: 110px 110px;
background: #fff;
}
.edit-ico {
... ...
<<<<<<< HEAD
.yoho-product-list {
@import "order-area";
... ... @@ -461,3 +462,470 @@
margin-top: 20px;
}
}
=======
.yoho-product-list {
@import "order-area";
font-size: 14px;
.btn {
cursor: pointer;
}
.center-content {
.left {
width: 250px;
}
.right {
width: 850px;
}
}
.input-radio {
padding: 10px 1px;
cursor: pointer;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
.radio {
margin-left: 0;
font-size: 14px;
display: inline-block;
color: #999;
}
.checkbox {
font-size: 14px;
}
.checked {
color: #1b1b1b;
}
.round-color {
width: 22px;
height: 21px;
vertical-align: middle;
.iconfont {
font-size: 22px;
}
.iconfont.icon-cover {
font-size: 22px;
}
}
}
.input-radio label {
font-size: 14px;
font-weight: normal;
margin-left: 10px;
cursor: pointer;
}
.input-radio label.round-color {
margin-left: 0;
}
.blank-div {
height: 70px;
}
.title {
font-size: 14px;
font-weight: 700;
height: 40px;
line-height: 40px;
border-bottom: 1px solid #eee;
}
.list-body,
.size-body,
.color-body,
.brand-list,
.standard-body {
max-height: 240px;
overflow-y: auto;
}
.style-body {
max-height: 240px;
overflow-y: auto;
.input-radio {
display: inline-block;
width: 80px;
}
}
.style-mulit-btn {
margin: 15px 0;
.btn {
width: 50px;
}
.btn.white {
color: #111;
}
}
.brand-body {
margin: 5px 0;
.brand-search {
border: 0;
background-color: #eae9e9;
width: 100%;
height: 40px;
padding: 0 8px;
color: #333;
font-weight: 700;
}
}
.brand-letter-items {
margin: 15px 0;
font-size: 12px;
font-weight: bolder;
span {
padding: 5px 0;
margin: 5px 11px 5px 0;
display: inline-block;
cursor: pointer;
}
.select {
color: #379ed6;
}
.mulit-choose {
border: 1px solid #1b1b1b;
padding: 5px 10px;
cursor: pointer;
}
}
.brand-btns,
.style-btns {
text-align: center;
margin-top: 10px;
display: none;
height: 38px;
.btn {
width: auto;
padding: 0 42px;
float: left;
}
.btn.cancel {
float: right;
}
}
.btn {
display: inline-block;
}
.btn.large {
height: 38px;
line-height: 38px;
font-size: 14px;
}
.price-btns {
.price-input {
background-color: #eee;
width: 72px;
height: 38px;
line-height: 38px;
position: relative;
vertical-align: bottom;
span {
height: 30px;
line-height: 30px;
margin-top: 5px;
display: inline-block;
}
input {
border: 0;
background-color: transparent;
width: 45px;
height: 38px;
line-height: 38px;
padding: 0;
font-size: 14px;
float: right;
font-weight: 700;
}
}
.btn {
margin-left: 4px;
}
}
.yoho-ui-accordion {
h3 {
font-size: 14px;
font-weight: 700;
height: 40px;
line-height: 40px;
border-bottom: 1px solid #eee;
display: block;
cursor: pointer;
position: relative;
.ui-accordion-header-icon {
position: absolute;
right: 0.5em;
top: 50%;
margin-top: -20px;
}
.ui-accordion-header-icon:after {
font-family: "iconfont" !important;
display: inline-block;
content: "\e616";
}
}
h3.ui-accordion-header-active {
.ui-accordion-header-icon:after {
font-family: "iconfont" !important;
display: inline-block;
content: "\e617";
}
}
> .body {
padding: 10px 0;
border-bottom: 1px solid #eee;
}
}
.filter-area {
background-color: #eae9e9;
margin-bottom: 30px;
label {
font-size: 14px;
font-weight: 700;
margin-left: 20px;
}
label.cancel {
float: right;
color: #878787;
margin: 27px 20px 0 0;
cursor: pointer;
}
.filter-item {
display: inline-block;
margin: 12px 10px;
font-size: 14px;
border: 1px solid #adacad;
background-color: #fff;
padding: 8px;
cursor: pointer;
span {
font-size: 14px;
display: inline-block;
height: 21px;
line-height: 21px;
}
span.label {
margin: 0 4px;
}
span.cancel {
font-size: 14px;
}
.round-color {
width: 22px;
height: 20px;
vertical-align: middle;
margin-left: 5px;
.iconfont {
font-size: 22px;
}
.iconfont.icon-cover {
font-size: 22px;
}
}
}
}
.goods-area {
margin: 0 -15px;
position: relative;
.goods {
margin: 10px 0 16px;
padding: 10px 13px;
float: left;
text-align: center;
border: 2px solid #fff;
cursor: pointer;
width: 289px;
.goods-brand {
font-weight: 700;
padding: 10px 10px 4px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.goods-img {
position: relative;
overflow: hidden;
width: 263px;
height: 351px;
img {
margin: 0;
}
.label {
background-color: #408ccc;
height: 24px;
width: 100%;
position: absolute;
bottom: 0;
z-index: 1;
line-height: 24px;
color: #fff;
}
}
.goods-name {
padding: 10px;
width: 263px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
a {
line-height: 17px;
font-size: 12px;
}
}
.goods-price {
padding: 10px;
font-size: 16px;
font-weight: 700;
b {
font-size: 12px;
color: #878787;
margin-left: 15px;
text-decoration: line-through;
}
}
}
.goods-wrapper {
border: 2px solid #eae9e9;
position: absolute;
background: #fff;
z-index: 2;
top: 10px;
padding-right: 10px;
min-width: 383px;
display: none;
.goods {
margin: 0;
border: 0;
}
.goods-img-list {
margin: 2px 0 2px 10px;
float: left;
.goods-img-col {
display: inline-block;
vertical-align: top;
width: 60px;
margin-right: 10px;
}
img {
margin: 8px 0;
cursor: pointer;
}
}
}
}
.blk-pagination {
text-align: center;
margin: 20px 0 40px;
width: auto;
li {
width: auto;
margin: 0 4px;
}
li:first-child,
li:last-child {
border-width: 2px;
}
}
}
.yoho-list-empty {
height: 800px;
.tip-search {
padding-top: 100px;
text-align: center;
.tip-search-img {
height: 100px;
background-image: resolve("product/search.svg");
background-repeat: no-repeat;
background-position-x: 50%;
}
}
p {
text-align: center;
}
.tip-cn {
margin-top: 30px;
font-size: 18px;
font-weight: 700;
span {
color: #379ed6;
}
}
.tip-en {
margin-top: 15px;
font-size: 14px;
}
.tip-cn-sm {
margin-top: 20px;
}
}
>>>>>>> fdb22f3939ca93c7a170f5f00241d413ae2905d7
... ...
... ... @@ -5,10 +5,10 @@
text-align: center;
.empty-cart-bg {
background: resolve('layout/bag-bg.png') no-repeat center center;
width: 163px;
height: 198px;
margin: 0 auto;
background: resolve("layout/empty-bag.svg") no-repeat center center;
width: 115px;
height: 130px;
margin: 0 auto 30px;
}
.empty-cart-info {
... ...