fe / yohobuy-portal-fe · Commits

Go to a project

Authored by 陶雨
Commit 5b0fb6563f86614d39129e1d1dcff09719428596 2 parents 89691b98 903c5eb0

Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6

Inline Side-by-side
Showing 2 changed files with 3 additions and 2 deletions
1 -exports.domain = 'http://172.16.9.8:8080/yohobuy-platform-web'; 1 +//exports.domain = 'http://172.16.9.8:8080/yohobuy-platform-web';
  2 +exports.domain = require('../config/common.js').domain;
2 exports.res = [{ 3 exports.res = [{
3 //网销信息 -> 逛关联 4 //网销信息 -> 逛关联
4 route: '/goods/article/queryArticlesBySKN', 5 route: '/goods/article/queryArticlesBySKN',
@@ -57,7 +57,7 @@ module.exports = function(proxyRoute) { @@ -57,7 +57,7 @@ module.exports = function(proxyRoute) {
57 logger.log('info','grayroute: request options: %j',options,{}); 57 logger.log('info','grayroute: request options: %j',options,{});
58 58
59 //发起代理请求 59 //发起代理请求
60 - if(req.headers['accept'].indexOf('text/html')>-1) { 60 + if(req.headers['accept'].indexOf('text/html')>-1||req.xhr) {
61 request(options,function(err,res,body) { 61 request(options,function(err,res,body) {
62 if(err) { 62 if(err) {
63 logger.log('error','grayroute: request error:',err); 63 logger.log('error','grayroute: request error:',err);