fe / yohobuywap-node · Commits

Go to a project

Authored by ccbikai(👎🏻🍜)
Commit be60a7e9b383d88c0867d2bcbdba2b12c98d6826 2 parents 1292ba7b e0d374e8

Merge branch 'release/5.6' of git.yoho.cn:fe/yohobuywap-node into release/5.6

Inline Side-by-side
Showing 9 changed files with 39 additions and 26 deletions
... ... @@ -5,8 +5,8 @@
{{!--shop-header--}}
<div class="shop-header brand-header">
{{#if banner}}
<div class="branner-top">
<img class="shop-back-img" src="{{image banner 750 234}}">
<div class="branner-top" style="background-image:url({{image banner 750 234}})">
<div class="shop-back-img"></div>
{{#if shopInfo.shop_logo}}
<img class="logo" src="{{image shopInfo.shop_logo 100 100}}">
{{/if}}
... ... @@ -26,7 +26,7 @@
</li>
<em>|</em>
<li class="shop-tab-nav tab-nav">
<span data-target="#all-goods" data-trigger="tab" data-funGetNewGoods>上新</span>
<span data-target="#all-goods" data-trigger="tab" data-funGetNewGoods>新品</span>
</li>
<em>|</em>
<li class="shop-tab-nav tab-nav">
... ...
<div class="item">
{{#if link}}
<a href="{{link}}">
<img class="item-pic" src="{{image2 src}}" alt="">
<img class="item-pic" src="{{#ifand isGood triple}}{{image2 src w=235 h=314}}{{^}}{{image2 src}}{{/ifand}}" alt="">
</a>
{{^}}
<img class="item-pic" src="{{image2 src}}" alt="">
<img class="item-pic" src="{{#ifand isGood triple}}{{image2 src w=235 h=314}}{{^}}{{image2 src}}{{/ifand}}" alt="">
{{/if}}
{{#if showProductInfo}}
... ...
... ... @@ -71,7 +71,7 @@
{{#isEqual module_type 'TripleImage'}}
<div class="{{#isEqual ../displayType 1}}items-3-3{{/isEqual}}{{#isEqual ../displayType 2}}items-3-3 items-small{{/isEqual}}{{#isEqual ../displayType 3}}items-3-2 items-3-2-right{{/isEqual}}{{#isEqual ../displayType 4}}items-3-2 items-3-2-left{{/isEqual}} clearfix">
{{#each ../pics}}
{{> reds-shop/item}}
{{> reds-shop/item triple=true}}
{{/each}}
</div>
{{#if ../isModuleMargin}}
... ...
... ... @@ -2,7 +2,7 @@
* @Author: Targaryen
* @Date: 2017-04-13 14:43:19
* @Last Modified by: Targaryen
* @Last Modified time: 2017-04-18 11:36:23
* @Last Modified time: 2017-04-18 16:39:47
*/
/* ***************
... ... @@ -82,15 +82,11 @@ $sureResetBtn.on('click', function() {
success: function(result) {
tip.show(result.message);
let href = '/passport/password/resetsuccess';
if (result.code !== 200) {
href = '/passport/login';
if (result.code === 402) {
setTimeout(function() {
window.location.href = '/passport/login';
}, 500);
}
setTimeout(function() {
window.location.href = href;
}, 500);
},
error: function() {
tip.show('系统异常！');
... ...
... ... @@ -40,6 +40,7 @@
.nav-sub-right {
@extend nav;
width: 120px;
height: 105px;
line-height: 105px;
}
... ...
... ... @@ -68,6 +68,7 @@
color: #fff;
background-color: transparent;
border: none;
width: 100%;
}
input::-webkit-input-placeholder {
... ...
... ... @@ -14,10 +14,13 @@
height: 234px;
position: relative;
overflow: hidden;
background-size: 100%;
background-repeat: no-repeat;
.shop-back-img {
height: 100%;
width: 100%;
background-color: rgba(0, 0, 0, 0.2);
}
}
... ...
... ... @@ -2,7 +2,7 @@
* @Author: Targaryen
* @Date: 2017-03-23 17:12:53
* @Last Modified by: Targaryen
* @Last Modified time: 2017-04-18 14:51:52
* @Last Modified time: 2017-04-18 16:04:40
*/
// 红人店铺首页
... ... @@ -68,13 +68,12 @@
.items-s1 {
position: relative;
background-color: #fff;
margin: 30px;
.item-info {
padding: 12px;
display: flex;
align-items: center;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1) 0%, rgba(0, 0, 0, 0.3) 40%, rgba(0, 0, 0, 0.6) 80%, rgba(0, 0, 0, 0.8) 100%);
background-color: rgba(0, 0, 0, 0.3);
}
.item-info > div {
... ... @@ -97,7 +96,7 @@
.item-info {
padding: 12px;
background-color: rgba(0, 0, 0, 0.5);
background-color: rgba(0, 0, 0, 0.3);
}
.item-info > div {
... ... @@ -123,7 +122,7 @@
padding: 16px;
display: flex;
align-items: center;
background-color: rgba(0, 0, 0, 0.5);
background-color: rgba(0, 0, 0, 0.3);
.name {
float: left;
... ... @@ -156,6 +155,7 @@
img {
width: auto;
height: 100%;
}
}
... ... @@ -164,6 +164,7 @@
img {
width: auto;
height: 100%;
}
}
}
... ... @@ -175,6 +176,7 @@
img {
width: auto;
height: 100%;
}
}
... ... @@ -183,6 +185,7 @@
img {
width: auto;
height: 100%;
}
}
... ... @@ -207,7 +210,7 @@
.item-info {
padding: 12px;
background-color: rgba(0, 0, 0, 0.5);
background-color: rgba(0, 0, 0, 0.3);
}
.item-info > div {
... ... @@ -263,7 +266,7 @@
display: flex;
flex-direction: column;
justify-content: center;
background-color: rgba(0, 0, 0, 0.5);
background-color: rgba(0, 0, 0, 0.3);
}
}
... ... @@ -323,7 +326,7 @@
font-size: 24px;
padding: 10px 20px;
border-radius: 50px;
background-color: rgba(0, 0, 0, 0.5);
background-color: rgba(0, 0, 0, 0.3);
}
}
... ... @@ -334,7 +337,8 @@
.margin-bottom {
width: 100%;
height: 40px;
height: 20px;
background-color: #f0f0f0;
}
.all-goods {
... ...
... ... @@ -2,7 +2,7 @@
* @Author: Targaryen
* @Date: 2017-03-23 11:02:31
* @Last Modified by: Targaryen
* @Last Modified time: 2017-04-14 15:05:27
* @Last Modified time: 2017-04-18 16:28:28
*/
/* 红人店铺数据处理 */
... ... @@ -114,7 +114,7 @@ const _tools = {
module_type: 'CarouselImage',
num: countCarouselImage,
pics: _picsHandle(moduleData),
isModuleMargin: Boolean(_.get(moduleData, 'properties.isModuleMargin', 0)),
isModuleMargin: _.get(moduleData, 'properties.isModuleMargin', 0),
};
},
... ... @@ -329,10 +329,18 @@ const pushGoodsInfo = (decorators, goodsList) => {
if (subValue.skn) {
let salesPrice = _.get(goodsObj, `${subValue.skn}.sales_price`, '');
let marketPrice = _.get(goodsObj, `${subValue.skn}.market_price`, '');
let imageSrc = _.get(goodsObj, `${subValue.skn}.default_images`, '');
decorators[key].pics[subKey].name = _.get(goodsObj, `${subValue.skn}.product_name`, '');
decorators[key].pics[subKey].salesPrice = salesPrice ? '￥' + salesPrice : '';
decorators[key].pics[subKey].marketPrice = marketPrice ? '￥' + marketPrice : '';
decorators[key].pics[subKey].isGood = true;
if (value.module_type === 'TripleImage') {
decorators[key].pics[subKey].src = imageSrc;
} else {
decorators[key].pics[subKey].src = imageSrc.split('?')[0];
}
}
});
});
... ...