Skip to content

F
fenzhan_zsb
Commit 6b565772 authored by 梅玉龙's avatar 梅玉龙
Browse files
Options

Merge branch 'uc_08' into release_preview

parents 70bca9f0 0f7e2590
Expand all Show whitespace changes
Inline Side-by-side
Showing with 324 additions and 86 deletions
new_admincp/applications/models/zsb_api_model.php
View file @ 6b565772
......@@ -5,9 +5,10 @@ class zsb_api_model extends MY_Model{
private $host = 'http://newrent.house365.com';
private $apiSource = 'PC';// 访问API使用的公用source
private $apiVersion = '1.0.0';// 访问API使用的公用版本号
private $apiVersion = '1.0.1';// 访问API使用的公用版本号
private $token = 'ZSB_API';
private $host_preview = 'http://newrenttest.house365.com';
private $signKey = '63DBC5C8E29B1D75AC8CE2676FE7C5F3AABED64B';
private $apiUrl = array(
......@@ -27,6 +28,10 @@ class zsb_api_model extends MY_Model{
'uploadPic' => '/ajax-action/upload-file', // 上传图片接口
'login_qr_code' => '/zsbapinj/qr-code-login/login-qr-code', // 登录二维码
'user_by_qr_code' => '/zsbapinj/qr-code-login/login-qr-code-data', // 校验是否确认登录
'scan_login' => '/zsbapi/qr-code-login/uc-scan-login', // 扫码登录校验
'uc_login' => '/zsbapi/broker/uc-login', // 登录
'uc_update' => '/zsbapi/broker/uc-update', // 更新经纪人信息
'change_uc_phone' => '/zsbapi/broker/change-uc-phone', // 更改经纪人手机号码
);
......@@ -170,5 +175,27 @@ class zsb_api_model extends MY_Model{
return $token;
}
/**
* 生成sign
* @param array $param
* @return string
* @author mellon
*/
public function getSign($param = array())
{
if (!is_array($param)) {
return '';
}
ksort($param);
foreach ($param as $key => $item) {
if (!empty($item) && !is_array($item)) {
$newArr[] = $key.'='.$item;
}
}
$stringA = implode("&", $newArr);
$stringSignTemp = $stringA."&key=".$this->signKey;
$stringSignTemp = md5($stringSignTemp);
$sign = sha1($stringSignTemp);
return $sign;
}
}
\ No newline at end of file
new_admincp/applications/zsb/config/config_aks.php 0 → 100644
View file @ 6b565772
This diff is collapsed.
new_admincp/applications/zsb/config/config_lyg.php
View file @ 6b565772
......@@ -376,7 +376,7 @@ $config['house'] = array(
"infotype" => array ('1'=>'住宅', '2'=>'别墅','3'=>'写字楼','4'=>'商铺','6'=>'车库车位','5'=>'仓库厂房'),
"infofrom" => array ('1'=>'房东[个人]', '2'=>'中介门店','5'=>'房产经纪人'),
"district" => array('新浦'=>'新浦','海州'=>'海州','连云'=>'连云','开发'=>'开发','灌南'=>'灌南','灌云'=>'灌云','东海'=>'东海','赣榆'=>'赣榆'),
"district" => array('海州区'=>'海州区','连云区'=>'连云区','赣榆区'=>'赣榆区','灌南县'=>'灌南县','灌云县'=>'灌云县','东海县'=>'东海县'),
"mright" => array ('产权房'=>'产权房','使用权房'=>'使用权房'),
"purpose" => array ('普通住宅'=>'普通住宅', '单身公寓'=>'单身公寓','别墅'=>'别墅','商住综合'=>'商住综合'),
"office_purpose" => array ('写字楼'=>'写字楼','商住综合'=>'商住综合'),
......
new_admincp/applications/zsb/config/config_nn.php 0 → 100644
View file @ 6b565772
This diff is collapsed.
new_admincp/applications/zsb/controllers/ajax.php
View file @ 6b565772
......@@ -1319,10 +1319,16 @@ class Ajax extends MY_Controller {
if(!$is_expire){
$message_flag = 2;
}else{
// 调用用户中心更新密码
$ucRes = $this->broker_model->updateUcPwd($lastst_sms['rowid'], '111111');
if ($ucRes['result'] != 1) {
$message_flag = 1;
} else {
$this->broker_model->update_broker_pwd($lastst_sms['rowid']);
$this->broker_model->update_sms_flag($lastst_sms['id']);
$message_flag = 3;
}
}
}else{
$message_flag = 1;
}
......
new_admincp/applications/zsb/controllers/login.php
View file @ 6b565772
......@@ -223,6 +223,9 @@ class Login extends MY_Controller {
//清空之前的登陆数据
$this->broker_model->logout();
$username = urldecode($username);
if($_COOKIE['zkg']){
var_dump($_SERVER['HTTP_REFERER']);die;
}
if(strpos($_SERVER['HTTP_REFERER'], 'cp.house365.com') || strpos($_SERVER['HTTP_REFERER'], 'we.house365.com') || strpos($_SERVER['HTTP_REFERER'], 'esfadmin.house365.com'))
{
//判断账号密码正确性
......@@ -278,7 +281,9 @@ class Login extends MY_Controller {
//加载memcached
$this->load->library('My_memcached','','mc');
$this->mc->add($interface_id, array('is_ok'=>1, 'data'=>$arr_data), 30);
if($interface_id == '1111121212121'){
var_dump($this->mc->get($interface_id));die;
}
echo 'ok';
}
else
......@@ -302,9 +307,13 @@ class Login extends MY_Controller {
//加载memcached
$this->load->library('My_memcached','','mc');
$cache = $this->mc->get($interface_id);
if(1 == $cache['is_ok'])
{
$this->broker_model->yunxinLogin($cache['data']['username']);
if($interface_id == '1111121212121'){
var_dump(111);die;
}
$this->_enter($cache['data']['username'], $cache['data']['password'], 'cp');
}
else
......@@ -394,6 +403,17 @@ class Login extends MY_Controller {
}
$username = addslashes($username);
// 调用用户中心校验用户名和密码
$this->load->model('zsb_api_model');// 租售宝API调用类
$ucParams = array(
'username' => $username,
'password' => $password,
'city' => GB_CITY,
);
$ucRes = $this->zsb_api_model->getRequrstData('uc_login', $ucParams);
if ($ucRes['result'] == 0) {
die($ucRes['msg']);
}
//判断账号密码正确性
$uid = $this->broker_model->login($username, $password);
......@@ -491,6 +511,12 @@ class Login extends MY_Controller {
} else {
// 如果APP已确认登录
if ($data['login_check'] && $data['username']) {
// 用户中心扫码校验
$scanRes = $this->zsb_api_model->getRequrstData('scan_login', $params);
if($scanRes['result'] == 0){
$response = array('msg' => 'expired');
echo json_encode($response);exit;
}
$sellUserName = isset($sessionUserData['sell']['username']) ? $sessionUserData['sell']['username'] : '';
$rentUserName = isset($sessionUserData['rent']['username']) ? $sessionUserData['rent']['username'] : '';
// 已经写入session
......@@ -499,8 +525,9 @@ class Login extends MY_Controller {
echo json_encode($response);exit;
}
$username = iconv('utf-8','gbk',$data['username']);
$this->load->model('broker_model');
$codeData = $this->broker_model->qrCodeLogin($data['username']);
$codeData = $this->broker_model->qrCodeLogin($username);
$response = array('msg' => $codeData);
echo json_encode($response);exit;
} else {
......
new_admincp/applications/zsb/controllers/rent.php
View file @ 6b565772
......@@ -2352,10 +2352,10 @@ class Rent extends MY_Controller {
}
}
//限制剩余时间大于0
// if(strtotime(date('Y-m-d')) - $houseinfo['expiretime'] >=0 ){
// $result['msgs'][$val] = '已过期！';
// continue;
// }
if(strtotime(date('Y-m-d')) - $houseinfo['expiretime'] >=0 ){
$result['msgs'][$val] = '已过期,请删除！';
continue;
}
//判断源活房源是否有否超过上限
......
new_admincp/applications/zsb/controllers/sell.php
View file @ 6b565772
......@@ -667,7 +667,7 @@ class Sell extends MY_Controller {
}
//2017-09-07住宅额外增加面积,单价判断判断
if($fields_values['infotype'] == 1){
if(15 > $fields_values['buildarea'] || $fields_values['buildarea'] > 500){
if(15 > $fields_values['buildarea'] || $fields_values['buildarea'] > 9999){
$this->jump($url_manage, '住宅面积必须在15-500平米之间', 3000);
exit;
}
......@@ -3075,6 +3075,7 @@ class Sell extends MY_Controller {
&& !empty($pic_check_arr) && $uid > 0)
{
$this->load->model('admin_check');
$this->admin_check->delete_check_pic_all($tbl, $house_id);
foreach($pic_check_arr as $key => $val)
{
$infotype = $fields_values['infotype'];
......@@ -4815,8 +4816,7 @@ class Sell extends MY_Controller {
mysql_close($databaseSellWarning);
// Order By Time
$array = array();
/*$array = array();
foreach($data_info as $value){
if(!empty($value['freeze_info']['freezetime'])){
$array[intval($value['freeze_info']['freezetime'])] = $value;
......@@ -4828,7 +4828,7 @@ class Sell extends MY_Controller {
}
}
krsort($array);
$data_info = $array;
$data_info = $array;*/
}
}
$data['data_info'] = $data_info;
......@@ -7104,6 +7104,63 @@ class Sell extends MY_Controller {
echo json_encode($re);die;
}
//冻结房源删除
public function house_frozen_del()
{
$rowid = $this->input->get( 'rowid' , TRUE );
$secret_key = $this->input->get( 'secret_key' , TRUE );
if( intval($rowid) > 0 && md5('HOUSE365_SELL_APPEAL_'.$rowid) == $secret_key )
{
$uid = $this->user_arr['uid'];
$agentcode = $this->user_arr['agentcode'];
/*** 1、删除房源 ***/
$delete_num = 0;
$this->load->model('sell_operate_model');
$delete_num = $this->sell_operate_model->delete_house($rowid);
if( $delete_num > 0 )
{
//加载中间件统计类
$this->load->library('statistics');
//加载门店类
$this->load->model('agency_model');
$relation_info = array();
$relation_info = $this->agency_model->get_relation_by_agentcode($agentcode);
$domain = isset($relation_info['cat_id']) ? $relation_info['cat_id'] : 0;
$parentcode = '';
if( is_array($relation_info) && !empty($relation_info)) {
$parentcode = isset($relation_info['parentcode']) ? $relation_info['parentcode'] : '';
}else{
$parentinfo = array();
$select_array = array('parentcode');
$this->agency_model->set_select_fields($select_array);
$parentinfo = $this->agency_model->get_company_info_by_code($agentcode);
$parentcode = isset($parentinfo['parentcode']) ? $parentinfo['parentcode'] : '';
}
/*** 4、通过接口提交操作日志给中间件，operatetype 1:新增 2刷新 3删除 4失效 5再发布 ***/
$this->statistics->sub_operatecount( $uid , $agentcode , 3 , $rowid , '' , 'sell' , $domain , $parentcode );
/*** 5、提交房源操作日志给MYSQL(经纪人日志查询),[$msg:4-失效房源] ***/
$this->sell_model->action_log( $agentcode , $uid , 'sell' , $rowid , 0);
$result['is_ok'] = 1;
$msg = '操作成功';
}else{
$result['is_ok'] = 0;
$msg = '删除房源失败。';
}
/** 删除结束 **/
} else {
$result['is_ok'] = 0;
$msg = '参数错误';
}
$result['msg'] = iconv( 'gb2312' , 'utf-8', $msg );
echo json_encode($result);
exit;
}
}
/* End of file sell.php */
......
new_admincp/applications/zsb/controllers/ucenter_information.php
View file @ 6b565772
......@@ -422,66 +422,80 @@ class ucenter_information extends MY_Controller{
//手机信息保存
public function save_phone(){
public function save_phone()
{
$session_info = $this->broker_model->get_user_session();
$newphone = trim($this->input->post('newphone'));
$oldphone = trim($this->input->post('oldphone'));
$phonecode = trim($this->input->post('phonecode'));
if($newphone == ""){
if ($newphone == "") {
echo "0";
exit;
}
if($newphone == $oldphone){
if ($newphone == $oldphone) {
echo "2";
exit;
}
if(!$phonecode || !preg_match("/^\\d{6}$/", $phonecode)) {
echo "3";exit;
if (!$phonecode || !preg_match("/^\\d{6}$/", $phonecode)) {
echo "3";
exit;
} else {
$result = $this->broker_model->change_phone_num($session_info['uid']);
if($result>0){
if ($result > 0) {
echo "4";//一天只能修改一次
exit;
}
$row = $this->broker_model->get_certifycode($session_info['uid'],$newphone);
$row = $this->broker_model->get_certifycode($session_info['uid'], $newphone);
if(empty($row)){
if (empty($row)) {
echo "5";//验证码过期
exit;
}
if($phonecode != $row["validcode"]){
if ($phonecode != $row["validcode"]) {
//echo "验证码输入错误";
echo "3";exit;
}elseif($newphone!=$row["mobile"]){
echo "5";exit;
}else{
$flag = $this->broker_model->set_broker_info($session_info['uid'],array("telno"=>$newphone));
echo "3";
exit;
} else if ($newphone != $row["mobile"]) {
echo "5";
exit;
} else {
if($flag){
// 调用用户中心修改手机号码
$ucRes = $this->broker_model->changeUcPhone($session_info['uid'], $newphone);
if ($ucRes['result'] == 0) {
echo "6";
exit;
}
$flag = $this->broker_model->set_broker_info($session_info['uid'], array("telno" => $newphone));
if ($flag) {
//修改房源联系号码
$this->load->model('sell_model');
$this->sell_model->update_sell_mobile($session_info['uid'],$newphone);
$this->sell_model->update_sell_mobile($session_info['uid'], $newphone);
$this->load->model('rent_model');
$this->rent_model->update_rent_mobile($session_info['uid'],$newphone);
$this->rent_model->update_rent_mobile($session_info['uid'], $newphone);
//修改验证码状态
$this->broker_model->update_certifycode($row['id']);
//失效名片认证
$this->broker_model->check_certificate($session_info['uid'],'p_3',1,2,'修改手机号码，名片认证失效');
$this->broker_model->set_broker_info($session_info['uid'],array("p_3_pic"=>""));
$this->broker_model->check_certificate($session_info['uid'], 'p_3', 1, 2, '修改手机号码，名片认证失效');
$this->broker_model->set_broker_info($session_info['uid'], array("p_3_pic" => ""));
//$session_info['telno'] = $newphone;
$this->del_broker_cache($session_info['uid']);
// $this->broker_model->reset_user_session(); //可能没用
//$session_key = $this->broker_model->get_appkey();
//$this->session->set_userdata(array($session_key => $session_info));//修改session信息
$this->update_session_info($session_info,'telno',$newphone);
echo "1";exit;
}else{
echo "6";exit;
$this->update_session_info($session_info, 'telno', $newphone);
echo "1";
exit;
} else {
echo "6";
exit;
}
}
}
......@@ -489,23 +503,24 @@ class ucenter_information extends MY_Controller{
}
//修改登录密码
public function save_pwd(){
public function save_pwd()
{
$session_info = $this->broker_model->get_user_session();
$oldpwd = $this->input->post('oldpwd',TRUE);
$newpwd = $this->input->post('newpwd',TRUE);
$newpwd2 = $this->input->post('newpwd2',TRUE);
$oldpwd = $this->input->post('oldpwd', true);
$newpwd = $this->input->post('newpwd', true);
$newpwd2 = $this->input->post('newpwd2', true);
if($oldpwd == ""){
if ($oldpwd == "") {
echo "2";
exit;
}
if($newpwd == ""){
if ($newpwd == "") {
echo "3";
exit;
}
if($newpwd != $newpwd2){
if ($newpwd != $newpwd2) {
echo "4";
exit;
}
......@@ -516,22 +531,22 @@ class ucenter_information extends MY_Controller{
$broker_info = $this->broker_model->get_broker_detail(false);
$oldpwd = $broker_info['password'];
if($oldpassword == $oldpwd){
$flag = $this->broker_model->set_broker_info($session_info['uid'],array("password"=>$newpassword));
if($flag){
if ($oldpassword == $oldpwd) {
// 调用用户中心更新
$flag = false;
$ucRes = $this->broker_model->updateUcPwd($session_info['uid'], $newpwd);
if ($ucRes['result'] == 1) {
$flag = $this->broker_model->set_broker_info($session_info['uid'], array("password" => $newpassword));
}
if ($flag) {
echo "1";
$this->broker_model->saveChangePasswordLog($newpassword, $broker_info['uid'], $broker_info['username']);
}else{
} else {
echo "2";
}
}
else{
} else {
echo "2";
}
exit;
}
......
new_admincp/applications/zsb/controllers/welcome.php
View file @ 6b565772
......@@ -178,7 +178,6 @@ class Welcome extends MY_Controller
$today_stat['remainJtLable'] = $this->house_tag_package_model->get_tag_valid_num($uid,1);
$today_stat['jtLabelCount'] = isset($today_stat['jtLabelCount']) ? $today_stat['jtLabelCount'] : '';
//$today_stat['remainJtLable'] = isset($today_stat['remainJtLable']) ? $today_stat['remainJtLable'] : '';
/*** 未使用标签数据2015-5-16 zhou end***/
$this->load->model('broker_model');
......
new_admincp/applications/zsb/core/MY_Controller.php
View file @ 6b565772
......@@ -140,9 +140,18 @@ class MY_Controller extends CI_Controller
$isonline = FALSE;
}
if($u_session){
$expiredate = empty($u_session['expiredate'])?'':$u_session['expiredate'];
$date = date('Y-m-d');
if($expiredate && $date > $expiredate){
//清空之前的登陆数据
$this->broker_model->logout();
$isonline = FALSE;
}
}
}
//不在线跳出登陆
if(!$isonline)
{
......
new_admincp/applications/zsb/models/admin_check.php
View file @ 6b565772
......@@ -85,6 +85,19 @@ class admin_check extends MY_Model {
$this->db->delete($this->_tbl_pic_check);
}
/**
*
* @param type $tbl
* @param type $house_id
* @param type $pic_id
*/
public function delete_check_pic_all($tbl, $house_id)
{
$this->db->where('housetbl', $tbl);
$this->db->where('houseid', $house_id);
$this->db->delete($this->_tbl_pic_check);
}
/**
*
* @param type $tbl
......@@ -99,6 +112,20 @@ class admin_check extends MY_Model {
$this->db->delete($this->_tbl_pic_check_sub);
}
/**
*
* @param type $tbl
* @param type $house_id
* @param type $pic_id
*/
public function delete_check_pic_sub_all($tbl, $house_id)
{
$this->db->where('housetbl', $tbl);
$this->db->where('houseid', $house_id);
$this->db->delete($this->_tbl_pic_check_sub);
}
/**
*
* @param type $insert_data
......
new_admincp/applications/zsb/models/broker_model.php
View file @ 6b565772
......@@ -1450,6 +1450,44 @@ class Broker_model extends Broker_base_model {
return 'success';
}
/**
* 更新用户中心的密码
* @param $uid
* @param $password
* @return mixed
* @author mellon
*/
public function updateUcPwd($uid, $password)
{
// 调用用户中心更新
$this->load->model('zsb_api_model');// 租售宝API调用类
$ucParams = array(
'brokerId' => $uid,
'password' => $password,
'city' => GB_CITY,
);
$ucParams['sign'] = $this->zsb_api_model->getSign($ucParams);
return $this->zsb_api_model->getRequrstData('uc_update', $ucParams);
}
/**
* 更改用户中心手机号码
* @param $uid
* @param $newPhone
* @return mixed
* @author mellon
*/
public function changeUcPhone($uid, $newPhone)
{
// 调用用户中心更新
$this->load->model('zsb_api_model');// 租售宝API调用类
$ucParams = array(
'uid' => $uid,
'phone' => $newPhone,
'city' => GB_CITY,
);
return $this->zsb_api_model->getRequrstData('change_uc_phone', $ucParams);
}
}
/* End of file Broker_model.php */
......
new_admincp/applications/zsb/models/pic_model.php
View file @ 6b565772
......@@ -531,7 +531,7 @@ class Pic_model extends MY_Model {
$this->uf->setWatermarkPosition("rb");
$this->uf->setWatermarkImage("http://guanli.house365.com/images/sy2.png");//水印
*/
$this->uf->setWatermark(true);//暂时不打水印 by zain 2018-9-26
$this->uf->setWatermark(false);//暂时不打水印 by zain 2018-9-26
$this->uf->setWatermarkType(2);
$logo = $_SERVER['DOCUMENT_ROOT']."/source/zsb/images/v1.0/logo_watermark.png";
$this->uf->setWatermarkImage($logo);//水印
......
new_admincp/applications/zsb/views/nj/login.php
View file @ 6b565772
......@@ -211,7 +211,7 @@ $phone = getPhone(4);
<div class="qrcode-item clearfix">
<div class=" clearfix" style="width: 110px;margin: 0 auto">
<a class="findPow" href="/login/findpw/" target="_blank">找回密码</a><span class="fg">|</span><a
class="register" href="<?= GB_BROKER_REG ?>" target="_blank">立即注册</a>
class="register" href="https://newrent.house365.com/<?= GB_CITY ?>/agent_sign_up.html" target="_blank">立即注册</a>
</div>
</div>
</div>
......@@ -220,33 +220,7 @@ $phone = getPhone(4);
<?php
$login_citys = array(
'nj'=>array('url'=>'http://nj.zsb.house365.com/','name'=>'南 京'),
'hf'=>array('url'=>'http://hf.zsb.house365.com/','name'=>'合 肥'),
'wh'=>array('url'=>'http://wh.zsb.house365.com/','name'=>'芜 湖'),
'wx'=>array('url'=>'http://wx.zsb.house365.com/','name'=>'无 锡'),
'bb'=>array('url'=>'http://bb.zsb.house365.com/','name'=>'蚌 埠'),
'bh'=>array('url'=>'http://bh.zsb.house365.com/','name'=>'北 海'),
'cq'=>array('url'=>'http://cq.zsb.house365.com/','name'=>'重 庆'),
'dz'=>array('url'=>'http://dz.zsb.house365.com/','name'=>'德 州'),
'gy'=>array('url'=>'http://gy.zsb.house365.com/','name'=>'贵 阳'),
'jx'=>array('url'=>'http://jx.zsb.house365.com/','name'=>'嘉 兴'),
'mianyang'=>array('url'=>'http://mianyang.zsb.house365.com/','name'=>'绵 阳'),
'ph'=>array('url'=>'http://ph.zsb.house365.com/','name'=>'平 湖'),
'sh'=>array('url'=>'http://sh.zsb.house365.com/','name'=>'上 海'),
'tx'=>array('url'=>'http://tx.zsb.house365.com/','name'=>'桐 乡'),
'wlmq'=>array('url'=>'http://wlmq.zsb.house365.com/','name'=>'乌鲁木齐'),
'mas'=>array('url'=>'http://mas.zsb.house365.com/','name'=>'马鞍山'),
// 'cz' =>array('url'=>'http://zsb.house365.com/login.php','name'=>'常州'),
// 'hz' =>array('url'=>'http://zsb.house365.com/login.php','name'=>'杭州'),
// 'xa' =>array('url'=>'http://zsb.house365.com/login.php','name'=>'西安'),
// 'sz' =>array('url'=>'http://zsb.house365.com/login.php','name'=>'苏州'),
'fz' => array('url' => 'http://fz.zsb.house365.com/', 'name' => '福州'),
'hy' => array('url' => 'http://hy.zsb.house365.com/', 'name' => '海盐'),
'lz' => array('url' => 'http://lz.zsb.house365.com/', 'name' => '兰州'),
// 'lf'=>array('url'=>'http://lf.zsb.house365.com/','name'=>'廊坊'),
// 'taizhou'=>array('url'=>'http://taizhou.zsb.house365.com/','name'=>'台州'),
// 'nc'=>array('url'=>'http://nc.zsb.house365.com/','name'=>'南昌'),
// 'cz'=>array('url'=>'http://zsb.house365.com','name'=>'常 州'), //特殊
);
?>
......@@ -290,7 +264,7 @@ $phone = getPhone(4);
style="width:280px;margin:15px auto 10px auto;border-top:1px solid #d9d9d9;">
<div class="item_relative clearfix" style="width: 130px;margin: 0 auto">
<a class="findPow" href="/login/findpw/" target="_blank">找回密码</a><span class="fg">|</span><a
class="register" href="<?= GB_BROKER_REG ?>" target="_blank">立即注册</a>
class="register" href="https://newrent.house365.com/<?= GB_CITY ?>/agent_sign_up.html" target="_blank">立即注册</a>
</div>
</div>
......
new_admincp/applications/zsb/views/nj/sell_manage_frozen.php
View file @ 6b565772
......@@ -215,6 +215,8 @@
<span class="fg">|</span>
<?php if($value['freeze_info']["esta"] != 2 ) { ?>
<a href="###" class="link" onclick="appeal(<?php echo $value['id'];?> ,<?php echo $value['esta'];?>, '<?php echo date("Y-m-d H:i",$value['freeze_info']["freezetime"]);?>','<?php echo $value['freeze_info']['reason'];?>','<?php echo md5("HOUSE365_SELL_APPEAL_".$value["id"]);?>',this);">申诉</a>
<span class="fg">|</span>
<a href="###" class="link" onclick="selldel(<?php echo $value['id'];?>,'<?php echo md5("HOUSE365_SELL_APPEAL_".$value["id"]);?>')">删除</a>
<?php } else{ ?>
受理中
<?php }?>
......@@ -299,8 +301,30 @@
<div class="text" id="dialog_tip"></div>
</div>
</div>
<!-- 冻结删除 -->
<div id="pop_dialog" class="dialog radius5">
<div class="hd">
<h3 class="h3">提示</h3>
<span title="关闭" class="close close-win">&Chi;</span> </div>
<div class="mod">
<div class="text" id="pop_tips"></div>
<div style="padding:20px 0 0 65px;">
<a href="###" class="btn btnConColor radius5 " onclick="selldelajax();close_confirm_window()">确定</a>
<a href="###" class="btn btnCon radius5 close-win">取消</a>
<input type ="hidden" id="pop_rowid" value="">
<input type ="hidden" id="pop_secret_key" value="">
</div>
</div>
</div>
<!-- 成功提示 -->
<div id="pop_success" class="dialog radius5">
<div class="hd">
<h3 class="h3">提示</h3>
</div>
<div class="mod">
<div class="text" id="pop_success_tips"></div>
</div>
</div>
<script type="text/javascript">
function words_deal()
{
......@@ -435,5 +459,35 @@ function appeal_add ()
//$("#gTipsCoverjsDialogNeighborhoodComplain").remove();
}
function selldel(rowid,secret_key){
$("#pop_tips").html('确定删除房源：'+rowid);
$("#pop_rowid").val(rowid);
$("#pop_secret_key").val(secret_key);
openWin('pop_dialog');
}
//冻结房源删除功能
function selldelajax(){
openWin('docation_loading');
var rowid = $("#pop_rowid").val();
var secret_key = $("#pop_secret_key").val();
$.ajax({
type: 'get',
url : '<?php echo GB_WO_URL;?>/sell/house_frozen_del/',
data: {'secret_key':secret_key , 'rowid':rowid},
dataType:'json',
success: function(data) {
$("#gTipsCoverdialogtc").remove();
$("#docation_loading").hide();
if( data.is_ok == '1' ) {
$("#pop_success_tips").html(data.msg);
openWin('pop_success');
setTimeout('location.reload()',2000);
}else{
$("#dialogts #dialog_tip").html(data.msg);
openWin('dialogts');
}
}
});
}
</script>
\ No newline at end of file
new_admincp/vendor/house365/esfadmin/core/lib/growth_nj/GrowthExpControllPackage.php
View file @ 6b565772
......@@ -55,6 +55,7 @@ class GrowthExpControllPackage {
* @return array
*/
public function findOneByWayAliasAndPackageId($wayAlias, $packageId) {
$packageId = empty($packageId)?0:$packageId;
$sql = SqlCombinHelper::select_sql($this->table, self::$fields,
"way_alias = '$wayAlias' AND package_id = $packageId");
return $this->dbback->getRow($sql);
......@@ -67,6 +68,7 @@ class GrowthExpControllPackage {
* @return int
*/
public function findScoreByWayAliasAndPackageId($wayAlias, $packageId) {
$packageId = empty($packageId)?0:$packageId;
$arrRow = $this->findOneByWayAliasAndPackageId($wayAlias, $packageId);
return $arrRow['score'] == '' ? 0 : $arrRow['score'];
}
......
new_admincp/vendor/house365/esfadmin/core/lib/growth_nj/GrowthExpWayPackage.php
View file @ 6b565772
......@@ -57,6 +57,7 @@ class GrowthExpWayPackage {
* @return array
*/
public function findDataByWayAliasAndPackageId($wayAlias, $packageId) {
$packageId = empty($packageId)?0:$packageId;
$sql = SqlCombinHelper::select_sql($this->table, self::$fields,
"way_alias = '$wayAlias' AND package_id = $packageId");
return $this->dbback->getRow($sql);
......
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