fe / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit b471f5bb06adb7051117c1e0aa1ea1fb13ccfaf9 1 parent 644887fc

去除多余代码，侧边栏接口去除

Inline Side-by-side
Showing 6 changed files with 7 additions and 492 deletions
framework @ 119c247f
1 -Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2 1 +Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
@@ -48,21 +48,6 @@ class IndexData @@ -48,21 +48,6 @@ class IndexData
48 } 48 }
49 49
50 /** 50 /**
51 - * 获取启动页频道数据  
52 - *  
53 - * @return array 启动页频道有关数据  
54 - */  
55 - public static function getHomeChannels()  
56 - {  
57 - // 构建必传参数  
58 - $param = Yohobuy::param();  
59 -  
60 - $param['client_secret'] = Sign::getSign($param);  
61 -  
62 - return Yohobuy::get(Yohobuy::SERVICE_URL.'operations/api/v5/category/getCategory', $param);  
63 - }  
64 -  
65 - /**  
66 * 获取用户个人信息 51 * 获取用户个人信息
67 * 52 *
68 * @param integer $uid 用户ID 53 * @param integer $uid 用户ID
@@ -19,16 +19,7 @@ class BoysController extends AbstractAction @@ -19,16 +19,7 @@ class BoysController extends AbstractAction
19 // 设置顶部信息（搜索） 19 // 设置顶部信息（搜索）
20 $this->setHomeChannelHeader(); 20 $this->setHomeChannelHeader();
21 21
22 - $data = array(  
23 - 'sideNav' => array(),  
24 - 'content' => array()  
25 - );  
26 -  
27 - $sideDatas = IndexData::getHomeChannels();  
28 - if($sideDatas['code'] == 200)  
29 - {  
30 - $data['sideNav'] = $sideDatas['data'];  
31 - } 22 + $data = array();
32 23
33 // 频道数据 24 // 频道数据
34 $channelData = IndexData::getUserChannelData(0, '1,3', '201504091403001'); 25 $channelData = IndexData::getUserChannelData(0, '1,3', '201504091403001');
@@ -19,16 +19,7 @@ class GirlsController extends AbstractAction @@ -19,16 +19,7 @@ class GirlsController extends AbstractAction
19 // 设置顶部信息（搜索） 19 // 设置顶部信息（搜索）
20 $this->setHomeChannelHeader(); 20 $this->setHomeChannelHeader();
21 21
22 - $data = array(  
23 - 'sideNav' => array(),  
24 - 'content' => array()  
25 - );  
26 -  
27 - $sideDatas = IndexData::getHomeChannels();  
28 - if($sideDatas['code'] == 200)  
29 - {  
30 - $data['sideNav'] = $sideDatas['data'];  
31 - } 22 + $data = array();
32 23
33 // 频道数据 24 // 频道数据
34 $channelData = IndexData::getUserChannelData(0, '2,3', '201504091403002'); 25 $channelData = IndexData::getUserChannelData(0, '2,3', '201504091403002');
@@ -47,436 +38,6 @@ class GirlsController extends AbstractAction @@ -47,436 +38,6 @@ class GirlsController extends AbstractAction
47 $num = count($data['content']); 38 $num = count($data['content']);
48 $data['content'][] = array('maybeLike' =>$maybeLike); 39 $data['content'][] = array('maybeLike' =>$maybeLike);
49 }*/ 40 }*/
50 -  
51 -  
52 - $data = array(  
53 - 'headerDownload' => array(  
54 - 'img' => 'http://img11.static.yhbimg.com/adpic/2015/02/28/18/01d83bfad41c8fca8fd1ad334216d7d733.jpg?imageView/2/w/640/h/480',  
55 - 'url' => 'http://www.baidu.com'  
56 - ),  
57 - 'homeHeader' => array(  
58 - 'bgColor' => '#FF88AE',  
59 - 'searchUrl' => ''  
60 - ),  
61 - 'sideNav' => array(  
62 - array(  
63 - 'textCn' => '男生',  
64 - 'textEn' => 'Boys',  
65 - 'styleClass' => 'boys',  
66 - 'url' => ''  
67 - ),  
68 - array(  
69 - 'textCn' => '女生',  
70 - 'textEn' => 'GIRLS',  
71 - 'styleClass' => 'girls',  
72 - 'url' => ''  
73 - ),  
74 - array(  
75 - 'textCn' => '潮童',  
76 - 'textEn' => 'KIDS',  
77 - 'styleClass' => 'kids',  
78 - 'url' => ''  
79 - ),  
80 - array(  
81 - 'textCn' => '创意生活',  
82 - 'textEn' => 'LIFE STYLE',  
83 - 'styleClass' => 'life',  
84 - 'url' => ''  
85 - ),  
86 - array(  
87 - 'textCn' => '逛',  
88 - 'textEn' => 'TRENDFINDER',  
89 - 'styleClass' => 'guang',  
90 - 'subNav' => array(  
91 - 'list' => array(  
92 - array(  
93 - 'textCn' => '逛',  
94 - 'textEn' => 'TrendFinder',  
95 - 'back' => true,  
96 - 'bgColor' => '#fd307f'  
97 - ),  
98 - array(  
99 - 'textCn' => '查看全部',  
100 - 'url' => ''  
101 - ),  
102 - array(  
103 - 'textCn' => '只看男生',  
104 - 'textEn' => 'Boys',  
105 - 'url' => ''  
106 - ),  
107 - array(  
108 - 'textCn' => '只看女生',  
109 - 'textEn' => 'Girls',  
110 - 'url' => '',  
111 - 'isSelect' => true  
112 - )  
113 - )  
114 - )  
115 - )  
116 - ),  
117 - 'content' => array(  
118 - 'bannerTop' => array(  
119 - 'list' => array(  
120 - array(  
121 - 'url' => '',  
122 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'  
123 - ),  
124 - array(  
125 - 'url' => '',  
126 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'  
127 - ),  
128 - array(  
129 - 'url' => '',  
130 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'  
131 - )  
132 - )  
133 - ),  
134 - 'iconsEnter' => array(  
135 - 'list' => array(  
136 - array(  
137 - 'url' => '',  
138 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',  
139 - 'text' => '新品到着'  
140 - ),  
141 - array(  
142 - 'url' => '',  
143 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',  
144 - 'text' => '全球优选'  
145 - ),  
146 - array(  
147 - 'url' => '',  
148 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',  
149 - 'text' => '明星潮牌'  
150 - ),  
151 - array(  
152 - 'url' => '',  
153 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',  
154 - 'text' => '全部品类'  
155 - ),  
156 - array(  
157 - 'url' => '',  
158 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',  
159 - 'text' => '逛'  
160 - ),  
161 - array(  
162 - 'url' => '',  
163 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',  
164 - 'text' => '搭配指南'  
165 - ),  
166 - array(  
167 - 'url' => '',  
168 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',  
169 - 'text' => '潮品推荐'  
170 - ),  
171 - array(  
172 - 'url' => '',  
173 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',  
174 - 'text' => '折扣精选'  
175 - )  
176 - )  
177 - ),  
178 - 'hotCategory' => array(  
179 - 'title' => array(  
180 - 'name' => '热门品类'  
181 - ),  
182 - 'list' => array(  
183 - array(  
184 - 'textCn' => '卫衣',  
185 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
186 - 'url' => ''  
187 - ),  
188 - array(  
189 - 'textCn' => 'T恤',  
190 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
191 - 'url' => ''  
192 - ),  
193 - array(  
194 - 'textCn' => '打底衫',  
195 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
196 - 'url' => ''  
197 - ),  
198 - array(  
199 - 'textCn' => '打底衫',  
200 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
201 - 'url' => ''  
202 - ),  
203 - array(  
204 - 'textCn' => '打底衫',  
205 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
206 - 'url' => ''  
207 - ),  
208 - array(  
209 - 'textCn' => '打底衫',  
210 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
211 - 'url' => ''  
212 - ),  
213 - array(  
214 - 'textCn' => '打底衫',  
215 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
216 - 'url' => ''  
217 - ),  
218 - array(  
219 - 'textCn' => '打底衫',  
220 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
221 - 'url' => ''  
222 - )  
223 - )  
224 - ),  
225 - 'hotBrands' => array(  
226 - 'title' => array(  
227 - 'name' => '热门品牌'  
228 - ),  
229 - 'list' => array(  
230 - array(  
231 - 'textCn' => 'Moussy',  
232 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
233 - 'url' => ''  
234 - ),  
235 - array(  
236 - 'textCn' => 'Moussy',  
237 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
238 - 'url' => ''  
239 - ),  
240 - array(  
241 - 'textCn' => 'Moussy',  
242 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
243 - 'url' => ''  
244 - ),  
245 - array(  
246 - 'textCn' => 'Moussy',  
247 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
248 - 'url' => ''  
249 - ),  
250 - array(  
251 - 'textCn' => 'Moussy',  
252 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
253 - 'url' => ''  
254 - ),  
255 - array(  
256 - 'textCn' => 'Moussy',  
257 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
258 - 'url' => ''  
259 - )  
260 - )  
261 - ),  
262 -  
263 - 'trendColloaction' => array(  
264 - 'name' => '潮人 ▪ 搭配',  
265 - 'more' => '',  
266 - 'leftspan' => array(  
267 - 'url' => '',  
268 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg'  
269 - ),  
270 - 'rightspan' => array(  
271 - 'url' => '',  
272 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg'  
273 - ),  
274 - 'recommendlist' => array(  
275 - array(  
276 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
277 - 'url' => ''  
278 - ),  
279 - array(  
280 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
281 - 'url' => ''  
282 - ),  
283 - array(  
284 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
285 - 'url' => ''  
286 - ),  
287 - array(  
288 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
289 - 'url' => ''  
290 - ),  
291 - array(  
292 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
293 - 'url' => ''  
294 - )  
295 - )  
296 - ),  
297 - 'trendTopics' => array(  
298 - 'name' => '潮品 ▪ 话题',  
299 - 'more' => '',  
300 - 'list' => array(  
301 - array(  
302 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
303 - 'url' => '',  
304 - 'title' => '现代裁剪',  
305 - 'time' => '2月13日 12:34'  
306 - ),  
307 - array(  
308 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
309 - 'url' => '',  
310 - 'title' => '现代裁剪',  
311 - 'time' => '2月13日 12:34'  
312 - ),  
313 - array(  
314 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
315 - 'url' => '',  
316 - 'title' => '现代裁剪',  
317 - 'time' => '2月13日 12:34'  
318 - )  
319 - )  
320 - ),  
321 - 'goodsCategory' => array(  
322 - 'name' => '经典裤装',  
323 - 'more' => '',  
324 - 'banner' => array(  
325 - 'list' => array(  
326 - array(  
327 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
328 - 'url' => ''  
329 - )  
330 - )  
331 - ),  
332 - 'list' => array(  
333 - array(  
334 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
335 - 'url' => '',  
336 - 'textCn' => '手表'  
337 - ),  
338 - array(  
339 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
340 - 'url' => '',  
341 - 'textCn' => '烛台'  
342 - ),  
343 - array(  
344 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
345 - 'url' => '',  
346 - 'textCn' => '围巾'  
347 - ),  
348 - array(  
349 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
350 - 'url' => '',  
351 - 'textCn' => '盘子'  
352 - ),  
353 - array(  
354 - 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',  
355 - 'url' => '',  
356 - 'textCn' => '耳机'  
357 - )  
358 - )  
359 - ),  
360 -  
361 -  
362 - 'bannerCenter' => array(  
363 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg',  
364 - 'url' => ''  
365 - ),  
366 -  
367 - 'creativeLife' => array(  
368 - 'name' => '创意生活',  
369 - 'more' => '',  
370 - 'url' => '',  
371 - 'banner' => 'http://img10.static.yhbimg.com/yhb-img01/2015/07/09/18/0119ffceddb0819d36d74b408bd743b4a9.jpg?imageView/2/w/640/h/640',  
372 - 'classify' => array(  
373 - array(  
374 - 'url' => '',  
375 - 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/04/10/05/029bef1041343ea2e31dc0423f2f176589.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
376 - 'name' => '手表'  
377 - ), array(  
378 - 'url' => '',  
379 - 'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/07/07/09/02271a775d17649860abec4387b4559e26.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
380 - 'name' => '烛台'  
381 - ), array(  
382 - 'url' => '',  
383 - 'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/05/19/07/02a269d20ed44803eee33e255fe88d7873.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
384 - 'name' => '围巾'  
385 - ), array(  
386 - 'url' => '',  
387 - 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/06/01/07/02fe94083352435ce53b5d90812cc5bdbd.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
388 - 'name' => '盘子'  
389 - ), array(  
390 - 'url' => '',  
391 - 'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/07/08/07/028db8a2afbe4ecbf37bebc7e98e8e1e80.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
392 - 'name' => '耳机'  
393 - ), array(  
394 - 'url' => '',  
395 - 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/04/22/02/02a1b688b6dafd786f391e0624aea1e93b.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
396 - 'name' => '生活'  
397 - )  
398 - )  
399 - ),  
400 -  
401 -  
402 - 'plusStar' => array(  
403 - 'name' => 'PLUS 全球优选',  
404 - 'url' => '',  
405 - 'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/07/13/15/014f7ba48071160053ac3b8f045b9fc264.jpg?imageView/2/w/640/h/640'  
406 - ),  
407 -  
408 - 'bannerCenter' => array(  
409 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg',  
410 - 'url' => ''  
411 - ),  
412 -  
413 - 'plusStar' => array(  
414 - 'name' => 'STAR 明星潮牌',  
415 - 'url' => '',  
416 - 'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/07/13/15/014f7ba48071160053ac3b8f045b9fc264.jpg?imageView/2/w/640/h/640'  
417 -  
418 - ),  
419 - 'bannerCenter' => array(  
420 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg',  
421 - 'url' => ''  
422 - ),  
423 -  
424 - 'maybeLike' => array(  
425 - 'goods' => array(  
426 - array(  
427 - 'id' => 1,  
428 - 'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/07/01ebfb219e22770ffb0c2c3a2cbb2b4bef.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
429 - 'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',  
430 - 'isLike' => false,  
431 - 'price' => 1268,  
432 - 'salePrice' => 589,  
433 - 'isSale' => true,  
434 - 'isFew' => true,  
435 - 'isNew' => false,  
436 - 'url' => ''  
437 - ), array(  
438 - 'id' => 2,  
439 - 'thumb' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/03/08/023d70c59e81ccbfb39404487aaf642da2.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
440 - 'name' => 'CLOTtee 撞色连帽外套',  
441 - 'isLike' => false,  
442 - 'price' => 488,  
443 - 'salePrice' => 139,  
444 - 'isSale' => true,  
445 - 'isFew' => true,  
446 - 'isNew' => false,  
447 - 'url' => ''  
448 - ), array(  
449 - 'id' => 3,  
450 - 'thumb' => 'http://img12.static.yhbimg.com/goodsimg/2015/03/02/08/02e2d44125e95495e3152aa459fa6b9b0c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
451 - 'name' => 'HALFGIRL 插肩棒球服短裙套装',  
452 - 'isLike' => true,  
453 - 'price' => 478,  
454 - 'salePrice' => 208,  
455 - 'isSale' => true,  
456 - 'isFew' => true,  
457 - 'isNew' => false,  
458 - 'url' => ''  
459 - ), array(  
460 - 'id' => 4,  
461 - 'thumb' => 'http://img12.static.yhbimg.com/goodsimg/2015/03/03/08/022f25fbe177ee12803c522f04fcce06d0.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
462 - 'name' => '黄伟文Wyman X yohood联名商品YYYOHOOD连帽卫衣',  
463 - 'isLike' => false,  
464 - 'salePrice' => 148,  
465 - 'isSale' => false,  
466 - 'isFew' => false,  
467 - 'isNew' => true,  
468 - 'url' => ''  
469 - )  
470 - )  
471 - ),  
472 -  
473 - 'bannerBottom' => array(  
474 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg',  
475 - 'url' => ''  
476 - )  
477 -  
478 - ));  
479 -  
480 41
481 $this->_view->assign('title', 'YOHO!有货'); 42 $this->_view->assign('title', 'YOHO!有货');
482 $this->_view->display('index', $data); 43 $this->_view->display('index', $data);
@@ -6,7 +6,7 @@ use Plugin\FloorProcess; @@ -6,7 +6,7 @@ use Plugin\FloorProcess;
6 /** 6 /**
7 * 儿童首页 7 * 儿童首页
8 */ 8 */
9 -class kidsController extends AbstractAction 9 +class KidsController extends AbstractAction
10 { 10 {
11 11
12 public function indexAction() 12 public function indexAction()
@@ -20,16 +20,7 @@ class kidsController extends AbstractAction @@ -20,16 +20,7 @@ class kidsController extends AbstractAction
20 // 设置顶部信息（搜索） 20 // 设置顶部信息（搜索）
21 $this->setHomeChannelHeader(); 21 $this->setHomeChannelHeader();
22 22
23 - $data = array(  
24 - 'sideNav' => array(),  
25 - 'content' => array()  
26 - );  
27 -  
28 - $sideDatas = IndexData::getHomeChannels();  
29 - if($sideDatas['code'] == 200)  
30 - {  
31 - $data['sideNav'] = $sideDatas['data'];  
32 - } 23 + $data = array();
33 24
34 // 频道数据 25 // 频道数据
35 $channelData = IndexData::getUserChannelData(0, '', 'e9875682c1599a886bfbdb965b740022'); 26 $channelData = IndexData::getUserChannelData(0, '', 'e9875682c1599a886bfbdb965b740022');
1 <?php 1 <?php
2 2
3 use Action\AbstractAction; 3 use Action\AbstractAction;
4 -<<<<<<< HEAD  
5 -use LibModels\Wap\Home\IndexData as Index;  
6 -=======  
7 use LibModels\Wap\Home\IndexData; 4 use LibModels\Wap\Home\IndexData;
8 use Plugin\FloorProcess; 5 use Plugin\FloorProcess;
9 6
10 ->>>>>>> 3ceb824c00a2188f954835e78b5e4222bf3c78f8  
11 /** 7 /**
12 * 创意生活首页 8 * 创意生活首页
13 */ 9 */
14 -class kidsController extends AbstractAction 10 +class LifestyleController extends AbstractAction
15 { 11 {
16 12
17 public function indexAction() 13 public function indexAction()
@@ -25,16 +21,7 @@ class kidsController extends AbstractAction @@ -25,16 +21,7 @@ class kidsController extends AbstractAction
25 // 设置顶部信息（搜索） 21 // 设置顶部信息（搜索）
26 $this->setHomeChannelHeader(); 22 $this->setHomeChannelHeader();
27 23
28 - $data = array(  
29 - 'sideNav' => array(),  
30 - 'content' => array()  
31 - );  
32 -  
33 - $sideDatas = IndexData::getHomeChannels();  
34 - if($sideDatas['code'] == 200)  
35 - {  
36 - $data['sideNav'] = $sideDatas['data'];  
37 - } 24 + $data = array();
38 25
39 // 频道数据 26 // 频道数据
40 $channelData = IndexData::getUserChannelData(0, '1,3', '9aa25f5133f011ec96c2045eb15ae425'); 27 $channelData = IndexData::getUserChannelData(0, '1,3', '9aa25f5133f011ec96c2045eb15ae425');