Authored by shuaiguo

Merge remote-tracking branch 'refs/remotes/origin/hotfix/change-xianyu-login' into develop

# Conflicts:
#	config/common.js
... ... @@ -5,11 +5,8 @@ function XianyuLinkHandle() {
'click',
event => {
let currentTarget = $(event.currentTarget);
let href = currentTarget.attr('href').replace(/[?|&]openby:yohobuy=.*/, '');
let href = currentTarget.attr('href') ?
currentTarget.attr('href').replace(/[?|&]openby:yohobuy=.*/, '') : 'javascript:void(0)';
let tag = href.indexOf('?') >= 0 ? '&' : '?';
href = href + tag + 'isNeedRefresh=false';
... ... @@ -31,9 +28,8 @@ function XianyuLinkHandle() {
} else {
window.open(args.url, '_blank');
}
event.preventDefault();
}
event.preventDefault();
});
}
... ...