fe / yoho-blk · Commits

Go to a project

Authored by yyq
Commit 9328c24f794139aa4f67bf18042a7d62643f90b4 2 parents 616991c3 2a54950f

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

Inline Side-by-side
Showing 11 changed files with 103 additions and 64 deletions
... ... @@ -142,13 +142,17 @@ const favorite = {
if (retData.brandList) {
retData.brandList.forEach(b => {
b.newProduct.forEach(p => {
p.url = `${config.siteUrl}/product/pro_${p.productId}_${p.goods[0].id}/${p.cnAlphabet}.html`; // eslint-disable-line
});
b.newProduct.push({
more: true
});
b.newProduct = _.chunk(b.newProduct, 4);
if (b.newProduct && b.newProduct.length > 0) {
b.newProduct.forEach(p => {
p.url = `${config.siteUrl}/product/pro_${p.productId}_${p.goods[0].id}/${p.cnAlphabet}.html`; // eslint-disable-line
});
b.newProduct.push({
more: true
});
b.newProduct = _.chunk(b.newProduct, 4);
} else {
b.noNewProduct = true;
}
});
}
ret.content.favorite.data = retData;
... ...
... ... @@ -131,7 +131,8 @@ const statusMap = {
value: 3,
valueStr: '交易完成',
step: 4,
showEditor: true
showEditor: true,
btns: []
}
};
... ... @@ -537,6 +538,7 @@ const getOrderDetail = (uid, code) => {
if (detail.isCancel !== 'Y') {
detail.steps = _getStepByOrderStatus(st);
console.log(st);
statusMap[st].btns.forEach(function(btn) {
btns.push(btn);
});
... ...
... ... @@ -17,49 +17,58 @@
{{brandName}}
</div>
<div class="tool-area clearfix">
<a class="btn white" href="/product/shop/{{brandDomain}}{{#if shopId}}?shopId={{shopId}}{{/if}}" target="_blank">去店铺页</a>
<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">
<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 noNewProduct}}
<p class="no-product-info">
暂无新品, 去<a href="/{{siteUrl}}/brand" 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}}
... ...
... ... @@ -189,7 +189,7 @@ $(function() {
if (len === 2) {
new _alert('修改成功！').show();
} else {
new _alert('修改失败！').show();
new _alert(data[1].message).show();
}
}
});
... ...
... ... @@ -148,8 +148,10 @@ function validatePhoneNum() {
return validate().then(function() {
hideTip($phoneNumInput);
ep.emit('phone-num', true);
return true;
}).fail(function() {
ep.emit('phone-num', false);
return false;
});
}
... ... @@ -215,8 +217,10 @@ function validateImgCaptcha() {
return validate().then(function() {
ep.emit('captcha-img', true);
return true;
}).fail(function() {
ep.emit('captcha-img', false);
return false;
});
}
... ...
... ... @@ -123,3 +123,15 @@ $('.weixin').hover(function() {
}, function() {
$('.weixin-share-box').hide();
});
// $('.weixin').mouseover(function() {
// var $el = $(this),
// type = $el.data('type');
// console.log(1)
// share(type, $el);
// });
// $('.weixin').mouseleave(function() {
// $('.weixin-share-box').hide();
// });
\ No newline at end of file
... ...
... ... @@ -304,7 +304,6 @@ var YohoListPage = {
});
},
openBrandMulitChoose: function() {
console.log(1);
$('.yoho-product-list .mulit-choose').hide();
$('.input-radio', this.brandsDoc).check({
type: 'checkbox'
... ... @@ -361,7 +360,6 @@ var YohoListPage = {
first = first.toLowerCase();
if (letter === '0-9') {
console.log(first);
if ((first >= 'a' && first <= 'z') || (first >= 'A' && first <= 'Z')) {
$(this).hide();
} else {
... ...
... ... @@ -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;
... ... @@ -272,8 +269,10 @@
.user-handle {
float: right;
ul {
display: inline-block;
li {
float: left;
margin: 0 15px;
... ... @@ -328,6 +327,7 @@
i {
opacity: 1;
}
.cancel-collect {
display: inline;
}
... ... @@ -413,7 +413,6 @@
a {
float: right;
}
}
.comment-area {
... ... @@ -496,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;
}
... ... @@ -518,7 +517,6 @@
}
.comments-list {
li {
margin: 14px 0 0;
padding: 0 0 15px;
... ... @@ -544,6 +542,7 @@
font-weight: bold;
}
}
.comment-info {
.comment-content {
margin-top: 10px;
... ... @@ -560,7 +559,6 @@
clear: both;
}
}
}
}
... ...
... ... @@ -72,6 +72,15 @@
width: 685px;
position: relative;
}
.no-product-info {
text-align: center;
margin-top: 65px;
a {
color: #379ed6;
}
}
}
.goods-info {
... ...
... ... @@ -81,7 +81,7 @@
cursor: pointer;
&.disable {
background-color: $inactive-color;
background-color: $theme-color;
}
}
... ... @@ -146,7 +146,7 @@
line-height: @height;
&.disable {
background-color: $inactive-color;
background-color: $theme-color;
}
}
... ... @@ -166,7 +166,7 @@
margin: 0 calc(($item-width - @width) / 2);
&.disable {
background-color: $inactive-color;
background-color: $theme-color;
}
}
... ... @@ -195,7 +195,7 @@
cursor: pointer;
&.disable {
background-color: $inactive-color;
background-color: $theme-color;
}
}
}
... ...