fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit 6ef07ebdbdfc93b46e6529d8d102a6c63ef7b52e 2 parents 394c5fa6 6898edea

Merge branch 'feature/new-product-detail' into gray

Inline Side-by-side
Showing 7 changed files with 25 additions and 25 deletions
... ... @@ -43,7 +43,7 @@ const index = (skn, limit) => {
product_name: hp.product_name,
url: helper.urlFormat(
`/product/pro_${hp.product_id}_${defaultGoods.goods_id}/${hp.cn_alphabet}.html`, null, 'item'),
pic_url: helper.image(defaultGoods.images_url, 150, 200, 2, 70)
pic_url: helper.image(defaultGoods.images_url, 280, 382, 2, 70)
});
});
... ...
... ... @@ -1628,7 +1628,7 @@ const recommendAsync = (skn, page, limit) => {
const formatPrice = p => `¥${p}`;
const productUrl = (pid, gid, cn) => helpers.urlFormat(`/product/pro_${pid}_${gid}/${cn}.html`, null, 'item');
const productImageUrl = Fn.pipe(Fn.prop('default_images'), _.partial(helpers.image, _, 150, 200, 2, 70));
const productImageUrl = Fn.pipe(Fn.prop('default_images'), _.partial(helpers.image, _, 280, 382, 2, 70));
let products = _.get(recommendData, 'data.product_list', []).map((rp) => {
let salePrice = rp.sales_price;
... ...
... ... @@ -44,7 +44,7 @@
<div id="package" class="package-box clearfix"></div>
<div class="total-content">
<div class="other-infos">
<div class="description-material info-block getnav" id="goodsMessage" data-id="0">
<div class="description-material info-block head getnav" id="goodsMessage" data-id="0">
<p class="block-title">
<span class="title-head"> <span class="title cur">商品信息</span> </span>
</p>
... ... @@ -415,7 +415,7 @@
<span class="common-advice">
<a href="#textbox-wrapper" id="common-advice">
<i class="iconfont advice"> &#xe602;</i>
我要咨询&nbsp;&gt;
我要咨询&gt;
</a>
</span>
</p>
... ...
... ... @@ -2,7 +2,7 @@
<div class="row activity-wrapper clearfix">
<span class="title pull-left">促&nbsp;&nbsp;销： </span>
{{#if_cond activity.length '>' 3}}
{{#if_cond activity.length '>=' 3}}
<div class="activity-title">展开全部促销 <span class="iconfont index">&#xe610;</span> </div>
{{/if_cond}}
... ... @@ -11,7 +11,7 @@
{{#each activity}}
<li class="promotion-item">
<span class="ac-type">{{type}}</span>
<span class="ac-des {{#if_cond ../activity.length '>' 3}}small{{/if_cond}}">{{des}}</span>
<span class="ac-des {{#if_cond ../activity.length '>=' 3}}small{{/if_cond}}">{{des}}</span>
</li>
{{/each}}
</ul>
... ... @@ -20,9 +20,9 @@
<div class="pull-left">
<ul class="activity">
{{#each activity}}
<li class="promotion-item {{#if_cond @index '>' 3}}hide{{/if_cond}}">
<li class="promotion-item {{#if_cond @index '>=' 3}}hide{{/if_cond}}">
<span class="ac-type">{{type}}</span>
<span class="ac-des {{#if_cond ../activity.length '>' 3}}small{{/if_cond}}">{{des}}</span>
<span class="ac-des {{#if_cond ../activity.length '>=' 3}}small{{/if_cond}}">{{des}}</span>
</li>
{{/each}}
</ul>
... ...
... ... @@ -17,13 +17,13 @@ module.exports = {
cookieDomain: '.yohobuy.com',
domains: {
// test3
//singleApi: 'http://api-test3.yohops.com:9999/',
//api: 'http://api-test3.yohops.com:9999/',
//service: 'http://service-test3.yohops.com:9999/',
singleApi: 'http://api-test3.yohops.com:9999/',
api: 'http://api-test3.yohops.com:9999/',
service: 'http://service-test3.yohops.com:9999/',
singleApi: 'http://single.gray.yohops.com/',
api: 'http://api.yoho.cn/',
service: 'http://service.yoho.cn/',
//singleApi: 'http://single.gray.yohops.com/',
// api: 'http://api.yoho.cn/',
// service: 'http://service.yoho.cn/',
// api: 'http://dev-api.yohops.com:9999/',
// service: 'http://dev-service.yohops.com:9999/',
... ...
... ... @@ -7,7 +7,7 @@
<span class="question">{{question}}</span>
<span class="right-time">{{date}}</span>
</span>
<span class="answer-wrapper">
<span class="answer-wrapper clearfix">
<i class="iconfont">&#xe696;</i>
<span class="answer">
{{answer}}
... ...
... ... @@ -635,7 +635,7 @@
display: block;
width: 50px;
height: 25px;
line-height: 25px;
line-height: 27px;
text-align: center;
border: 1px solid black;
color: black;
... ... @@ -657,7 +657,7 @@
display: block;
width: 25px;
height: 25px;
line-height: 25px;
line-height: 23px;
font-size: 12px;
-moz-user-select: none;
color: black;
... ... @@ -856,7 +856,6 @@
padding-bottom: 30px;
width: 1150px;
float: left;
margin-top: 30px;
.video-player {
width: 750px;
... ... @@ -1058,6 +1057,10 @@
border-top: 1px solid #e0e0e0;
font-size: 12px;
&.head {
border-top: none !important;
}
.basic {
width: 990px;
margin: 0 auto;
... ... @@ -1183,7 +1186,7 @@
position: relative;
width: 860px;
min-height: 40px;
padding-bottom: 20px;
padding-bottom: 10px;
margin: 0 auto 20px;
.img-wrap {
... ... @@ -1396,7 +1399,7 @@
}
.cc-content {
padding: 20px 0px 0px;
padding: 0px 0px 0px;
font-size: 12px;
.comment-star {
... ... @@ -1647,7 +1650,7 @@
height: 28px;
float:left;
padding: 4px 15px 2px 15px;
line-height: 30px;
line-height: 26px;
cursor: pointer;
margin-bottom:0;
border-top: 1px solid #e0e0e0;
... ... @@ -2291,14 +2294,12 @@
.common-zan{
border-bottom: 1px solid #e0e0e0;
height: 100px;
padding-bottom: 20px;
.zan-content{
margin: 0 auto;
width: 60%;
text-align: center;
padding-top: 30px;
span{
display: inline-block;
... ... @@ -2416,7 +2417,6 @@
}
.comment-tabs{
padding-top: 12px;
border-bottom: 1px solid #444;
height: 35px;
}
... ...