fe / yohobuy-node · Commits

Go to a project

Authored by hongweigao
Commit 2508830a81de66680c53ee3f79ee5153090191fc 2 parents 3301aa6c e5b2c1e9

Merge branch 'feature/new-product-detail' of http://git.yoho.cn/fe/yohobuy-node … 

…into feature/new-product-detail
Inline Side-by-side
Showing 10 changed files with 52 additions and 35 deletions
... ... @@ -29,6 +29,8 @@
data-id="{{goodsInfo.productId}}"
data-md5="{{goodsInfo.md5}}"
data-limitcode="{{goodsInfo.limitProductCode}}"
data-deposit ="{{goodsInfo.deposit}}"
data-secKill ="{{goodsInfo.secKill}}"
data-count="{{goodsInfo.bundle.count}}"
data-type="{{goodsInfo.bundle.type}}"
data-shop="{{goodsInfo.shopId}}">
... ... @@ -321,20 +323,16 @@
<div data-comment-list="7">
<ul>
<div class="img-4"></div>
</ul>
</div>
<div data-comment-list="6" class="m-hide">
<ul>
<div class="img-4"></div>
<div class="img-4"><span class="img-4-message">暂无评论~</span></div>
</ul>
</div>
<p class="btn-wrap">
<a class="btn" href="//www.yohobuy.com/home/comment" target="_blank">
<i class="iconfont">&#xe61e;</i> 我要评论
</a>
</p>
</div>
</div>
</div>
... ... @@ -367,7 +365,7 @@
<div class="common-question">
<p>
<span class="top-question"><i class="iconfont">&#xe695;</i>商品都是正品吗？</span>
<span><i class="iconfont">&#xe696;</i>有货www.yohobuy.com所售的商品均经品牌授权，
<span class="bottom-answer"><i class="iconfont">&#xe696;</i>有货www.yohobuy.com所售的商品均经品牌授权，
正品保障，支持专柜验货，与您亲临商场选购的商品一样享受相同的质量保证，
请您放心购买</span>
</p>
... ... @@ -376,7 +374,7 @@
<div class="common-question">
<p>
<span class="top-question"><i class="iconfont">&#xe695;</i>尺码表上的尺码标准吗？</span>
<span><i class="iconfont">&#xe696;</i>有货所售商品尺寸均为人工实物测量，
<span class="bottom-answer"><i class="iconfont">&#xe696;</i>有货所售商品尺寸均为人工实物测量，
可能会存在1-2cm的正常误差范围。</span>
</p>
</div>
... ... @@ -384,7 +382,7 @@
<div class="common-question">
<p>
<span class="top-question"><i class="iconfont">&#xe695;</i>图片颜色和实物颜色相同吗？</span>
<span><i class="iconfont">&#xe696;</i>有货所有商品均采用实物专业拍摄，但由于个人显示器不同，
<span class="bottom-answer"><i class="iconfont">&#xe696;</i>有货所有商品均采用实物专业拍摄，但由于个人显示器不同，
可能导致实物与图片存在色差，最终颜色以实物为准。</span>
</p>
</div>
... ... @@ -392,7 +390,7 @@
<div class="common-question">
<p>
<span class="top-question"><i class="iconfont">&#xe695;</i>发货及配送</span>
<span><i class="iconfont">&#xe696;</i>当天下午3点前订单当天发，之后的订单隔天发，
<span class="bottom-answer"><i class="iconfont">&#xe696;</i>当天下午3点前订单当天发，之后的订单隔天发，
合作快递有:韵达、EMS、顺丰、申通、圆通、宅急送,普通快递3-5天左右送达，顺丰速运1-2天送达。</span>
</p>
</div>
... ... @@ -400,8 +398,8 @@
<div class="common-question">
<p>
<span class="top-question"><i class="iconfont">&#xe695;</i>退货or换货</span>
<span><i class="iconfont">&#xe696;</i>签收商品未经穿着不影响二次销售的情况下，7日内退货，15日内换货；
退回商品保证吊牌、标签、包装完整，详情点击 <a href="http://www.yohobuy.com/help/?category_id=69" target="_blank">>>退换货政策</a></span>
<span class="bottom-answer"><i class="iconfont">&#xe696;</i>签收商品未经穿着不影响二次销售的情况下，7日内退货，15日内换货；
退回商品保证吊牌、标签、包装完整，详情点击 <a href="http://www.yohobuy.com/help/?category_id=69" target="_blank">&#12288;&#12288;>>退换货政策</a></span>
</p>
</div>
... ... @@ -429,7 +427,7 @@
<div class="buy-consults">
<p class="block-title">
<span class="title-head">
<span class="title cur">购买咨询(<em class="consult-num">0</em>)</span>
<span class="title cur">购买咨询（<i class="consult-num">0</i>）</span>
</span>
</p>
</div>
... ... @@ -459,7 +457,8 @@
<div class="shoppingCar">
<div class="shoppingCar-btn">
<i class="iconfont">&#xe600;</i> 加入购物车
<i class="iconfont">&#xe600;</i>
<span>加入购物车</span>
</div>
<div class="shoppingCar-nav">
... ...
... ... @@ -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.yohops.com/',
api: 'http://api.yoho.cn/',
service: 'http://service.yoho.cn/',
//singleApi: 'http://single.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/',
... ... @@ -150,7 +150,7 @@ if (isProduction) {
Object.assign(module.exports, {
appName: 'www.yohobuy.com for test',
domains: {
favApi: 'http://192.168.102.31:8092/brower',
singleApi: process.env.TEST_API || 'http://192.168.102.31:8092/brower',
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/',
... ...
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 Tue Dec 27 13:53:12 2016
Created by FontForge 20120731 at Tue Dec 27 17:23:33 2016
By admin
</metadata>
<defs>
... ... @@ -129,6 +129,9 @@ d="M569 607q-28 66 -74 108.5t-95 56.5t-100 2.5t-91.5 -45t-66 -94t-26.5 -137.5q0
q0 76 -26.5 136t-67 92t-92 42.5t-101 -4t-94.5 -56t-72 -104.5z" />
<glyph glyph-name="logincheckbutton1" unicode="&#xe616;"
d="M877 896h-730q-61 0 -104 -43t-43 -104v-730q0 -61 43 -104t104 -43h730q61 0 104 43t43 104v730q0 61 -43 104t-104 43zM939 19q0 -26 -18 -44t-44 -18h-730q-26 0 -44 18t-18 44v730q0 26 18 44t44 18h730q26 0 44 -18t18 -44v-730z" />
<glyph glyph-name="like" unicode="&#xe642;"
d="M703 695q-113 0 -191 -81q-79 81 -191 81t-191 -79t-79 -190q0 -31 6.5 -59.5t20.5 -56t23 -42t26 -39.5q42 -60 127.5 -138t142 -120.5t71.5 -51.5q21 -14 44 -14q25 0 44 14q10 7 30.5 22t66 51t87 72t86 81.5t71.5 83.5q17 25 26 39.5t23 42t20.5 56t6.5 59.5
q0 111 -79 190t-191 79z" />
<glyph glyph-name="aaa" unicode="&#xe601;"
d="M505 337l2 -2q2 -1 3.5 -1t3.5 1l430 364q2 2 1 5.5t-5 3.5h-435h-424q-4 0 -5 -3.5t1 -5.5zM72 669q-3 2 -6 0.5t-3 -4.5v-584q0 -4 3.5 -5t5.5 1l288 346zM953 669.5q-3 1.5 -5 -0.5l-288 -246l287 -346q3 -2 6 -1t3 5v584q0 3 -3 4.5zM641 406l-131 -111l-5 5
l-125 103l-275 -328q-2 -3 -1 -6t5 -3h396h407q4 0 5 3t-1 6z" />
... ...
No preview for this file type
No preview for this file type
... ... @@ -19,7 +19,7 @@
（<em class="likeNum">{{like}}</em>）
</span>
<span class="usefulData" data-id="{{id}}">
<i class="iconfont cususeful{{#if isUseful}} getzan{{/if}}" data-id="{{id}}" data-useful="{{useful}}">&#xe611;</i>有用
<i class="iconfont cususeful{{#if isUseful}} getzan{{/if}}" data-id="{{id}}" data-useful="{{useful}}">&#xe642;</i>有用
（<em class="usefulNum">{{useful}}</em>）
</span>
</div>
... ...
... ... @@ -20,6 +20,7 @@ var notify = require('./detail/notify');
var favorite = require('./detail/brand-fav');
var bindEvent = $.Callbacks(); // eslint-disable-line
var cartEvent = new EventProxy();
var Dialog = require('../common/dialog').Dialog;
var yasAtHead = require('./yas-head');
... ... @@ -1812,9 +1813,9 @@ $('.shoppingCar').on('click', '.option', function(e) {
$('.shoppingCar-btn').on('click', function() {
var $addToCart = $('#add-to-cart');
var sc = $(document);
sc.scrollTop(200);
if (maxStock === -1) {
sc.scrollTop(200);
$('#sizes').children('.size-warn').removeClass('hide');
$('.shoppingCar-nav li:eq(0)').siblings().find('a').removeClass('fixed');
$('.shoppingCar-nav li:eq(0)').find('a').addClass('fixed');
... ...
... ... @@ -591,7 +591,7 @@
height: 24px;
line-height: 24px;
left: 0;
bottom: -20px;
bottom: -25px;
}
.num-warn {
... ... @@ -802,7 +802,7 @@
.iconfont {
color: #ccc;
font-size: 14px;
font-size: 19px;
}
&.coled .iconfont {
... ... @@ -2175,14 +2175,15 @@
}
textarea{
width: 100%;
height: 130px;
width: 770px;
height: 70px;
padding: 0;
outline: #e0e0e0;
resize: none;
background-color: #fff;
border: 1px solid #e0e0e0;
font-size: 16px;
font-size: 14px;
padding: 15px;
}
.err{
... ... @@ -2194,12 +2195,12 @@
display: block;
padding: 0;
width: 100%;
height: 32px;
line-height: 32px;
height: 38px;
line-height: 38px;
color: #000;
background: #f5f5f5;
text-align: center;
font-size: 12px;
font-size: 14px;
margin: 0 auto;
cursor: pointer;
margin-top: -2px;
... ... @@ -2211,6 +2212,7 @@
display:block;
margin-top:15px;
line-height: 20px;
font-family: initial;
i{
margin-right: 8px;
... ... @@ -2236,6 +2238,7 @@
}
.common-advice{
color:#d0001b;
... ... @@ -2310,7 +2313,7 @@
display: inline-block;
font-weight: bold;
cursor: pointer;
font-size: 16px;
font-size: 14px;
margin-left: auto;
margin-right: auto;
... ... @@ -2345,9 +2348,20 @@
width: 135px;
height: 200px;
margin: 60px auto;
background: resolve("product/product-no-comments.png");
background: resolve("product/no-comment-pic.png");
background-size: 135px;
background-repeat: no-repeat;
.img-4-message{
text-align: center;
padding-top: 130px;
padding-left: 18px;
width: 100px;
font-size: 18px;
color: #444;
height: 40px;
display: inline-block;
}
}
.msg-pager{
... ...