fe / YOHOOD · Commits

Go to a project

Authored by microTT
Commit 66b6dda7dba1f3c9aa6e13d2cf36b758cca9b5fb 2 parents 97d2b31f 3f5afc70

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

Inline Side-by-side
Showing 6 changed files with 15 additions and 17 deletions
... ... @@ -60,11 +60,11 @@ define('admin/onlinereg', function(require, exports){
//参展商校验数据
var requireType0 = ['name','contact','telphone','relation','place'];
//赞助商校验数据
var requireType1 = ['name','product_type','contact','telphone'];
var requireType1 = ['name','contact','telphone'];
//媒体校验数据
var requireType2 = ['name','mobile'];
var val = '';
var keys = ['name','product_type','profession','company','contact','telphone','mobile','brand_reg_type',
var keys = ['name','profession','company','contact','telphone','mobile','brand_reg_type',
'country', 'zipcode','city','introduction','email','place','website'];
var selectKeys = ['is_enter_yohobuy','is_3c','relation','brand_reg_type','sex'];
var i;
... ...
... ... @@ -7,7 +7,7 @@ class Controller_Brand extends Controller_Abstract
public function indexAction()
{
$banners = Facade_Index::getIndex(1);
$banners = Facade_Index::getIndex(3);
$this->_view['partnerList'] = Facade_Partner::getPartner();
$this->_view['partnerTypes'] = Facade_Partner::$types;
$this->_view['banners'] = $banners;
... ...
... ... @@ -178,7 +178,7 @@
</td>
</tr>
<tr>
<td>产品类型<span class="text-error"> * </span></td>
<td>产品类型</td>
<td><input type="text" name="product_type" /></td>
</tr>
<tr>
... ...
... ... @@ -81,11 +81,9 @@
</li>
EOL;
$groupLen ++;
if ($groupLen >= 8) {}
if($groupLen>= 16)
{
$templates[] ='<div class="{class}"><h2>'.$type.'</h2><hr><ul class="clearfix">'.$html.'</ul></div>';
$templates[] ='<div class="box big-size clearfix"><h2>'.$type.'</h2><hr><ul class="clearfix">'.$html.'</ul></div>';
$html = '';
$groupLen = 0;
$groupNum = 0;
... ... @@ -93,13 +91,13 @@ EOL;
}
if(!empty($html))
{
$templates[] ='<div class="{class}"><h2>'.$type.'</h2><hr><ul class="clearfix">'.$html.'</ul></div>';
$templates[] ='<div class="box big-size clearfix"><h2>'.$type.'</h2><hr><ul class="clearfix">'.$html.'</ul></div>';
$html = '';
}
$groupNum ++;
if($groupNum == 2 && !empty($html))
{
$templates[] ='<div class="{class}"><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 +114,7 @@ EOL;
else
{
$temp = preg_replace('@<div class="(.*)">(.+)<\/div>@isU', "\\2", $temp);
$template .='<div class="box clearfix">'.$temp.'</div>';
$template .='<div class="box clearfix">'.$temp.'</div>';
}
}
... ...
... ... @@ -26,9 +26,9 @@
<?php endforeach;?>
</div>
<div id="pageContent" style="text-align: center;" class="pagination">
<?php $this->_component('Common_Pagination',array(
'pagination' => $this->view->pagination,'next_label' => '>>','prev_label' => '<<','current_class' => 'current',
'page_class'=>'pagination-inner', 'id'=>'img_page'
<?php $this->_component('Common_Pagination',array(
'pagination' => $this->view->pagination,'next_label' => 'NEXT>>','next_class' => 'next','prev_label' => 'PREV<<','prev_class' => 'prev','current_class' => 'current',
'page_class'=>'pagination-inner', 'id'=>'img_page'
));?>
</div>
</div>
... ...
... ... @@ -5,10 +5,10 @@
<?php $this->_widget('news_list', array('list'=> $this->view->list,'video' => 1));?>
</div>
<div id="pageContent" style="text-align: center;" class="pagination">
<?php $this->_component('Common_Pagination',array(
'pagination' => $this->view->pagination,'next_label' => 'NEXT>>','prev_label' => '<<','current_class' => 'current',
'page_class'=>'pagination-inner', 'id'=>'img_page'
));?>
<?php $this->_component('Common_Pagination',array(
'pagination' => $this->view->pagination,'next_label' => 'NEXT>>','next_class' => 'next','prev_label' => 'PREV<<','prev_class' => 'prev','current_class' => 'current',
'page_class'=>'pagination-inner', 'id'=>'img_page'
));?>
</div>
</div>
<?php $this->_endblock();?>
... ...