Skip to content

F
fenzhan_zsb
Commit 41d68646 authored by weizhicheng's avatar weizhicheng
Browse files
Options

Merge branch 'master' of http://git.house365.com/zhangkuanguang/fenzhan_agent 

 Conflicts:
	new_admincp/applications/models/zsb_api_model.php
parents b1c2fe01 cced8087
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 140 deletions
.idea/.gitignore deleted 100644 → 0
View file @ b1c2fe01
# Default ignored files
/workspace.xml
\ No newline at end of file
.idea/deployment.xml deleted 100644 → 0
View file @ b1c2fe01
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PublishConfigData" persistUploadOnCheckin="false">
<serverData>
<paths name="192.168.105.106">
<serverdata>
<mappings>
<mapping deploy="/" local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
<paths name="202.102.74.75">
<serverdata>
<mappings>
<mapping local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
<paths name="202.102.83.187_分站租售宝">
<serverdata>
<mappings>
<mapping deploy="/" local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
</serverData>
</component>
</project>
\ No newline at end of file
.idea/encodings.xml deleted 100644 → 0
View file @ b1c2fe01
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="PROJECT" charset="GBK" />
</component>
</project>
\ No newline at end of file
.idea/fenzhan_agent.iml deleted 100644 → 0
View file @ b1c2fe01
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/new_admincp/vendor/house365/esfadmin" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
.idea/modules.xml deleted 100644 → 0
View file @ b1c2fe01
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/fenzhan_agent.iml" filepath="$PROJECT_DIR$/.idea/fenzhan_agent.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/php.xml deleted 100644 → 0
View file @ b1c2fe01
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PhpIncludePathManager">
<include_path>
<path value="$PROJECT_DIR$/new_admincp/vendor/house365/esfadmin" />
</include_path>
</component>
</project>
\ No newline at end of file
.idea/vcs.xml deleted 100644 → 0
View file @ b1c2fe01
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
.idea/webServers.xml deleted 100644 → 0
View file @ b1c2fe01
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="WebServers">
<option name="servers">
<webServer id="547ded54-925d-4785-ba9a-7655ff5889e6" name="202.102.83.187_分站租售宝" url="http://202.102.74.72">
<fileTransfer host="202.102.74.72" port="21" rootFolder="/183_agent">
<advancedOptions>
<advancedOptions dataProtectionLevel="Private" passiveMode="true" />
</advancedOptions>
<option name="port" value="21" />
</fileTransfer>
</webServer>
<webServer id="67fb6ca5-037a-4b69-abe5-05e315a02402" name="192.168.105.106" url="http://192.168.105.106">
<fileTransfer host="192.168.105.106" port="21" rootFolder="/webroot/fenzhan_agent">
<advancedOptions>
<advancedOptions dataProtectionLevel="Private" passiveMode="true" shareSSLContext="true" />
</advancedOptions>
<option name="port" value="21" />
</fileTransfer>
</webServer>
<webServer id="763d4f56-8f17-41d7-9429-31d3e7c4fcf4" name="202.102.74.75" url="http://202.102.74.75">
<fileTransfer host="202.102.74.75" port="21" rootFolder="/admincp">
<advancedOptions>
<advancedOptions dataProtectionLevel="Private" passiveMode="true" shareSSLContext="true" />
</advancedOptions>
<option name="port" value="21" />
</fileTransfer>
</webServer>
</option>
</component>
</project>
\ No newline at end of file
new_admincp/applications/models/zsb_api_model.php
View file @ 41d68646
......@@ -18,6 +18,7 @@ class zsb_api_model extends MY_Model{
'reportRecord'=>'/zsbapi/house/report-record',//举报记录
'reportRecordAppeal'=>'/zsbapi/house/report-record-appeal',//申诉记录展示
'realHouseAppeal'=>'/zsbapi/house/real-house-appeal',//房源举报申诉
'setRealHouse'=>'/zsbapi/real-manage/set-real-house',//放心看提现
);
......
new_admincp/applications/zsb/controllers/sell.php
View file @ 41d68646
......@@ -7016,6 +7016,20 @@ class Sell extends MY_Controller {
echo json_encode(array('result'=>1, 'msg'=>iconv('gb2312','utf-8','调价成功')));
}
/*
* 设置放心看
*/
public function setRealHouse(){
$house_id = $this->input->post('house_id');
$this->load->model('zsb_api_model');
$re = $this->zsb_api_model->getRequrstData('setRealHouse',array('house_id'=>$house_id));
}
}
/* End of file sell.php */
/* Location: ./application/zsb/controllers/sell.php */
\ No newline at end of file
new_admincp/applications/zsb/views/nj/sell_manage.php
View file @ 41d68646
......@@ -473,7 +473,7 @@
<?php } else {?>
<div class="pic" onClick="change_real(<?php echo $value['id']; ?>, '<?php echo md5("HOUSE365_REAL_SET_".$value["id"]);?>')">
<div class="pic" onClick="change_real(<?php echo $value['id']; ?>)">
<img alt="设置放心看" src="<?=STATIC_SOURCE_URL?>/zsb/images/v1.0/look.png" />
<em class="btn" style="right: -16px;"></em>
<input type="hidden" name ="is_real_<?php echo $value['id']; ?>" id ="is_real_<?php echo $value['id']; ?>" value ='0'>
......@@ -1202,6 +1202,10 @@ $(function(){
$(this).addClass("vr-abled-on").siblings("div").removeClass("vr-abled-on");
})
layer.config({
extend: 'myskin/style.css' //同样需要加载新皮肤
});
})
function closeP()
......@@ -1490,41 +1494,38 @@ function change_nofee( rowid , secret_key)
}
//设置REAL房
function change_real( rowid , secret_key)
function change_real(rowid)
{
var do_type = $( '#is_real_' + rowid).val();
var vr_type = $( '#is_real_' + rowid).attr('fors');
if(vr_type == 'vr_id_empty'){
vr_type = '';
}
$('#do_type').val(do_type);
if( do_type == 1)
{
$('#rowid').val(rowid);
$('#secret_key').val(secret_key);
$("#atction_type").val("ajax_cancle_real");
if(vr_type){
$("#dialogSaveDiv").html("取消放心看设置后VR看房将无法展示,是否继续？");
}else{
$("#dialogSaveDiv").html("您确定要对选定的房源纪录取消放心看房设置吗？");
var index = layer.load(2, {shade: false});
$.ajax({
type: 'POST',
url: '/sell/setRealHouse',
data: {},
dataType: 'JSON',
success: function (re) {
if(re.result != 1){
waringOpen(re.msg);
return false;
}
layer.msg(re.msg);
setTimeout(function () {
window.location.href = '/sell/manage';
},1000);
},
complete:function () {
layer.close(index);
}
});
}
openWin("dialogtc");
}
else
{
//复制隐藏变量
$('.houseInfo').html('');
$('.houseInfo').html($('#house_real_info_hidden_'+rowid).html());
$('#real_set_rowid').val(rowid);
$('#real_secret_key').val(secret_key);
sub_real_form();
//openWin("dialog_real");
}
function waringOpen(msg) {
layer.alert(msg, {
title:'放心看',
icon: 0,
skin: 'layer-skin-yellow' //该皮肤由layer.seaning.com友情扩展。关于皮肤的扩展规则，去这里查阅
})
}
</script>
......
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