Authored by unknown

合并代码 男首

@@ -123,5 +123,7 @@ @@ -123,5 +123,7 @@
123 {{> index/commodity}} 123 {{> index/commodity}}
124 {{/ newArrivls}} 124 {{/ newArrivls}}
125 {{/ boy}} 125 {{/ boy}}
  126 +
  127 +
126 </div> 128 </div>
127 {{> layout/footer}} 129 {{> layout/footer}}
  1 +{{> index/floor_header}}
1 <div class="commodity"> 2 <div class="commodity">
  3 +
2 <ul class="clearfix"> 4 <ul class="clearfix">
3 {{#each commodity}} 5 {{#each commodity}}
4 <li> 6 <li>
1 {{# tplrecommend}} 1 {{# tplrecommend}}
  2 +{{> index/floor_header}}
2 <div class="tpl-recommend clearfix"> 3 <div class="tpl-recommend clearfix">
3 <div class="tpl-body clearfix"> 4 <div class="tpl-body clearfix">
4 <div class="tpl-nav"> 5 <div class="tpl-nav">
@@ -12,11 +12,10 @@ class BoysController extends AbstractAction @@ -12,11 +12,10 @@ class BoysController extends AbstractAction
12 $tpldata = array( 12 $tpldata = array(
13 'name'=>'潮人配饰 ORNAMENT', 13 'name'=>'潮人配饰 ORNAMENT',
14 'navs' => array( 14 'navs' => array(
15 - 'list'=>array(  
16 array( 15 array(
17 - 'url' =>'',  
18 - 'name' =>'MORE>'  
19 - ) 16 + 'id' => '',
  17 + 'href' => '',
  18 + 'name' => 'MORE'
20 ) 19 )
21 ), 20 ),
22 'tplrecommend'=>array( 21 'tplrecommend'=>array(
@@ -231,10 +230,10 @@ class BoysController extends AbstractAction @@ -231,10 +230,10 @@ class BoysController extends AbstractAction
231 'newArrivls' => array( 230 'newArrivls' => array(
232 'name' => '最新上架 NEW ARRIVALS', 231 'name' => '最新上架 NEW ARRIVALS',
233 'navs' => array( 232 'navs' => array(
234 - 'list'=>array(  
235 array( 233 array(
236 - 'url' =>'',  
237 - 'name' =>'MORE>' 234 + 'id' => '',
  235 + 'href' => '',
  236 + 'name' => 'MORE'
238 ) 237 )
239 ), 238 ),
240 'commodity'=>array( 239 'commodity'=>array(
@@ -290,7 +289,6 @@ class BoysController extends AbstractAction @@ -290,7 +289,6 @@ class BoysController extends AbstractAction
290 ) 289 )
291 ) 290 )
292 ) 291 )
293 - )  
294 ); 292 );
295 $this->_view->display('index', $data); 293 $this->_view->display('index', $data);
296 } 294 }