Authored by 毕凯

Merge branch 'release/4.9.2'

... ... @@ -90,7 +90,7 @@
{{! 热门品类}}
<div class="first">
{{# hotCategory}}
{{> home/hot_category}}
{{> product/hot_category}}
{{/ hotCategory}}
</div>
... ...
... ... @@ -74,7 +74,7 @@
{{! 热门品类}}
{{# hotCategory}}
{{> home/hot_category}}
{{> product/hot_category}}
{{/ hotCategory}}
<div class="popularity-title">
... ...
... ... @@ -14,7 +14,6 @@
<img src="{{img}}" alt="">
</div>
</a>
<div class="img-cover">{{name}}</div>
</li>
{{/ list}}
</ul>
... ...
<div class="hot-category">
{{> home/floor_header}}
{{# banner}}
<a class="category-banner" href="{{url}}">
<img class="lazy" data-original="{{img}}">
</a>
{{/ banner}}
<ul class="category-list clearfix">
{{# list}}
<li data-bp-id="shop_hotcategory_{{img}}_0" class="buriedpoint">
<a href="{{url}}">
<div class="img-box">
<img src="{{img}}" alt="">
</div>
</a>
<div class="img-cover">{{name}}</div>
</li>
{{/ list}}
</ul>
</div>
\ No newline at end of file
... ...
... ... @@ -89,7 +89,7 @@ class IndexModel
}
$data['guang']['infos'][] = $build;
}
print_r($data['guang']['infos']);
//print_r($data['guang']['infos']);
// 分页需要参数
$data['guang']['gender'] = $gender;
... ... @@ -190,6 +190,7 @@ class IndexModel
// 内容列表
if (!empty($article['data']['list']['artList'])) {
foreach ($article['data']['list']['artList'] as $value) {
$data['guang']['infos'][$curIndex]['info'][] = Helpers::formatArticle($value, true, false, true);
}
... ... @@ -214,7 +215,7 @@ class IndexModel
$category = array();
$article = array();
//print_r($data);
return $data;
}
... ...
... ... @@ -24,12 +24,8 @@ class IndexController extends AbstractAction
$this->setTitle('逛');
$this->setNavHeader('逛', true, SITE_MAIN);
// $uid = $this->getUid();
$udid = $this->getUdid();
$uid = 8039759;
//$udid = P_YDoclyC4l9GWC9gScyTpbMiWnQpaYA;
$type = $this->get('id', 0);
$gender = $this->get('gender');
if (is_string($gender)) {
... ...