Skip to content

F
fenzhan_zsb
Commit 601ef840 authored by liuqiao's avatar liuqiao
Browse files
Options

Merge branch 'feature-lq-04' into release_preview 

# Conflicts:
#	new_admincp/applications/zsb/views/nj/sell_manage_frozen.php
#	new_admincp/applications/zsb/views/nj/sell_manage_invalid.php
parents 7772dcb2 367b8839
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 72 deletions
new_admincp/applications/zsb/views/nj/rent_manage.php
View file @ 601ef840
......@@ -214,55 +214,61 @@
<tr>
<td class="td first"><input class="jsSelectItem" type="checkbox" name="rows_id" value="<?php echo $value['id'];?>"/></td>
<td class="td second" style="width:380px;">
<div class="itemTex">
<a class="name" title = "<?php echo $value['address'];?>" href="<?php echo $value['info_url'];?>" target="_blank"><?php echo $value['address_str'];?></a>
</div>
<div class="itemTex">
<?php if($value['is_star_result'] === TRUE) { ?>
<img alt="多图房源" title="多图房源" src="<?=STATIC_SOURCE_URL?>/zsb/images/v1.0/new_duotu.gif" />
<?php } ?>
<?php if($value['is_tag_result'] === TRUE && ($this->config->item('is_tag') === 1)) { ?>
<img alt="急推房源" title="急推房源" src="<?=STATIC_SOURCE_URL?>/zsb/images/v1.0/new_jitui.gif" />
<?php } ?>
<?php if(false && isset($value['block_level']) && $value['block_level'] != '') { ?>
<img alt="小区专家参与等级" title="小区专家参与等级" src="<?=STATIC_SOURCE_URL?>/zsb/images/v1.0/lv<?php echo $value['block_level'];?>.gif" />
<?php } ?>
</div>
<div class="itemTex"><span class="name"><?php if(isset($value['block_url']) && $value['block_url'] !='') {?> <a class="name" href="<?php echo $value['block_url'];?>" target="_blank"><?php echo $value['blockshowname'];?></a><?}else{echo $value['blockshowname'];}?></span><span class="fg_z">/</span><span><?php echo $value['room'];?>室<?php echo $value['hall'];?>厅</span><span class="fg_z">/</span><span><?php echo $value['floor_str'];?>层</span><span class="fg_z">/</span><span class="red"><?php echo $value['buildarea'];?>㎡</span><span class="fg_z">/</span><span class="red"><?php echo $value['price'];?><?php echo $house['shoppriceunit'][$value['priceunit']];?></span>
<div style="float: left;margin-top: 20px">
<img src="<?= $value['pic1'] ?>"
style="width: 80px; height: 65px;">
</div>
<div class="itemTex itemTex2">
<span>房源编号：<?php echo $value['id'];?></span>
<?php if (!empty($value['ownid'])) { echo '内部编号：'.$value['ownid']; } ?>
<!-- Baidu Button START -->
<br/>
<a style="float: left;" value="<?php echo $value['id'];?>" id="wx_share" class="wx_share_c" href="javascript:void(0)" data-url="http://<?php echo GB_CITY;?>.rent.house365.com/r_<?php echo $value['id'].'.html';?>"><img style="margin-top: 3px;margin-right: 3px;" src="<?=STATIC_SOURCE_URL?>/zsb/images/v1.0/weixin_tu.jpg"></a>
<div id="bdshare" class="bdshare_t bds_tools get-codes-bdshare" data="{'url':'http://<?php echo GB_CITY;?>.rent.house365.com/r_<?php echo $value['id'].'.html';?>'}">
<a class="bds_sqq"></a>
<a class="bds_qzone"></a>
<a class="bds_tsina"></a>
<!-- <a class="bds_tqq"></a>-->
<!-- <a class="bds_renren"></a>-->
<!-- <span class="bds_more"></span>-->
</div>
<script type="text/javascript" id="bdshare_js" data="type=tools" ></script>
<script type="text/javascript" id="bdshell_js"></script>
<script type="text/javascript">
document.getElementById("bdshell_js").src = "http://bdimg.share.baidu.com/static/js/shell_v2.js?cdnversion=" + Math.ceil(new Date()/3600000);
</script>
<?php if(GB_CITY=='nj'){?>
<!-- <a style="margin-left:2px;" value="--><?php //echo $value['id'];?><!--" id="wx_share" class="wx_share_c" href="javascript:void(0)"><img src="<?=STATIC_SOURCE_URL?>/zsb/images/v1.0/weixin_tu.jpg"></a>-->
<?php }?>
<!-- Baidu Button END -->
<div style="float: left;width: 260px;margin-left: 10px">
<div class="itemTex">
<a class="name" title = "<?php echo $value['address'];?>" href="<?php echo $value['info_url'];?>" target="_blank"><?php echo $value['address_str'];?></a>
</div>
<div class="itemTex">
<?php if($value['is_star_result'] === TRUE) { ?>
<img alt="多图房源" title="多图房源" src="<?=STATIC_SOURCE_URL?>/zsb/images/v1.0/new_duotu.gif" />
<?php } ?>
<?php if($value['is_tag_result'] === TRUE && ($this->config->item('is_tag') === 1)) { ?>
<img alt="急推房源" title="急推房源" src="<?=STATIC_SOURCE_URL?>/zsb/images/v1.0/new_jitui.gif" />
<?php } ?>
<?php if(false && isset($value['block_level']) && $value['block_level'] != '') { ?>
<img alt="小区专家参与等级" title="小区专家参与等级" src="<?=STATIC_SOURCE_URL?>/zsb/images/v1.0/lv<?php echo $value['block_level'];?>.gif" />
<?php } ?>
</div>
<div class="itemTex"><span class="name"><?php if(isset($value['block_url']) && $value['block_url'] !='') {?> <a class="name" href="<?php echo $value['block_url'];?>" target="_blank"><?php echo $value['blockshowname'];?></a><?}else{echo $value['blockshowname'];}?></span><span class="fg_z">/</span><span><?php echo $value['room'];?>室<?php echo $value['hall'];?>厅</span><span class="fg_z">/</span><span><?php echo $value['floor_str'];?>层</span><span class="fg_z">/</span><span class="red"><?php echo $value['buildarea'];?>㎡</span><span class="fg_z">/</span><span class="red"><?php echo $value['price'];?><?php echo $house['shoppriceunit'][$value['priceunit']];?></span>
</div>
<div class="itemTex itemTex2">
<span>房源编号：<?php echo $value['id'];?></span>
<?php if (!empty($value['ownid'])) { echo '内部编号：'.$value['ownid']; } ?>
<!-- Baidu Button START -->
<br/>
<a style="float: left;" value="<?php echo $value['id'];?>" id="wx_share" class="wx_share_c" href="javascript:void(0)" data-url="http://<?php echo GB_CITY;?>.rent.house365.com/r_<?php echo $value['id'].'.html';?>"><img style="margin-top: 3px;margin-right: 3px;" src="<?=STATIC_SOURCE_URL?>/zsb/images/v1.0/weixin_tu.jpg"></a>
<div id="bdshare" class="bdshare_t bds_tools get-codes-bdshare" data="{'url':'http://<?php echo GB_CITY;?>.rent.house365.com/r_<?php echo $value['id'].'.html';?>'}">
<a class="bds_sqq"></a>
<a class="bds_qzone"></a>
<a class="bds_tsina"></a>
<!-- <a class="bds_tqq"></a>-->
<!-- <a class="bds_renren"></a>-->
<!-- <span class="bds_more"></span>-->
</div>
<script type="text/javascript" id="bdshare_js" data="type=tools" ></script>
<script type="text/javascript" id="bdshell_js"></script>
<script type="text/javascript">
document.getElementById("bdshell_js").src = "http://bdimg.share.baidu.com/static/js/shell_v2.js?cdnversion=" + Math.ceil(new Date()/3600000);
</script>
<?php if(GB_CITY=='nj'){?>
<!-- <a style="margin-left:2px;" value="--><?php //echo $value['id'];?><!--" id="wx_share" class="wx_share_c" href="javascript:void(0)"><img src="<?=STATIC_SOURCE_URL?>/zsb/images/v1.0/weixin_tu.jpg"></a>-->
<?php }?>
<!-- Baidu Button END -->
</div>
</div>
</td>
<td class="td w90">
......
new_admincp/applications/zsb/views/nj/rent_manage_frozen.php
View file @ 601ef840
......@@ -156,18 +156,24 @@
<tr>
<td class="td w10"></td>
<td class="td second" style="width:300px;">
<div class="itemTex">
<a class="name" title = "<?php echo $value['address'];?>" href="<?php echo $value['info_url'];?>" target="_blank"><?php echo $value['address_str'];?></a>
</div>
<div class="itemTex">
<?php if($value['is_star_result'] === TRUE) { ?>
<img alt="多图房源" title="多图房源" src="<?=STATIC_SOURCE_URL?>/zsb/images/v1.0/new_duotu.gif" />
<?php } ?>
<div class="itemTex"><span class="name"><?php if(isset($value['block_url']) && $value['block_url'] !='') {?> <a class="name" href="<?php echo $value['block_url'];?>" target="_blank"><?php echo $value['blockshowname'];?></a><?}else{echo $value['blockshowname'];}?></span><span class="fg_z">/</span><span><?php echo $value['room'];?>室<?php echo $value['hall'];?>厅</span><span class="fg_z">/</span><span><?php echo $value['floor_str'];?>层</span><span class="fg_z">/</span><span><?php echo $value['buildarea'];?>㎡</span><span class="fg_z">/</span><span><?php echo $value['price'];?><?php echo $house['shoppriceunit'][$value['priceunit']];?></span>
<div style="float: left;margin-top: 20px">
<img src="<?= $value['pic1'] ?>"
style="width: 80px; height: 65px;">
</div>
<div class="itemTex itemTex2">
<span>房源编号：<?php echo $value['id'];?></span>
<?php if (!empty($value['ownid'])) { echo '内部编号：'.$value['ownid']; } ?>
<div style="float: left;width: 260px;margin-left: 10px">
<div class="itemTex">
<a class="name" title = "<?php echo $value['address'];?>" href="<?php echo $value['info_url'];?>" target="_blank"><?php echo $value['address_str'];?></a>
</div>
<div class="itemTex">
<?php if($value['is_star_result'] === TRUE) { ?>
<img alt="多图房源" title="多图房源" src="<?=STATIC_SOURCE_URL?>/zsb/images/v1.0/new_duotu.gif" />
<?php } ?>
<div class="itemTex"><span class="name"><?php if(isset($value['block_url']) && $value['block_url'] !='') {?> <a class="name" href="<?php echo $value['block_url'];?>" target="_blank"><?php echo $value['blockshowname'];?></a><?}else{echo $value['blockshowname'];}?></span><span class="fg_z">/</span><span><?php echo $value['room'];?>室<?php echo $value['hall'];?>厅</span><span class="fg_z">/</span><span><?php echo $value['floor_str'];?>层</span><span class="fg_z">/</span><span><?php echo $value['buildarea'];?>㎡</span><span class="fg_z">/</span><span><?php echo $value['price'];?><?php echo $house['shoppriceunit'][$value['priceunit']];?></span>
</div>
<div class="itemTex itemTex2">
<span>房源编号：<?php echo $value['id'];?></span>
<?php if (!empty($value['ownid'])) { echo '内部编号：'.$value['ownid']; } ?>
</div>
</div>
</td>
<td class="td w75">
......
new_admincp/applications/zsb/views/nj/rent_manage_invalid.php
View file @ 601ef840
......@@ -204,19 +204,25 @@
<tr>
<td class="td first"><input class="jsSelectItem" type="checkbox" name="rows_id" value="<?php echo $value['id'];?>"/></td>
<td class="td second">
<div class="itemTex">
<a class="name" title = "<?php echo $value['address'];?>" href="<?php echo $value['info_url'];?>" target="_blank"><?php echo $value['address_str'];?></a>
</div>
<div class="itemTex">
<?php if($value['is_star_result'] === TRUE) { ?>
<img alt="多图房源" title="多图房源" src="<?=STATIC_SOURCE_URL?>/zsb/images/v1.0/new_duotu.gif" />
<?php } ?>
</div>
<div class="itemTex"><span class="name"><?php if(isset($value['block_url']) && $value['block_url'] !='') {?> <a class="name" href="<?php echo $value['block_url'];?>" target="_blank"><?php echo $value['blockshowname'];?></a><?}else{echo $value['blockshowname'];}?></span><span class="fg_z">/</span><span><?php echo $value['room'];?>室<?php echo $value['hall'];?>厅</span><span class="fg_z">/</span><span><?php echo $value['floor_str'];?>层</span><span class="fg_z">/</span><span><?php echo $value['buildarea'];?>㎡</span><span class="fg_z">/</span><span><?php echo $value['price'];?><?php echo $house['shoppriceunit'][$value['priceunit']];?></span>
<div style="float: left;margin-top: 20px">
<img src="<?= $value['pic1'] ?>"
style="width: 80px; height: 65px;">
</div>
<div class="itemTex itemTex2">
<span>房源编号：<?php echo $value['id'];?></span>
<?php if (!empty($value['ownid'])) { echo '内部编号：'.$value['ownid']; } ?>
<div style="float: left;width: 260px;margin-left: 10px">
<div class="itemTex">
<a class="name" title = "<?php echo $value['address'];?>" href="<?php echo $value['info_url'];?>" target="_blank"><?php echo $value['address_str'];?></a>
</div>
<div class="itemTex">
<?php if($value['is_star_result'] === TRUE) { ?>
<img alt="多图房源" title="多图房源" src="<?=STATIC_SOURCE_URL?>/zsb/images/v1.0/new_duotu.gif" />
<?php } ?>
</div>
<div class="itemTex"><span class="name"><?php if(isset($value['block_url']) && $value['block_url'] !='') {?> <a class="name" href="<?php echo $value['block_url'];?>" target="_blank"><?php echo $value['blockshowname'];?></a><?}else{echo $value['blockshowname'];}?></span><span class="fg_z">/</span><span><?php echo $value['room'];?>室<?php echo $value['hall'];?>厅</span><span class="fg_z">/</span><span><?php echo $value['floor_str'];?>层</span><span class="fg_z">/</span><span><?php echo $value['buildarea'];?>㎡</span><span class="fg_z">/</span><span><?php echo $value['price'];?><?php echo $house['shoppriceunit'][$value['priceunit']];?></span>
</div>
<div class="itemTex itemTex2">
<span>房源编号：<?php echo $value['id'];?></span>
<?php if (!empty($value['ownid'])) { echo '内部编号：'.$value['ownid']; } ?>
</div>
</div>
</td>
<td class="td w104">
......
new_admincp/applications/zsb/views/nj/sell_manage_frozen.php
View file @ 601ef840
......@@ -159,7 +159,7 @@
<tr>
<td class="td w10"></td>
<td class="td second" style="width:300px;">
<div style="float: left;margin-top: 20px">
<div style="float: left;margin-top: 10px">
<img src="<?= $value['pic1'] ?>"
style="width: 80px; height: 65px;">
</div>
......
new_admincp/applications/zsb/views/nj/sell_manage_invalid.php
View file @ 601ef840
......@@ -212,7 +212,7 @@
<tr>
<td class="td first"><input class="jsSelectItem" type="checkbox" name="rows_id" value="<?php echo $value['id'];?>"/></td>
<td class="td second">
<div style="float: left;margin-top: 20px">
<div style="float: left;margin-top: 10px">
<img src="<?= $value['pic1'] ?>"
style="width: 80px; height: 65px;">
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment