Authored by 2586703@qq.com

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohood into develop

... ... @@ -42,8 +42,8 @@
<div class="slide-wrap clearfix">
<?php
$partnerGroups = array();
foreach($this->view->partnerList as $partner)
{
foreach($this->view->partnerList as $partner)
{
foreach($this->view->partnerTypes as $key => $type)
{
if($partner['type'] == $key)
... ... @@ -51,7 +51,7 @@
$partnerGroups[$type][] = $partner;
}
}
}
}
$groupNum = 0;
$groupLen = 0;
$template = '';
... ... @@ -91,7 +91,7 @@ EOL;
$groupLen = 0;
}
}
$pos = 0;
$pos = 0;
foreach($templates as $temp)
{
if($pos % 2 == 0)
... ... @@ -105,6 +105,7 @@ EOL;
preg_match_all("/<li>/i", $temp, $liLen, PREG_SET_ORDER);
if(count($liLen) >= 6)
{
$temp = preg_replace('@<div class="(\w+)">(.+)<\/div>@isU', "\\2", $temp);
$template .='<div class="box clearfix">'.$temp.'</div>';
$pos = -1;
}
... ...