首页首次访问导航修改

@@ -59,17 +59,17 @@ exports.getNewArrival = (req, res, next) => {
 
 exports.getIndexGuide = (req, res,next) => {
     channelModel.getIndexGuideData().then(data => {
-        console.log(data);
         if(data.code !== 200){
             const err = new Error('异常');
             throw err;
         }
         return channelModel.formatIndexGuideData(data.data);
     }).then(data => {
+        return channelModel.getResourceData(data);
+    }).then(data => {
+        console.log(data);
         data.layout = false;
-    //console.log('-----');
-    //console.log(data);
-    res.render('guide', {list: data});
+        res.render('guide', {list: data});
 
 }).catch(next);
 }

@@ -588,11 +588,10 @@ const _processFloorData = (rawData, type) => {
     };
 };
 
-const _formatResourceParams = (code) => {
+const _formatResourceParams = (channel, code) => {
     return serviceApi.get('operations/api/v5/resource/get', {content_code: code}).then(data => {
-        let result = data.data[0];
+        let result = data.data[0].data[0];
         result.channel = channel;
-
         return result;
     });
 };
@@ -840,26 +839,24 @@ const getbrandFloorDataAjax = type => {
     });
 };
 
-exports.getResourceData = (formatData) => {
+const getResourceData = (formatData) => {
     let promiseArr = [];
 
-    _.forEach(data, item => {
+    _.forEach(formatData, item => {
         if (item.content_code) {
-            promiseArr.push(_formatResourceParams(content_code))
+            promiseArr.push(_formatResourceParams(item.channel, item.content_code))
         }
-
-        return Promise.all(promiseArr).then(data => {
-            //console.log(formatData);
-            _.forEach(formatData, (item, index) => {
-                _.forEach(data, (item, ind) => {
-                    if (formatData[index].channel === data[ind].channel) {
-                        formatData[index].src = data[ind].src;
-                    }
-                })
+    })
+    return Promise.all(promiseArr).then(data => {
+        _.forEach(formatData, (item, index) => {
+            _.forEach(data, (item, ind) => {
+                if (formatData[index].channel === data[ind].channel) {
+                    formatData[index].src = data[ind].src;
+                }
             })
-            console.log(formatData);
-            return formatData;
         })
+        
+        return formatData;
     })
 }
 
@@ -882,6 +879,7 @@ module.exports = {
     getContent: getContent,
     getbrandFloorDataAjax: getbrandFloorDataAjax,
     getIndexGuideData: getIndexGuideData,
-    formatIndexGuideData: formatIndexGuideData
+    formatIndexGuideData: formatIndexGuideData,
+    getResourceData: getResourceData
 
 };

@@ -7,7 +7,7 @@
 			<dl>
 				<dt class="tag_img_warpper">
 					<a href="{{url}}" target="_self">
-					<img spm-name="homepage_guide_manimg" alt="YOHO!BOYS" src="{{src}}"></a>
+					<img spm-name="homepage_guide_manimg" alt="YOHO!BOYS" src="{{image src 180 168}}"></a>
 				</dt>
 				<dd class="block_cn">{{sort_name}}</dd>
 				<dd class="block_en"> <b>{{sort_name_en}}</b>

@@ -465,7 +465,8 @@ function actionCover() {
     var containertop;
     var length = '';
 
-    if (true) {
+    if (window.location.href === 'http://www.yohobuy.com/' &&
+        (typeof gender === 'undefined' || gender === '' || gender === null)) {
         $.get('/guide', function(data) {
             newMask = document.createElement('div');
             newMask.id = 'cover';