fe / YOHOBUYPC · Commits

Go to a project

Authored by unknown
Commit 481d2072aacece165a42c2889a5356b47ff9c07e 1 parent 060682dc

合并代码 男首

Inline Side-by-side
Showing 4 changed files with 65 additions and 62 deletions
@@ -115,13 +115,15 @@ @@ -115,13 +115,15 @@
115 115
116 {{! 品类推荐}} 116 {{! 品类推荐}}
117 {{#each recommend}} 117 {{#each recommend}}
118 - {{> index/recommend}} 118 + {{> index/recommend}}
119 {{/ recommend}} 119 {{/ recommend}}
120 120
121 {{! 新品上架}} 121 {{! 新品上架}}
122 {{# newArrivls}} 122 {{# newArrivls}}
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,67 +230,66 @@ class BoysController extends AbstractAction @@ -231,67 +230,66 @@ 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(  
236 - 'url' =>'',  
237 - 'name' =>'MORE>'  
238 - ) 233 + array(
  234 + 'id' => '',
  235 + 'href' => '',
  236 + 'name' => 'MORE'
  237 + )
  238 + ),
  239 + 'commodity'=>array(
  240 + array(
  241 + 'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
  242 + 'img'=> 'http://img11.static.yhbimg.com/yhb-img01/2015/12/01/02/01c21e6610eefdc5ebd7ad890e49b09c2d.jpg',
  243 + 'name'=> '优显led触控台灯',
  244 + 'price'=> 168,
  245 + 'state'=> 1 //状态
  246 + ),
  247 + array(
  248 + 'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
  249 + 'img'=> 'http://img11.static.yhbimg.com/yhb-img01/2015/12/01/02/01c21e6610eefdc5ebd7ad890e49b09c2d.jpg',
  250 + 'name'=> '优显led触控台灯',
  251 + 'price'=> 168,
  252 + 'state'=> 1 //状态
  253 + ),
  254 + array(
  255 + 'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
  256 + 'img'=> 'http://img11.static.yhbimg.com/yhb-img01/2015/12/01/02/01c21e6610eefdc5ebd7ad890e49b09c2d.jpg',
  257 + 'name'=> '优显led触控台灯',
  258 + 'price'=> 168,
  259 + 'state'=> 1 //状态
  260 + ),
  261 + array(
  262 + 'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
  263 + 'img'=> 'http://img11.static.yhbimg.com/yhb-img01/2015/12/01/02/01c21e6610eefdc5ebd7ad890e49b09c2d.jpg',
  264 + 'name'=> '优显led触控台灯',
  265 + 'price'=> 168,
  266 + 'state'=> 1 //状态
  267 + ),
  268 + array(
  269 + 'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
  270 + 'img'=> 'http://img11.static.yhbimg.com/yhb-img01/2015/12/01/02/01c21e6610eefdc5ebd7ad890e49b09c2d.jpg',
  271 + 'name'=> '优显led触控台灯',
  272 + 'price'=> 168,
  273 + 'state'=> 1 //状态
  274 + ),
  275 + array(
  276 + 'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
  277 + 'img'=> 'http://img11.static.yhbimg.com/yhb-img01/2015/12/01/02/01c21e6610eefdc5ebd7ad890e49b09c2d.jpg',
  278 + 'name'=> '优显led触控台灯',
  279 + 'price'=> 168,
  280 + 'state'=> 1 //状态
239 ), 281 ),
240 - 'commodity'=>array(  
241 - array(  
242 - 'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,  
243 - 'img'=> 'http://img11.static.yhbimg.com/yhb-img01/2015/12/01/02/01c21e6610eefdc5ebd7ad890e49b09c2d.jpg',  
244 - 'name'=> '优显led触控台灯',  
245 - 'price'=> 168,  
246 - 'state'=> 1 //状态  
247 - ),  
248 - array(  
249 - 'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,  
250 - 'img'=> 'http://img11.static.yhbimg.com/yhb-img01/2015/12/01/02/01c21e6610eefdc5ebd7ad890e49b09c2d.jpg',  
251 - 'name'=> '优显led触控台灯',  
252 - 'price'=> 168,  
253 - 'state'=> 1 //状态  
254 - ),  
255 - array(  
256 - 'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,  
257 - 'img'=> 'http://img11.static.yhbimg.com/yhb-img01/2015/12/01/02/01c21e6610eefdc5ebd7ad890e49b09c2d.jpg',  
258 - 'name'=> '优显led触控台灯',  
259 - 'price'=> 168,  
260 - 'state'=> 1 //状态  
261 - ),  
262 - array(  
263 - 'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,  
264 - 'img'=> 'http://img11.static.yhbimg.com/yhb-img01/2015/12/01/02/01c21e6610eefdc5ebd7ad890e49b09c2d.jpg',  
265 - 'name'=> '优显led触控台灯',  
266 - 'price'=> 168,  
267 - 'state'=> 1 //状态  
268 - ),  
269 - array(  
270 - 'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,  
271 - 'img'=> 'http://img11.static.yhbimg.com/yhb-img01/2015/12/01/02/01c21e6610eefdc5ebd7ad890e49b09c2d.jpg',  
272 - 'name'=> '优显led触控台灯',  
273 - 'price'=> 168,  
274 - 'state'=> 1 //状态  
275 - ),  
276 - array(  
277 - 'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,  
278 - 'img'=> 'http://img11.static.yhbimg.com/yhb-img01/2015/12/01/02/01c21e6610eefdc5ebd7ad890e49b09c2d.jpg',  
279 - 'name'=> '优显led触控台灯',  
280 - 'price'=> 168,  
281 - 'state'=> 1 //状态  
282 - ),  
283 - array(  
284 - 'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,  
285 - 'img'=> 'http://img11.static.yhbimg.com/yhb-img01/2015/12/01/02/01c21e6610eefdc5ebd7ad890e49b09c2d.jpg',  
286 - 'name'=> '优显led触控台灯',  
287 - 'price'=> 168,  
288 - 'state'=> 1 //状态  
289 - ) 282 + array(
  283 + 'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
  284 + 'img'=> 'http://img11.static.yhbimg.com/yhb-img01/2015/12/01/02/01c21e6610eefdc5ebd7ad890e49b09c2d.jpg',
  285 + 'name'=> '优显led触控台灯',
  286 + 'price'=> 168,
  287 + 'state'=> 1 //状态
290 ) 288 )
291 ) 289 )
292 ) 290 )
293 ) 291 )
294 - ); 292 + );
295 $this->_view->display('index', $data); 293 $this->_view->display('index', $data);
296 } 294 }
297 } 295 }