fe / YOHOOD · Commits

Go to a project

Authored by microTT
Commit 11afa480c98fd720315f42936c8ede4f388882d4 2 parents 4d8487a2 f7022c16

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

Inline Side-by-side
Showing 2 changed files with 7 additions and 6 deletions
... ... @@ -8,7 +8,7 @@
<a href="/admin/prod">商品列表</a>
</li>
</ul>
<table class="table">
<table class="table" style="table-layout:fixed;">
<caption style="text-align:left; padding-bottom:5px;">
<button class="btn" style="float:left;" id="add_brand" href="javascript:void(0)">添加品牌</button>
<form method="post" class="form-search search_panel" style="text-align:right;">
... ... @@ -42,7 +42,7 @@
<td><?php echo $brand['id']?></td>
<td><?php echo $brand['name'];?></td>
<td title="<?php echo $brand['logo'];?>"><img width=40 height=30 src="<?php echo Lib_Images::getImageUrl($brand['logo'],'0200x0150','fragmentimg');?>" /></td>
<td><?php echo $brand['description'];?></td>
<td style="word-wrap:break-word;"><?php echo $brand['description'];?></td>
<td title='<?php echo $brand['pics']?>'>
<?php
... ... @@ -65,7 +65,7 @@
?>
</td>
<td><?php echo $brand['booth_id'];?></td>
<td><?php echo isset($this->view->brandRelas[$id]) ? $this->view->brandRelas[$id]:'';?></td>
<td style="word-wrap:break-word;"><?php echo isset($this->view->brandRelas[$id]) ? $this->view->brandRelas[$id]:'';?></td>
<td><a href="<?php echo $brand['link'];?>" target="_blank">前往</a></td>
<td><?php echo $brand['seq'];?></td>
<td>
... ...
... ... @@ -83,12 +83,13 @@
</li>
EOL;
$groupLen ++;
if($groupLen>= 16)
if($groupLen>= 8)
{
$templates[] ='<div class="box big-size clearfix"><h2>'.$type.'</h2><hr><ul class="clearfix">'.$html.'</ul></div>';
$html = '';
$groupLen = 0;
$groupNum = 0;
$type="";
}
}
if(!empty($html))
... ... @@ -99,7 +100,7 @@ EOL;
$groupNum ++;
if($groupNum == 2 && !empty($html))
{
$templates[] ='<div class="box big-size clearfix"><h2>'.$type.'</h2><hr><ul class="clearfix">'.$html.'</ul></div>';
$templates[] ='<div class="box clearfix"><h2>'.$type.'</h2><hr><ul class="clearfix">'.$html.'</ul></div>';
$html = '';
$groupNum = 0;
$groupLen = 0;
... ... @@ -116,7 +117,7 @@ EOL;
else
{
$temp = preg_replace('@<div class="(.*)">(.+)<\/div>@isU', "\\2", $temp);
$template .='<div class="box big-size clearfix">'.$temp.'</div>';
$template .='<div class="box clearfix">'.$temp.'</div>';
}
}
... ...