Authored by cailing

update

@@ -95,7 +95,7 @@ fabric.properties @@ -95,7 +95,7 @@ fabric.properties
95 95
96 96
97 ### NetBeans ### 97 ### NetBeans ###
98 -nbproject/private/ 98 +nbproject/
99 build/ 99 build/
100 nbbuild/ 100 nbbuild/
101 dist/ 101 dist/
@@ -86,58 +86,58 @@ const getNewReportFloorData = data => { @@ -86,58 +86,58 @@ const getNewReportFloorData = data => {
86 return list; 86 return list;
87 }; 87 };
88 88
89 -//人气单品 89 +// 人气单品
90 const getSingleHotFloorData = data => { 90 const getSingleHotFloorData = data => {
91 let list = []; 91 let list = [];
92 92
93 _.forEach(data, (item, index) => { 93 _.forEach(data, (item, index) => {
94 - let len = 10;  
95 - 94 + let len = 10;
  95 +
96 if (item.data.text === '人气单品') { 96 if (item.data.text === '人气单品') {
97 - for (let i = 0; i < len; i ++) {  
98 - let pos = i;  
99 - let val = {};  
100 - let obj = {};  
101 - if (i == 1) {  
102 - val = data[index + 1].data[0]; // 第二个是大图  
103 - }  
104 - else if (i == len - 1) {  
105 - val = data[index + 1].data[1]; // 最后一个是大图 97 + for (let i = 0; i < len; i++) {
  98 + let pos = i;
  99 + let val = {};
  100 + let obj = {};
  101 +
  102 + if (i === 1) {
  103 + val = data[index + 1].data[0]; // 第二个是大图
  104 + } else if (i === len - 1) {
  105 + val = data[index + 1].data[1]; // 最后一个是大图
  106 + } else {
  107 + if (pos > 1) { // 小图
  108 + pos = pos - 1;
106 } 109 }
107 - else {  
108 - if (pos > 1) { // 小图  
109 - pos = pos - 1;  
110 - }  
111 - val = data[index + 2].data[pos];  
112 - }  
113 - obj.href = val.url;  
114 - obj.img = val.src;  
115 - list.push(obj); 110 + val = data[index + 2].data[pos];
116 } 111 }
  112 + obj.href = val.url;
  113 + obj.img = val.src;
  114 + list.push(obj);
  115 + }
117 } 116 }
118 }); 117 });
119 return list; 118 return list;
120 }; 119 };
121 120
122 const getadbannerData = data => { 121 const getadbannerData = data => {
123 - let adbanner = [];  
124 - let temp = [];  
125 - let obj = {};  
126 - _.forEach(data, (item, index) => {  
127 - if(item.template_name === 'single_image'){  
128 - temp.push(item);  
129 - }  
130 -  
131 - })  
132 - console.log(temp);  
133 - obj.href = temp[2].data[0].url;  
134 - obj.img = temp[2].data[0].src;  
135 - obj.name = temp[2].data[0].title;  
136 -  
137 - adbanner.push(obj);  
138 - return adbanner;  
139 -  
140 -} 122 + let adbanner = [];
  123 + let temp = [];
  124 + let obj = {};
  125 +
  126 + _.forEach(data, item => {
  127 + if (item.template_name === 'single_image') {
  128 + temp.push(item);
  129 + }
  130 +
  131 + });
  132 + console.log(temp);
  133 + obj.href = temp[2].data[0].url;
  134 + obj.img = temp[2].data[0].src;
  135 + obj.name = temp[2].data[0].title;
  136 +
  137 + adbanner.push(obj);
  138 + return adbanner;
  139 +
  140 +};
141 141
142 const requestContent = (type) => { 142 const requestContent = (type) => {
143 let data = sign.apiSign({ 143 let data = sign.apiSign({
@@ -177,13 +177,13 @@ exports.getContent = (type) => { @@ -177,13 +177,13 @@ exports.getContent = (type) => {
177 name: '最新速报', 177 name: '最新速报',
178 list: getNewReportFloorData(contentData.list) 178 list: getNewReportFloorData(contentData.list)
179 }; 179 };
180 - 180 +
181 data.singlehot = { 181 data.singlehot = {
182 name: '人气单品', 182 name: '人气单品',
183 imgHot: getSingleHotFloorData(contentData.list) 183 imgHot: getSingleHotFloorData(contentData.list)
184 }; 184 };
185 -  
186 - //广告 185 +
  186 + // 广告
187 data.adbanner = getadbannerData(contentData.list); 187 data.adbanner = getadbannerData(contentData.list);
188 188
189 189