Authored by 郝肖肖

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

<div class="address-modify">
{{#unless changeProvince}}
<div class="tip">由于需要仓库调拨,目前暂不支持省地址修改,请您谅解!</div>
{{/unless}}
<form class="form edit-address" id="areaForm">
<div class="form-group">
<label for="username">收货人:</label>
... ...
... ... @@ -20,8 +20,6 @@ const domains = {
liveApi: 'http://testapi.live.yohops.com:9999/',
singleApi: 'http://api-test3.yohops.com:9999/',
// api: 'http://dev-api.yohops.com:9999/',
// service: 'http://dev-service.yohops.com:9999/',
// liveApi: 'http://api.live.yoho.cn/',
// singleApi: 'http://single.yoho.cn/',
... ...
{
"name": "m-yohobuy-node",
"version": "5.4.27",
"version": "5.4.29",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ...
... ... @@ -26,6 +26,11 @@
{{#if ordinaryCart}}
<div class="cart-content normal-good active">
{{#commonCart}}
{{#if shipCost.shippingTip}}
<div class="tips">
{{shipCost.shippingTip}}
</div>
{{/if}}
{{> cart-content}}
{{/commonCart}}
</div>
... ...
... ... @@ -18,9 +18,9 @@ require('activity/promotion/promotion.page.css');
var share = require('../common/share');
share({
title: 'YOHO!BUY有货邀请同学认证赠好礼!立享【学生专属】4大特权!',
title: '【有货】学生认证看过来!专享特价,任性分期,立即走起→',
link: location.href,
desc: '每邀请1名同学完成认证立赠300有货币!上不封顶!',
desc: '邀请同学认证更有惊喜好礼相送~',
imgUrl: 'http://img11.static.yhbimg.com/taobaocms/2017/01/17/16/0108d724a0ef1f001d3ee6010aa79d960e.png'
});
... ... @@ -303,9 +303,9 @@ $(
var shareUrl = location.href.replace('userUid=', 'oldUid=');
share({
title: 'YOHO!BUY有货邀请同学认证赠好礼!立享【学生专属】4大特权!',
title: '【有货】学生认证看过来!专享特价,任性分期,立即走起→',
link: shareUrl,
desc: '每邀请1名同学完成认证立赠300有货币!上不封顶!',
desc: '邀请同学认证更有惊喜好礼相送~',
imgUrl: 'http://img11.static.yhbimg.com/taobaocms/2017/01/17/16/0108d724a0ef1f001d3ee6010aa79d960e.png'
});
}
... ...
... ... @@ -101,8 +101,12 @@ function setPassword() {
showErrTip(data.message);
}
},
error: function() {
error: function(data) {
$btnSure.removeClass('disable');
if (data && data.responseJSON && data.responseJSON.message) {
showErrTip(data.message);
}
}
});
}
... ...
... ... @@ -10,6 +10,17 @@
display: block;
}
.tips {
margin-top: -20px;
height: 54px;
line-height: 54px;
font-size: 25px;
background: #f0f0f0;
color: #b7b7b7;
padding-left: 30px;
padding-right: 30px;
}
.presell-info {
margin-top: -20px;
height: 105px;
... ...
... ... @@ -312,6 +312,10 @@ const procCartData = (data, isAdvanceCart) => {
return {id: promotion.promotion_id, name: promotion.promotion_title};
});
}
result.shipCost = {
isFree: _.get(data, 'shipping_cost_prompt.is_shipping_cost_free', 'N'),
shippingTip: _.get(data, 'shipping_cost_prompt.shipping_cost_tips', '').replace(/¥/g, '¥')
};
// 计算正常商品且有库存的总数
let goodCount = _.sum(result.goods
... ...