fe / yoho-blk · Commits

Go to a project

Authored by biao
Commit 2bc0ca1044e800c524978a02260cc8d03028ed80 2 parents 3354ed82 89c4c3bf

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

Inline Side-by-side
Showing 10 changed files with 65 additions and 88 deletions
... ... @@ -708,12 +708,16 @@ const setSizeData = (sizeInfo) => {
}
_.forEach(sizeInfo.sizeInfoBo.sizeAttributeBos, value => {
sizeTable.thead.push({
let th = {
name: value.attributeName || ' ',
id: value.id,
doubt: true,
width: 126
});
};
if (size.sizeImage) {
th.doubt = true;
}
sizeTable.thead.push(th);
});
sizeTable.tbody = [];
... ...
... ... @@ -186,27 +186,29 @@
<span class="cn">{{titleCn}}</span>
</label>
</div>
<ul class="des-basic clearfix">
{{# basic}}
<li>
{{key}}: {{value}}
</li>
{{/ basic}}
</ul>
{{#if comfort}}
<ul class="des-comfort clearfix">
{{# comfort}}
<div class="des-wrapper">
<ul class="des-basic clearfix">
{{# basic}}
<li>
{{name}}:
<span class="min-des">{{minDes}}</span>
{{# blocks}}
<span class="comfort-block{{#if cur}} cur{{/if}}"></span>
{{/ blocks}}
<span class="max-des">{{maxDes}}</span>
{{key}}: {{value}}
</li>
{{/ comfort}}
{{/ basic}}
</ul>
{{/if}}
{{#if comfort}}
<ul class="des-comfort clearfix">
{{# comfort}}
<li>
{{name}}:
<span class="min-des">{{minDes}}</span>
{{# blocks}}
<span class="comfort-block{{#if cur}} cur{{/if}}"></span>
{{/ blocks}}
<span class="max-des">{{maxDes}}</span>
</li>
{{/ comfort}}
</ul>
{{/if}}
</div>
</div>
{{/ description}}
... ...
... ... @@ -2,7 +2,9 @@
<div class="center-content">
<ul class="about-us clearfix">
<li><a href="{{siteUrl}}">BLK首页</a></li>
<li><a href="{{siteUrl}}/help" target="_blank">客户服务</a></li>
<li>
<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank">客户服务</a>
</li>
<li><a href="{{siteUrl}}/help?id=2" target="_blank">支付方式</a></li>
<li><a href="{{siteUrl}}/help?id=31" target="_blank">配送方式</a></li>
<li><a href="{{siteUrl}}/help?id=41" target="_blank">售后服务</a></li>
... ...
... ... @@ -48,21 +48,7 @@
</a>
<div class="mini-bag-box sub-wrapper">
<div class="bag-goods bag-empty">
<dl class="mini-goods-list">
<dd class="goods-item clearfix">
<div class="thumb">
<img src="//placehold.it/48x64">
</div>
<div class="info">
<a href="">范德萨发生大幅度是</a>
<p>颜色：黄 尺码：F</p>
</div>
<div class="price">
<p>¥199.00 X1</p>
<a href="#">删除</a>
</div>
</dd>
</dl>
<dl class="mini-goods-list"></dl>
<div class="go-bag-btn">
<a href="{{../siteUrl}}/shopping/cart">去购物车结算</a>
</div>
... ...
... ... @@ -62,8 +62,7 @@
<div class="search-input">
<form id="search-form" action="{{../siteUrl}}/product/query">
<span class="iconfont left">&#xe605;</span>
<input type="text" name="query" id="search-key" class="search-key" placeholder="search"
autocomplete="off">
<input type="text" name="query" id="search-key" class="search-key" autocomplete="off">
<span class="iconfont right clear-input">&#xe608;</span>
</form>
</div>
... ...
... ... @@ -167,21 +167,22 @@ $searchKey.keyup(function(e) {
});
// ie8输入框提示特殊处理
if (!!window.ActiveXObject && !!document.documentMode) {
$searchKey.focus(function() {
var key = $searchKey.val();
// 应产品要求所有浏览器获得焦点提示文字隐藏
// if (!!window.ActiveXObject && !!document.documentMode) {
$searchKey.focus(function() {
var key = $searchKey.val();
if (key === 'search') {
$searchKey.val('').css('color', '#fff');
}
}).blur(function() {
var key = $searchKey.val();
if (key === 'search') {
$searchKey.val('').css('color', '#fff');
}
}).blur(function() {
var key = $searchKey.val();
if ($.trim(key) === '') {
$searchKey.val('search').css('color', '#aaa');
}
}).val('search').css('color', '#aaa');
}
if ($.trim(key) === '') {
$searchKey.val('search').css('color', '#aaa');
}
}).val('search').css('color', '#aaa');
// }
$clearInput.click(function() {
$searchKey.val('');
... ...
... ... @@ -397,7 +397,7 @@ Cart = {
pic: color.thumbs[0],
selectable: color.total > 0,
colorName: color.name,
rbg: color.rgb
rgb: color.rgb
});
if (color.color === defaultColor && color.cur) {
defaultImg = color.thumbs[0];
... ...
... ... @@ -25,7 +25,6 @@
&:hover {
height: 50px;
border-bottom: 2px solid #9a9a9a;
> * {
color: #9a9a9a;
... ... @@ -74,7 +73,6 @@
&:hover {
color: #9a9a9a;
height: 50px;
border-bottom: 2px solid #9a9a9a;
cursor: default;
}
... ... @@ -157,7 +155,7 @@
.bag-content {
padding: 280px 0 130px;
text-align: center;
color: #1d1d1d;
color: #1b1b1b;
background: resolve('layout/bag-bg.png') no-repeat center center;
display: none;
}
... ... @@ -193,7 +191,7 @@
.goods-item {
line-height: 2;
padding: 6px 0;
color: #1d1d1d;
color: #1b1b1b;
font-size: 14px;
& > * {
... ... @@ -249,11 +247,11 @@
}
.cur {
border-bottom: 2px solid #1d1d1d;
border-bottom: 2px solid #1b1b1b;
}
.cur > a {
color: #1d1d1d;
color: #1b1b1b;
}
}
... ... @@ -276,7 +274,7 @@
.sub-nav {
height: 50px;
background: #1d1d1d;
background: #1b1b1b;
.sub-nav-list {
max-width: 94%;
... ... @@ -325,7 +323,7 @@
top: 50px;
right: 0;
position: absolute;
background: #1d1d1d;
background: #1b1b1b;
text-align: left;
display: none;
z-index: 10;
... ...
... ... @@ -269,6 +269,11 @@
}
}
.des-wrapper {
width: 950px;
overflow: hidden;
}
.des-basic {
width: 1140px;
... ... @@ -430,7 +435,6 @@
border: 1px solid #f3f3f3;
padding: 40px 130px;
margin-top: 80px;
overflow: hidden;
.block-title {
height: 0;
... ... @@ -453,15 +457,6 @@
}
}
}
+ .arr-notice-dialog {
.content {
width: 260px;
text-align: center;
margin: 0 auto;
}
}
}
.arr-notice-dialog {
... ...
... ... @@ -8,23 +8,13 @@
<div class="colors-list mb20">
{{#each colors}}
{{#if active}}
<span class="color-item current-color {{#unless selectable}}disabled{{/unless}}"
style="background: {{rgb}}"
data-imageurl="{{image pic 100 134}}"
data-target="{{proId}}-color-{{@index}}"
data-title="{{color}}">
<span class="inner"></span>
</span>
{{^}}
<span class="color-item {{#unless selectable}}disabled{{/unless}}"
style="background: {{rgb}}"
data-imageurl="{{image pic 100 134}}"
data-target="{{proId}}-color-{{@index}}"
data-title="{{color}}">
<span class="inner"></span>
</span>
{{/if}}
<span class="color-item{{#if active}} current-color{{/if}}{{#unless selectable}} disabled{{/unless}}"
style="background: {{rgb}}"
data-imageurl="{{image pic 100 134}}"
data-target="{{proId}}-color-{{@index}}"
data-title="{{color}}">
<span class="inner"></span>
</span>
{{/each}}
</div>
... ...