Skip to content

F
fenzhan_zsb
Commit f1ec094c authored by esf's avatar esf
Browse files
Options

合并分支 'feature-lq-03-15' 到 'master' 

分站有效期去除

查看合并请求 !1
parents 7ff68cd8 1d07d052
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
new_admincp/applications/zsb/controllers/rent.php
View file @ f1ec094c
...@@ -2308,10 +2308,10 @@ class Rent extends MY_Controller { ...@@ -2308,10 +2308,10 @@ class Rent extends MY_Controller {
} }
} }
//限制剩余时间大于0 //限制剩余时间大于0
if(strtotime(date('Y-m-d')) - $houseinfo['expiretime'] >=0 ){ // if(strtotime(date('Y-m-d')) - $houseinfo['expiretime'] >=0 ){
$result['msgs'][$val] = '已过期！'; // $result['msgs'][$val] = '已过期！';
continue; // continue;
} // }
//判断源活房源是否有否超过上限 //判断源活房源是否有否超过上限
......
new_admincp/applications/zsb/controllers/sell.php
View file @ f1ec094c
...@@ -5200,10 +5200,10 @@ class Sell extends MY_Controller { ...@@ -5200,10 +5200,10 @@ class Sell extends MY_Controller {
} }
//限制剩余时间大于0 //限制剩余时间大于0
if(strtotime(date('Y-m-d')) - $houseinfo['expiretime'] >=0 ){ // if(strtotime(date('Y-m-d')) - $houseinfo['expiretime'] >=0 ){
$result['msgs'][$key] = '已过期！'; // $result['msgs'][$key] = '已过期！';
continue; // continue;
} // }
$re_houseinfo = $houseinfo; $re_houseinfo = $houseinfo;
$blockid = $re_houseinfo['blockid']; $blockid = $re_houseinfo['blockid'];
......
new_admincp/applications/zsb/views/nj/rent_manage.php
View file @ f1ec094c
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
</td> </td>
<td class="td w90"> <td class="td w90">
<p><?php echo date( 'm-d H:i' , $value['creattime']); ?></p> <p><?php echo date( 'm-d H:i' , $value['creattime']); ?></p>
<p>房源：<span class="color"><?php echo $value['exipire_days'];?></span></p> <!-- <p>房源：<span class="color">--><?php //echo $value['exipire_days'];?><!--</span></p>-->
<?php if($value['is_tag_result'] === TRUE) { ?> <?php if($value['is_tag_result'] === TRUE) { ?>
<p>急推：<span class="color"><?php echo $value['tag_exipire_days'];?></span></p> <p>急推：<span class="color"><?php echo $value['tag_exipire_days'];?></span></p>
<?php } ?> <?php } ?>
......
new_admincp/applications/zsb/views/nj/rent_manage_invalid.php
View file @ f1ec094c
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
<td class="w260">房源基本信息</td> <td class="w260">房源基本信息</td>
<td class="w104">创建时间</td> <td class="w104">创建时间</td>
<td class="w104">更新时间</td> <td class="w104">更新时间</td>
<td class="w90">剩余天数</td> <!-- <td class="w90">剩余天数</td>-->
<td class="w130">点击情况</td> <td class="w130">点击情况</td>
<td>操作</td> <td>操作</td>
</tr> </tr>
...@@ -225,9 +225,9 @@ ...@@ -225,9 +225,9 @@
<td class="td w104"> <td class="td w104">
<p><?php if($value['updatetime'] > 0) { echo date( 'm-d H:i' , $value['updatetime']);}?></p> <p><?php if($value['updatetime'] > 0) { echo date( 'm-d H:i' , $value['updatetime']);}?></p>
</td> </td>
<td class="td w90"> <!-- <td class="td w90">-->
<p>房源：<span class="color"><?php echo $value['exipire_days'];?></span></p> <!-- <p>房源：<span class="color">--><?php //echo $value['exipire_days'];?><!--</span></p>-->
</td> <!-- </td>-->
<td class="td w130"> <td class="td w130">
<p>昨日：<span class="color"><?php echo $value['click_num_y'];?></span>次</p> <p>昨日：<span class="color"><?php echo $value['click_num_y'];?></span>次</p>
<p><a class="link" href="/statistics_analysis/click/" target="_blank">详细</a></p> <p><a class="link" href="/statistics_analysis/click/" target="_blank">详细</a></p>
......
new_admincp/applications/zsb/views/nj/sell_manage.php
View file @ f1ec094c
...@@ -381,7 +381,7 @@ ...@@ -381,7 +381,7 @@
</td> </td>
<td class="td w90"> <td class="td w90">
<p><?php echo date( 'm-d H:i' , $value['creattime']); ?></p> <p><?php echo date( 'm-d H:i' , $value['creattime']); ?></p>
<p>房源：<span class="color"><?php echo $value['exipire_days'];?></span></p> <!-- <p>房源：<span class="color">--><?php //echo $value['exipire_days'];?><!--</span></p>-->
<?php if($value['is_tag_result'] === TRUE) { ?> <?php if($value['is_tag_result'] === TRUE) { ?>
<p>急推：<span class="color"><?php echo $value['tag_exipire_days'];?></span></p> <p>急推：<span class="color"><?php echo $value['tag_exipire_days'];?></span></p>
<?php } ?> <?php } ?>
......
new_admincp/applications/zsb/views/nj/sell_manage_invalid.php
View file @ f1ec094c
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
<td class="w260">房源基本信息</td> <td class="w260">房源基本信息</td>
<td class="w104">创建时间</td> <td class="w104">创建时间</td>
<td class="w104">更新时间</td> <td class="w104">更新时间</td>
<td class="w90">剩余天数</td> <!-- <td class="w90">剩余天数</td>-->
<td class="w130">点击情况</td> <td class="w130">点击情况</td>
<td>操作</td> <td>操作</td>
</tr> </tr>
...@@ -238,9 +238,9 @@ ...@@ -238,9 +238,9 @@
<td class="td w104"> <td class="td w104">
<p><?php if($value['updatetime'] > 0) { echo date( 'm-d H:i' , $value['updatetime']);}?></p> <p><?php if($value['updatetime'] > 0) { echo date( 'm-d H:i' , $value['updatetime']);}?></p>
</td> </td>
<td class="td w90"> <!-- <td class="td w90">-->
<p>房源：<span class="color"><?php echo $value['exipire_days'];?></span></p> <!-- <p>房源：<span class="color">--><?php //echo $value['exipire_days'];?><!--</span></p>-->
</td> <!-- </td>-->
<td class="td w130"> <td class="td w130">
<p>昨日：<span class="color"><?php if($value['click_num_y']) {echo $value['click_num_y'];} else { echo 0;}?></span>次&nbsp;&nbsp;<a class="link" href="/statistics_analysis/click/" target="_blank">详细</a></p> <p>昨日：<span class="color"><?php if($value['click_num_y']) {echo $value['click_num_y'];} else { echo 0;}?></span>次&nbsp;&nbsp;<a class="link" href="/statistics_analysis/click/" target="_blank">详细</a></p>
</td> </td>
......
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