Authored by zhangxiaoru

exchange

... ... @@ -669,7 +669,7 @@ const _setExchangeDetailData = (data) => {
list.reminder = true;
list.inDoor = true;
list.auditSuccess = true;
list.view = `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`;
list.view = `/me/order/detail/?orderCode=${data.orderCode}`;
}
break;
... ... @@ -677,7 +677,7 @@ const _setExchangeDetailData = (data) => {
if (data.deliveryTpyeName === '寄回换货') {
list.takeGoods = true;
list.auditSuccess = true;
list.view = `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`;
list.view = `/me/order/detail/?orderCode=${data.orderCode}`;
} else {
list.takeGoods = true;
}
... ... @@ -687,14 +687,14 @@ const _setExchangeDetailData = (data) => {
send: true,
doubt: true,
auditSuccess: true,
view: `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`
view: `/me/order/detail/?orderCode=${data.orderCode}`
});
break;
case 40:
Object.assign(list, {
finish: true,
auditSuccess: true,
view: `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`
view: `/me/order/detail/?orderCode=${data.orderCode}`
});
break;
case 91:
... ...
... ... @@ -22,10 +22,10 @@ module.exports = {
},
cookieDomain: 'yohoblk.com',
domains: {
singleApi: 'http://192.168.102.31:8092/',
api: 'http://api.yoho.yohoops.org/',
service: 'http://service.yoho.yohoops.org/',
search: 'http://192.168.102.216:8080/yohosearch/'
//singleApi: 'http://single.yoho.cn/',
api: 'http://api-test2.yohops.com:9999/',
service: 'http://service-test2.yohops.com:9999/',
search: 'http://search.yohoops.org/yohosearch/'
},
useOneapm: false,
useCache: false,
... ... @@ -36,17 +36,6 @@ module.exports = {
timeout: 1000,
retries: 0
},
interfaceShunt: {
useInterfaceShunt: false,
tencentServers: {
api: ['123.206.1.98', '123.206.2.80'],
service: ['123.206.1.98', '123.206.2.80']
},
awsServers: {
api: 'app-java-168863769.cn-north-1.elb.amazonaws.com.cn',
service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'
}
},
loggers: {
infoFile: {
name: 'info',
... ... @@ -114,17 +103,6 @@ if (isProduction) {
useCache: true,
pay: {
serviceNotify: 'http://service.yoho.cn/'
},
interfaceShunt: {
useInterfaceShunt: false,
tencentServers: {
api: ['123.206.1.98', '123.206.2.80'],
service: ['123.206.1.98', '123.206.2.80']
},
awsServers: {
api: 'app-java-168863769.cn-north-1.elb.amazonaws.com.cn',
service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'
}
}
});
} else if (isTest) {
... ...
... ... @@ -10,6 +10,7 @@ const LoginService = require('../../apps/passport/models/login-service');
*/
module.exports = () => {
return (req, res, next) => {
req.user.uid = 8039837;
// 从 SESSION 中获取到当前登录用户的 UID
if (req.session && _.isNumber(req.session._LOGIN_UID)) {
... ...
... ... @@ -259,7 +259,6 @@ if ($('.chapter-right').find('a').text() === '') {
$('.comments-list').find('li:last').css('border-bottom', 'none');
// $('.good-info').find('.price')
$('.good-info').each(function() {
var $this = $(this).find('.price');
... ... @@ -267,3 +266,9 @@ $('.good-info').each(function() {
$this.html($this.text() + '.00');
}
});
$('.good-info').each(function(i, ele) {
if(i % 4 === 3) {
$(ele).css('margin-right', '0');
}
});
... ...