Authored by 徐祁xuqi

Merge branch 'hotfix/guide'

@@ -54,7 +54,7 @@ const sortMap = dataMap.sort; @@ -54,7 +54,7 @@ const sortMap = dataMap.sort;
54 54
55 // 构建url 55 // 构建url
56 const _httpBuildQuery = data => { 56 const _httpBuildQuery = data => {
57 - return searchApi.get('/search.json', data, { 57 + return searchApi.get('search.json', data, {
58 cache: true 58 cache: true
59 }); 59 });
60 }; 60 };
@@ -339,7 +339,7 @@ const _getGirlsSingleHot = (args, type) => { @@ -339,7 +339,7 @@ const _getGirlsSingleHot = (args, type) => {
339 return; 339 return;
340 } 340 }
341 341
342 - return searchApi.get('/search.json', { 342 + return searchApi.get('search.json', {
343 client_type: 'web', 343 client_type: 'web',
344 query: skns, 344 query: skns,
345 order: 'shelve_time:desc', 345 order: 'shelve_time:desc',
@@ -739,7 +739,7 @@ const _formatParams = (channel, data) => { @@ -739,7 +739,7 @@ const _formatParams = (channel, data) => {
739 if (data) { 739 if (data) {
740 params = Object.assign(data); 740 params = Object.assign(data);
741 } 741 }
742 - return searchApi.get('/search.json', params).then(result => { 742 + return searchApi.get('search.json', params).then(result => {
743 let ret = result.data; 743 let ret = result.data;
744 744
745 if (ret) { 745 if (ret) {
@@ -784,10 +784,10 @@ const formatIndexGuideData = data => { @@ -784,10 +784,10 @@ const formatIndexGuideData = data => {
784 }); 784 });
785 785
786 return Promise.all(promiseArr).then(result => { 786 return Promise.all(promiseArr).then(result => {
787 - _.forEach(formatData, (item, index) => {  
788 - _.forEach(result, (it, idx) => {  
789 - if (formatData[index].channel === result[idx].channel) {  
790 - formatData[index].num = result[idx].total; 787 + _.forEach(formatData, item => {
  788 + _.forEach(result, it => {
  789 + if (item && it && item.channel === it.channel) {
  790 + item.num = it.total;
791 } 791 }
792 }); 792 });
793 }); 793 });