详情页数据加载的fid判断，首页活动url处理
Merge remote-tracking branch 'origin/master'