fe / yoho-blk · Commits

Go to a project

Authored by yyq
Commit caccb478f5a547adab1254e5707bb7d9a08e82ff 2 parents a4489d26 7d3d105a

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

Inline Side-by-side
Showing 15 changed files with 40 additions and 34 deletions
... ... @@ -129,6 +129,7 @@ const editOrder = (req, res, next) => {
const query = req.query;
query.uid = uid;
query.orderCode = crypto.decrypt(config.crypto.common, query.orderCode);
orderModel.editOrder(query).then(result => {
res.json(result);
... ...
<div class="order-status order" data-code="{{orderCode}}" >
<div class="order-status order" data-code="{{orderCode}}" data-codem="{{orderCodeM}}">
<div class="basic">
<p>订单号：{{orderCode}}</p>
<p>订单状态：{{statusStr}}</p>
... ...
... ... @@ -146,9 +146,6 @@ exports.toggleSelectGoods = (req, res, next) => {
const shoppingKey = req.cookies._SPK;
// 商品sku列表
// skuList:
// [{"goods_type":"advance","buy_number":1,"selected":"Y","product_sku":"1006277","promotion_id":0}, {...}]
// [{"goods_type":"ordinary","buy_number":1,"selected":"Y","product_sku":"1006277","promotion_id":0}, {...}]
const productSkuList = req.body.skuList;
if (uid) {
... ... @@ -164,9 +161,6 @@ exports.toggleSelectGoods = (req, res, next) => {
}
cartModel.toggleSelectGoods(params).then(result => {
console.log(result);
res.json(_.merge(cartModel.filterCartData(result, uid), {code: result.code, message: result.message}));
}).catch(next);
};
... ...
... ... @@ -17,7 +17,7 @@
</li>
<li>
<a href="/product/pro_{{product_id}}_{{goods_id}}/{{cn_alphabet}}.html" target="_blank">
<img src="{{image goods_images 100 134}}" alt="{{product_name}}">
<img src="{{image goods_images 100 134}}" alt="{{product_name}}" width="100" height="134">
</a>
</li>
<li class="pro-info">
... ... @@ -72,7 +72,7 @@
</li>
<li>
<a href="/product/pro_{{product_id}}_{{goods_id}}/{{cn_alphabet}}.html" target="_blank">
<img src="{{image goods_images 100 134}}" alt="{{product_name}}">
<img src="{{image goods_images 100 134}}" alt="{{product_name}}" width="100" height="134">
</a>
</li>
<li class="pro-info">
... ... @@ -116,7 +116,7 @@
</li>
<li>
<a href="javascript:void(0)">
<img src="{{image goods_images 100 134}}" alt="{{product_name}}">
<img src="{{image goods_images 100 134}}" alt="{{product_name}}" width="100" height="134">
</a>
</li>
<li class="pro-info">
... ...
... ... @@ -11,7 +11,9 @@ module.exports = () => {
let isMobile = /(nokia|iphone|android|ipad|motorola|^mot\-|softbank|foma|docomo|kddi|up\.browser|up\.link|htc|dopod|blazer|netfront|helio|hosin|huawei|novarra|CoolPad|webos|techfaith|palmsource|blackberry|alcatel|amoi|ktouch|nexian|samsung|^sam\-|s[cg]h|^lge|ericsson|philips|sagem|wellcom|bunjalloo|maui|symbian|smartphone|midp|wap|phone|windows ce|iemobile|^spice|^bird|^zte\-|longcos|pantech|gionee|^sie\-|portalmmm|jig\s browser|hiptop|^ucweb|^benq|haier|^lct|opera\s*mobi|opera\*mini|320x320|240x320|176x220)/i.test(req.get('user-agent')); // eslint-disable-line
if (isMobile) {
return res.redirect(`//m.yohobuy.com${req.url}`);
// return res.redirect(`//m.yohobuy.com${req.url}`);
// http://jira.yoho.cn:8888/browse/BLK-2051
return res.redirect('//www.yohoshow.com/about/index/blkqr');
}
next();
};
... ...
... ... @@ -14,12 +14,10 @@ var $searchWrap = $('.search-wrapper'),
$clearInput = $('.clear-input');
var goodsTpl = require('../../tpl/common/bag-goods.hbs');
var delayer;
require('yoho-jquery-nanoscroller');
var delayer;
function handelProduct(data) {
var goods = [],
list = ['commonPros', 'preSalePros', 'noStorage'];
... ... @@ -66,8 +64,7 @@ function refreshBag() {
$bagGoodsList.empty();
$miniBag.addClass('bag-empty');
}
$('.nano').nanoScroller({disableResize: true});
$('.mini-goods-list-wrap.nano').nanoScroller({disableResize: true});
}
}
});
... ...
... ... @@ -26,7 +26,7 @@ $('.order .cancel-btn').on('click', function() {
$('.order .edit-btn').on('click', function() {
var $this = $(this);
var $userInfo = $('.user-info.info-box');
var code = $this.closest('.order').data('code');
var code = $this.closest('.order').data('codem');
var areaCode = $userInfo.data('area');
var userName = $userInfo.find('.user-name-sel').data('name');
... ...
... ... @@ -235,7 +235,8 @@
.del-good-btn {
cursor: pointer;
color: #999;
&:hover{
&:hover {
color: #1b1b1b;
}
}
... ... @@ -279,7 +280,7 @@
left: 50%;
position: absolute;
margin-left: -132px;
margin-top: 20px;
margin-top: 30px;
background: resolve("layout/blk-logo.svg") no-repeat center center;
background-size: 100%;
... ... @@ -297,8 +298,9 @@
.sub-nav-list {
max-width: 94%;
line-height: 50px;
display: inline-block;
line-height: 55px;
height: 44px;
li {
float: left;
... ...
... ... @@ -23,7 +23,7 @@
margin-top: 9px;
text-align: center;
top: 15px;
left: 26px;
left: 10px;
z-index: 2;
h2 {
... ...
... ... @@ -2,6 +2,11 @@
padding-bottom: 30px;
background: #f5f5f5;
/* 个人中心布局下重置默认的底部样式 */
+ .blk-footer .center-content {
border-top: none;
}
.help-navigation {
width: 150px;
margin-right: 10px;
... ...
... ... @@ -220,10 +220,10 @@
}
}
.marginhack{
.marginhack {
margin-top: -4px;
.black{
.black {
margin-top: 0;
}
}
... ... @@ -259,7 +259,7 @@
width: 100%;
.bg {
height: 250px;
height: 160px;
background-image: resolve("me/no-order.png");
background-repeat: no-repeat;
background-position: center bottom;
... ...
... ... @@ -17,7 +17,6 @@
color: $blue;
font-weight: bold;
}
}
.country-code {
... ... @@ -36,7 +35,7 @@
@mixin input;
&.phone-num {
width: 150px;
width: 170px;
display: block;
float: left;
border: none !important;
... ... @@ -46,7 +45,6 @@
&.captcha {
width: $captcha;
float: left;
}
}
... ... @@ -93,7 +91,6 @@
.small {
@mixin small;
}
}
.other-opts {
... ... @@ -104,6 +101,7 @@
.third-party-login {
margin: 0 30px;
span {
float: left;
width: calc(($item-width - 60px) / 4);
... ...
... ... @@ -397,11 +397,15 @@
display: inline-block;
vertical-align: top;
width: 60px;
margin-right: 10px;
margin-right: 11px;
}
.goods-img-col:last-child {
margin-right: 0;
}
img {
margin: 8px 0;
margin-top: 11px;
cursor: pointer;
}
}
... ...
... ... @@ -23,7 +23,7 @@
display: block;
position: absolute;
right: 20px;
bottom: 30px;
bottom: 20px;
font-size: 14px;
a,
... ... @@ -33,6 +33,9 @@
padding: 10px;
margin-left: 10px;
cursor: pointer;
display: inline-block;
line-height: 12px;
height: 32px;
.iconfont {
font-size: 14px;
... ...
... ... @@ -33,7 +33,7 @@
</li>
<li>
<a href="/product/pro_{{product_id}}_{{goods_id}}/{{cn_alphabet}}.html" target="_blank">
<img src="{{image goods_images 100 134}}" alt="{{product_name}}">
<img src="{{image goods_images 100 134}}" alt="{{product_name}}" width="100" height="134">
</a>
</li>
<li class="pro-info">
... ... @@ -101,7 +101,7 @@
</li>
<li>
<a href="/product/pro_{{product_id}}_{{goods_id}}/{{cn_alphabet}}.html" target="_blank">
<img src="{{image goods_images 100 134}}" alt="{{product_name}}">
<img src="{{image goods_images 100 134}}" alt="{{product_name}}" width="100" height="134">
</a>
</li>
<li class="pro-info">
... ... @@ -158,7 +158,7 @@
</li>
<li>
<a href="javascript:void(0)">
<img src="{{image goods_images 100 134}}" alt="{{product_name}}">
<img src="{{image goods_images 100 134}}" alt="{{product_name}}" width="100" height="134">
</a>
</li>
<li class="pro-info">
... ...