fe / YOHOBUYWAP · Commits

Go to a project

Authored by weiqingting
Commit f2fcd3b9162377264d37f917499582007ff45e5c 1 parent 1067f12b

更新css

Inline Side-by-side
Showing 9 changed files with 192 additions and 121 deletions
... ... @@ -57,10 +57,6 @@
{{> index/girl-singlehot}}
{{/ singlehot}}
{{! 广告}}
{{# adbanner}}
{{/ adbanner}}
{{! 新品上架}}
{{# newArrivls}}
... ...
{{> layout/header}}
<div class="home-page yoho-page" data-page="kids">
<div class="home-page yoho-page kids" data-page="kids" data-newarrivls='{"url":"/kids/commodity","pageCount":"4","flag":"kids"}'>
{{# kids}}
{{! 头部banner}}
{{# slide}}
... ... @@ -10,6 +10,27 @@
{{# preferenceBrands}}
{{> index/preference-brand}}
{{/ preferenceBrands}}
{{! 热门分类}}
{{# recommend}}
{{> index/girl-recommend}}
{{/ recommend}}
{{! 单品/广告}}
{{# singlehot}}
{{> index/girl-singlehot}}
{{/ singlehot}}
{{! GIRL KIDS}}
{{# girlkids}}
{{> index/girl-singlehot}}
{{/ girlkids}}
{{! 新品上架}}
{{# newArrivls}}
{{> index/commodity}}
{{/ newArrivls}}
{{/ kids}}
</div>
{{> layout/footer}}
\ No newline at end of file
... ...
{{> layout/header}}
<div class="home-page yoho-page">
<div class="home-page yoho-page lifestyle" data-newarrivls='{"url":"/lifestyle/commodity","pageCount":"4","flag":"lifestyle"}'>
{{# lifestyle}}
{{! 头部banner}}
{{# slide}}
... ... @@ -15,6 +15,16 @@
{{# category}}
{{> index/category-floor}}
{{/ category}}
{{! 单品/广告}}
{{# singlehot}}
{{> index/girl-singlehot}}
{{/ singlehot}}
{{! 新品上架}}
{{# newArrivls}}
{{> index/commodity}}
{{/ newArrivls}}
{{/ lifestyle}}
</div>
{{> layout/footer}}
\ No newline at end of file
... ...
... ... @@ -6,7 +6,7 @@
<li>
<a href="{{url}}"><div class="commodity-img">
{{# tip}}
<i class="top">{{tip}}</i>
<i class="top">{{.}}</i>
{{/ tip}}
<img class="lazy" data-original="{{img}}"/></div>
<p class="commodity-name">{{name}}</p>
... ...
... ... @@ -81,19 +81,4 @@
height: 502px !important;
width: 100% !important;
}
.commodity-brands{
a{
float: left;
margin-left: 8px;
width: 185px;
height: 86px;
display: block;
img{
display: block;
width: 185px;
height: 86px;
}
}
}
}
... ...
... ... @@ -583,9 +583,9 @@
.commodity{
position: relative;
width: 1160px;
margin-bottom:80px;
.commodity-list{
margin-left: -10px;
margin-bottom:80px;
li{
float: left;
margin-left: 10px;
... ... @@ -622,6 +622,20 @@
}
}
}
.commodity-brands{
a{
float: left;
margin-left: 8px;
width: 185px;
height: 86px;
display: block;
img{
display: block;
width: 185px;
height: 86px;
}
}
}
.loading{
position: absolute;
bottom: 0;
... ...
... ... @@ -430,38 +430,16 @@ class GirlsController extends AbstractAction
break;
}
$imgsrc='http://img11.static.yhbimg.com/goodsimg/2015/10/19/10/01b312c3b7a7efebcd671e73495ff3e306.jpg';
$result=array(
'code'=>200,
'commodity'=>array(
array(
'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
'img'=> $imgsrc,
'name'=> '优显led触控台灯',
'price'=> 168,
'tip'=> '即将售罄' //提示
),
array(
'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
'img'=> $imgsrc,
'name'=> '优显led触控台灯',
'price'=> 168,
'tip'=> '即将售罄' //提示
),
array(
$data=array(
'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
'img'=> $imgsrc,
'name'=> '优显led触控台灯',
'price'=> 168,
'tip'=> '即将售罄' //提示
),
array(
'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
'img'=> $imgsrc,
'name'=> '优显led触控台灯',
'price'=> 168,
'tip'=> '即将售罄' //提示
)
)
'tip'=> "" //提示
);
$result=array(
'code'=>200,
'commodity'=>array($data,$data,$data,$data,$data)
);
} while (false);
... ...
... ... @@ -212,6 +212,44 @@ class KidsController extends AbstractAction
)
)
);
//数据变量
$imgsrc='http://img11.static.yhbimg.com/goodsimg/2015/10/19/10/01b312c3b7a7efebcd671e73495ff3e306.jpg';
$name_href=array('name'=>'衣服','url'=>'');
$name_href_img=array(
'href' => '',
'img' => $imgsrc,
'name'=>'优显led触控台灯'
);
$name_href_img_price=array(
'href' => '',
'img' => $imgsrc,
'name'=>'优显led触控台灯',
'price'=>'100'
);
$name_href_name_price_tip=array(
'href' => '',
'img' => $imgsrc,
'name'=>'优显led触控台灯',
'price'=>'100',
'tip'=>'TOP1'
);
$tpldata = array(
'name'=>'热门分类',
'navs' => array(
array(
'id' => '',
'href' => '',
'name' => 'MORE'
)
),
'tplrecommend'=>array(
'keyword'=>array($name_href_img,$name_href_img,$name_href_img),
'category'=>array($name_href,$name_href,$name_href,$name_href,$name_href,$name_href,$name_href,$name_href,$name_href,$name_href,$name_href,$name_href),
'brands'=>array($name_href_img),
'types'=>array($name_href_img,$name_href_img,$name_href_img,$name_href_img,$name_href_img,$name_href_img)
)
);
$data = array(
'headerdata' => $headerdata,
'boysHomePage' => true,
... ... @@ -334,6 +372,34 @@ class KidsController extends AbstractAction
)
)
)
),
array(
'recommend'=>$tpldata//热门分类
),
array(
'singlehot'=>array(
'name' => 'BOY KIDS',
'imgHot' => array( $name_href_name_price_tip,$name_href_name_price_tip,$name_href_name_price_tip,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price),
'bands'=>array( $name_href_img,$name_href_img,$name_href_img,$name_href_img,$name_href_img,$name_href_img)
)
),
array(
'girlkids'=>array(
'name' => 'GIRL KIDS',
'imgHot' => array( $name_href_name_price_tip,$name_href_name_price_tip,$name_href_name_price_tip,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price)
)
),
array(
'newArrivls' => array(
'name' => '最新上架 NEW ARRIVALS',
'navs' => array(
array(
'id' => '',
'href' => '',
'name' => 'MORE'
)
)
)
)
)
);
... ... @@ -364,45 +430,16 @@ class KidsController extends AbstractAction
break;
}
$imgsrc='http://img11.static.yhbimg.com/goodsimg/2015/10/19/10/01b312c3b7a7efebcd671e73495ff3e306.jpg';
$result=array(
'code'=>200,
'commodity'=>array(
array(
$data=array(
'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
'img'=> $imgsrc,
'name'=> '优显led触控台灯',
'price'=> 168,
'state'=> 1 //状态
),
array(
'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
'img'=> $imgsrc,
'name'=> '优显led触控台灯',
'price'=> 168,
'state'=> 1 //状态
),
array(
'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
'img'=> $imgsrc,
'name'=> '优显led触控台灯',
'price'=> 168,
'state'=> 1 //状态
),
array(
'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
'img'=> $imgsrc,
'name'=> '优显led触控台灯',
'price'=> 168,
'state'=> 1 //状态
),
array(
'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
'img'=> $imgsrc,
'name'=> '优显led触控台灯',
'price'=> 168,
'state'=> 1 //状态
)
)
'tip'=> "即将售罄" //提示
);
$result=array(
'code'=>200,
'commodity'=>array($data,$data,$data,$data)
);
} while (false);
... ...
... ... @@ -212,6 +212,46 @@ class LifestyleController extends AbstractAction
)
)
);
//数据变量
$imgsrc='http://img11.static.yhbimg.com/goodsimg/2015/10/19/10/01b312c3b7a7efebcd671e73495ff3e306.jpg';
$name_href=array('name'=>'衣服','url'=>'');
$name_href_img=array(
'href' => '',
'img' => $imgsrc,
'name'=>'优显led触控台灯'
);
$name_href_img_price=array(
'href' => '',
'img' => $imgsrc,
'name'=>'优显led触控台灯',
'price'=>'100'
);
$name_href_name_price_tip=array(
'href' => '',
'img' => $imgsrc,
'name'=>'优显led触控台灯',
'price'=>'100',
'tip'=>'TOP1'
);
$tpldata = array(
'name'=>'热门分类',
'navs' => array(
array(
'id' => '',
'href' => '',
'name' => 'MORE'
)
),
'tplrecommend'=>array(
'keyword'=>array($name_href_img,$name_href_img,$name_href_img),
'category'=>array($name_href,$name_href,$name_href,$name_href,$name_href,$name_href,$name_href,$name_href,$name_href,$name_href,$name_href,$name_href),
'brands'=>array($name_href_img),
'types'=>array($name_href_img,$name_href_img,$name_href_img,$name_href_img,$name_href_img,$name_href_img)
)
);
$data = array(
'headerdata' => $headerdata,
'boysHomePage' => true,
... ... @@ -466,6 +506,25 @@ class LifestyleController extends AbstractAction
)
)
)
),
array(
'singlehot'=>array(
'name' => '人气单品 TOP100',
'imgHot' => array( $name_href_name_price_tip,$name_href_name_price_tip,$name_href_name_price_tip,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price,$name_href_img_price),
'bands'=>array( $name_href_img,$name_href_img,$name_href_img,$name_href_img,$name_href_img,$name_href_img)
)
),
array(
'newArrivls' => array(
'name' => '最新上架 NEW ARRIVALS',
'navs' => array(
array(
'id' => '',
'href' => '',
'name' => 'MORE'
)
)
)
)
)
);
... ... @@ -497,45 +556,16 @@ class LifestyleController extends AbstractAction
break;
}
$imgsrc='http://img11.static.yhbimg.com/goodsimg/2015/10/19/10/01b312c3b7a7efebcd671e73495ff3e306.jpg';
$result=array(
'code'=>200,
'commodity'=>array(
array(
$data=array(
'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
'img'=> $imgsrc,
'name'=> '优显led触控台灯',
'price'=> 168,
'state'=> 1 //状态
),
array(
'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
'img'=> $imgsrc,
'name'=> '优显led触控台灯',
'price'=> 168,
'state'=> 1 //状态
),
array(
'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
'img'=> $imgsrc,
'name'=> '优显led触控台灯',
'price'=> 168,
'state'=> 1 //状态
),
array(
'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
'img'=> $imgsrc,
'name'=> '优显led触控台灯',
'price'=> 168,
'state'=> 1 //状态
),
array(
'url' =>'http://www.muji.com.cn/cn/store/goods/4547315967308' ,
'img'=> $imgsrc,
'name'=> '优显led触控台灯',
'price'=> 168,
'state'=> 1 //状态
)
)
'tip'=> "即将售罄" //提示
);
$result=array(
'code'=>200,
'commodity'=>array($data,$data,$data,$data)
);
} while (false);
... ...