fe / YOHOOD · Commits

Go to a project

Authored by unknown
Commit 71e1cab422308ce14b726b676004a75ff7b7f1d0 2 parents c21d63fe 757e72d6

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

Inline Side-by-side
Showing 4 changed files with 8 additions and 8 deletions
... ... @@ -22,14 +22,14 @@ class Controller_Brand extends Controller_Abstract
$client = $this->_request->query('client', 0);
if($client || $this->_platform != 'web')
{
$signBrands = Facade_Brand::getSignBrand();
$yohobuyBrands = Facade_Brand::getYohobuyBrand();
$yohobuyBrandId = '0';
foreach($signBrands as $signBrand)
foreach($yohobuyBrands as $yohobuyBrand)
{
$signBrand['brand_name'] = trim(strtolower($signBrand['brand_name']));
if(strtolower($info['name']) == $signBrand['brand_name'])
$yohobuyBrand['brand_name'] = trim(strtolower($yohobuyBrand['brand_name']));
if(strtolower($info['name']) == $yohobuyBrand['brand_name'])
{
$yohobuyBrandId = $signBrand['brand_id'];
$yohobuyBrandId = $yohobuyBrand['brand_id'];
break;
}
}
... ...
... ... @@ -17,7 +17,7 @@
<li>
<a href="<?php echo $partner['url'];?>" title="<?php echo $partner['name'];?>" target="_blank">
<div class="img-box">
<img src="<?php echo Lib_Images::getImageUrl($partner['pic'], 'source','fragmentimg'); ?>" alt="">
<img src="<?php echo Lib_Images::getImageUrl($partner['pic'], 'source','fragmentimg'); ?>" alt="" width="138" height="92">
</div>
</a>
</li>
... ...
... ... @@ -17,7 +17,7 @@
<li>
<a href="<?php echo $partner['url'];?>" title="<?php echo $partner['name'];?>" target="_blank">
<div class="img-box">
<img src="<?php echo Lib_Images::getImageUrl($partner['pic'], 'source','fragmentimg'); ?>" alt="">
<img src="<?php echo Lib_Images::getImageUrl($partner['pic'], 'source','fragmentimg'); ?>" alt="" >
</div>
</a>
</li>
... ...
... ... @@ -65,7 +65,7 @@
$html.= <<<EOL
<li>
<a href="{$partner['url']}" title="{$partner['name']}" target="_blank">
<img src="{$pic}" alt="" style="height:70px;width:70px;"/>
<img src="{$pic}" alt="" style="width:70px;"/>
</a>
</li>
EOL;
... ...